Skip to content

Commit 12e8efc

Browse files
vikr01yyx990803
authored andcommittedOct 23, 2018
workflow: upgraded to babel 7 (vuejs#8948)
1 parent 93d1f5f commit 12e8efc

10 files changed

+2297
-522
lines changed
 

‎.babelrc

-8
This file was deleted.

‎.babelrc.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
const babelPresetFlowVue = {
2+
plugins: [
3+
require('@babel/plugin-proposal-class-properties'),
4+
// require('@babel/plugin-syntax-flow'), // not needed, included in transform-flow-strip-types
5+
require('@babel/plugin-transform-flow-strip-types')
6+
]
7+
}
8+
9+
module.exports = {
10+
presets: [
11+
require('@babel/preset-env'),
12+
// require('babel-preset-flow-vue')
13+
babelPresetFlowVue
14+
],
15+
plugins: [
16+
require('babel-plugin-transform-vue-jsx'),
17+
require('@babel/plugin-syntax-dynamic-import')
18+
],
19+
ignore: [
20+
'dist/*.js',
21+
'packages/**/*.js'
22+
]
23+
}

‎package.json

+14-11
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"test:unit": "karma start test/unit/karma.unit.config.js",
3131
"test:cover": "karma start test/unit/karma.cover.config.js",
3232
"test:e2e": "npm run build -- web-full-prod,web-server-basic-renderer && node test/e2e/runner.js",
33-
"test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.json",
34-
"test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json",
33+
"test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.js",
34+
"test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.js",
3535
"test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
3636
"test:types": "tsc -p ./types/test/tsconfig.json",
3737
"lint": "eslint --fix src scripts test",
@@ -67,18 +67,21 @@
6767
},
6868
"homepage": "https://github.com/vuejs/vue#readme",
6969
"devDependencies": {
70+
"@babel/core": "^7.0.0",
71+
"@babel/plugin-proposal-class-properties": "^7.1.0",
72+
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
73+
"@babel/plugin-syntax-jsx": "^7.0.0",
74+
"@babel/plugin-transform-flow-strip-types": "^7.0.0",
75+
"@babel/preset-env": "^7.0.0",
76+
"@babel/register": "^7.0.0",
7077
"@types/node": "^8.0.33",
7178
"@types/webpack": "^3.0.13",
7279
"acorn": "^5.2.1",
73-
"babel-core": "^6.25.0",
7480
"babel-eslint": "^8.0.3",
75-
"babel-helper-vue-jsx-merge-props": "^2.0.2",
76-
"babel-loader": "^7.0.0",
77-
"babel-plugin-istanbul": "^4.1.4",
78-
"babel-plugin-syntax-dynamic-import": "^6.18.0",
79-
"babel-plugin-syntax-jsx": "^6.18.0",
80-
"babel-plugin-transform-vue-jsx": "^3.4.3",
81-
"babel-preset-es2015": "^6.24.1",
81+
"babel-helper-vue-jsx-merge-props": "^2.0.3",
82+
"babel-loader": "^8.0.4",
83+
"babel-plugin-istanbul": "^5.1.0",
84+
"babel-plugin-transform-vue-jsx": "^4.0.1",
8285
"babel-preset-flow-vue": "^1.0.0",
8386
"buble": "^0.19.3",
8487
"chalk": "^2.3.0",
@@ -125,7 +128,7 @@
125128
"resolve": "^1.3.3",
126129
"rollup": "^0.54.1",
127130
"rollup-plugin-alias": "^1.3.1",
128-
"rollup-plugin-babel": "^3.0.2",
131+
"rollup-plugin-babel": "^4.0.1",
129132
"rollup-plugin-buble": "^0.19.2",
130133
"rollup-plugin-commonjs": "^8.0.0",
131134
"rollup-plugin-flow-no-whitespace": "^1.0.0",

‎test/ssr/fixtures/async-foo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import './test.css'
33
import font from './test.woff2'
44
import image from './test.png'
55

6-
module.exports = {
6+
export default {
77
beforeCreate () {
88
this.$vnode.ssrContext._registeredComponents.add('__MODULE_ID__')
99
},

‎test/ssr/fixtures/split.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default context => {
1919
// simulate router.onReady
2020
Foo().then(comp => {
2121
// resolve now to make the render sync
22-
Foo.resolved = Vue.extend(comp)
22+
Foo.resolved = Vue.extend(comp.default)
2323
resolve(vm)
2424
})
2525
})

‎test/ssr/jasmine.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
spec_dir: 'test/ssr',
3+
spec_files: [
4+
'*.spec.js'
5+
],
6+
helpers: [
7+
require.resolve('@babel/register')
8+
]
9+
}

‎test/ssr/jasmine.json

-9
This file was deleted.

‎test/weex/jasmine.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
spec_dir: 'test/weex',
3+
spec_files: [
4+
'**/*[sS]pec.js'
5+
],
6+
helpers: [
7+
require.resolve('@babel/register')
8+
]
9+
}

‎test/weex/jasmine.json

-9
This file was deleted.

‎yarn.lock

+2,240-483
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.