Skip to content

Commit c43c73d

Browse files
committed
feat: upgrade to babel 7 + use @vue/babel-preset-app
1 parent a74ae5e commit c43c73d

File tree

5 files changed

+739
-630
lines changed

5 files changed

+739
-630
lines changed

lib/app/clientEntry.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* global BASE_URL, GA_ID, ga, SW_ENABLED */
22

3-
import '@temp/polyfill'
43
import { createApp } from './app'
54
import { register } from 'register-service-worker'
65

lib/prepare.js

+3-12
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,16 @@ module.exports = async function prepare (sourceDir) {
5050
const dataCode = `export const siteData = ${JSON.stringify(options.siteData, null, 2)}`
5151
await writeTemp('siteData.js', dataCode)
5252

53-
// 4. generate basic polyfill if need to support older browsers
54-
let polyfillCode = ``
55-
if (!options.siteConfig.evergreen) {
56-
polyfillCode =
57-
`import 'es6-promise/auto'
58-
if (!Object.assign) Object.assign = require('object-assign')`
59-
}
60-
await writeTemp('polyfill.js', polyfillCode)
61-
62-
// 5. handle user override
53+
// 4. handle user override
6354
const overridePath = path.resolve(sourceDir, '.vuepress/override.styl')
6455
const hasUserOverride = fs.existsSync(overridePath)
6556
await writeTemp(`override.styl`, hasUserOverride ? `@import(${JSON.stringify(overridePath)})` : ``)
6657

67-
// 6. handle enhanceApp.js
58+
// 5. handle enhanceApp.js
6859
const enhanceAppPath = path.resolve(sourceDir, '.vuepress/enhanceApp.js')
6960
await writeEnhanceTemp('enhanceApp.js', enhanceAppPath)
7061

71-
// 7. handle the theme enhanceApp.js
62+
// 6. handle the theme enhanceApp.js
7263
await writeEnhanceTemp('themeEnhanceApp.js', options.themeEnhanceAppPath)
7364

7465
return options

lib/webpack/createBaseConfig.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,7 @@ module.exports = function createBaseConfig ({
166166
.loader('babel-loader')
167167
.options({
168168
presets: [
169-
require.resolve('babel-preset-env'),
170-
require.resolve('babel-preset-stage-2')
171-
],
172-
plugins: [
173-
require.resolve('babel-plugin-transform-vue-jsx'),
174-
require.resolve('babel-plugin-transform-runtime')
169+
require.resolve('@vue/babel-preset-app')
175170
]
176171
})
177172
}

package.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@
3838
},
3939
"dependencies": {
4040
"autoprefixer": "^8.2.0",
41-
"babel-core": "^6.26.3",
42-
"babel-helper-vue-jsx-merge-props": "^2.0.3",
43-
"babel-loader": "^7.1.4",
44-
"babel-plugin-syntax-jsx": "^6.18.0",
45-
"babel-plugin-transform-runtime": "^6.23.0",
46-
"babel-plugin-transform-vue-jsx": "^3.7.0",
47-
"babel-preset-env": "^1.6.1",
48-
"babel-preset-stage-2": "^6.24.1",
41+
"@babel/core": "7.0.0-beta.47",
42+
"babel-loader": "8.0.0-beta.3",
43+
"@vue/babel-preset-app": "3.0.0-beta.11",
4944
"cache-loader": "^1.2.2",
5045
"chalk": "^2.3.2",
5146
"chokidar": "^2.0.3",
@@ -56,7 +51,6 @@
5651
"css-loader": "^0.28.11",
5752
"diacritics": "^1.3.0",
5853
"docsearch.js": "^2.5.2",
59-
"es6-promise": "^4.2.4",
6054
"escape-html": "^1.0.3",
6155
"file-loader": "^1.1.11",
6256
"fs-extra": "^5.0.0",
@@ -76,7 +70,6 @@
7670
"markdown-it-table-of-contents": "^0.3.3",
7771
"mini-css-extract-plugin": "^0.4.0",
7872
"nprogress": "^0.2.0",
79-
"object-assign": "^4.1.1",
8073
"optimize-css-assets-webpack-plugin": "^4.0.0",
8174
"portfinder": "^1.0.13",
8275
"postcss-loader": "^2.1.5",

0 commit comments

Comments
 (0)