Skip to content

Commit 97476a4

Browse files
committed
more build tweaks
1 parent 961d109 commit 97476a4

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

.babelrc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
{
2-
"env": {
3-
"development": {
4-
"presets": ["es2015", "flow-vue"]
5-
},
6-
"production": {
7-
"presets": ["es2015-rollup-vue", "flow-vue"]
8-
}
9-
},
2+
"presets": ["es2015", "flow-vue"],
103
"ignore": [
114
"dist/*.js",
125
"packages/**/*.js"

build/alias.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const path = require('path')
2+
3+
module.exports = {
4+
vue: path.resolve(__dirname, '../src/entries/web-runtime-with-compiler'),
5+
compiler: path.resolve(__dirname, '../src/compiler'),
6+
core: path.resolve(__dirname, '../src/core'),
7+
shared: path.resolve(__dirname, '../src/shared'),
8+
web: path.resolve(__dirname, '../src/platforms/web'),
9+
server: path.resolve(__dirname, '../src/server'),
10+
entries: path.resolve(__dirname, '../src/entries'),
11+
sfc: path.resolve(__dirname, '../src/sfc')
12+
}

build/karma.base.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var webpackConfig = {
1111
loaders: [
1212
{
1313
test: /\.js$/,
14-
loader: 'babel!eslint',
14+
loader: 'babel',
1515
exclude: /node_modules/
1616
}
1717
]

build/rollup-plugin-flow.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
var flowRemoveTypes = require('flow-remove-types')
2-
var createFilter = require('rollup-pluginutils').createFilter
1+
const flowRemoveTypes = require('flow-remove-types')
2+
const createFilter = require('rollup-pluginutils').createFilter
33

4-
module.exports = function(options) {
5-
options = options || {};
6-
var filter = createFilter(options.include, options.exclude)
4+
module.exports = options => {
5+
options = options || {}
6+
const filter = createFilter(options.include, options.exclude)
77

88
return {
99
name: 'flow-remove-types',
10-
transform: function(code, id) {
10+
transform: (code, id) => {
1111
if (filter(id)) {
1212
return flowRemoveTypes(code)
1313
}

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"build": "node build/build.js",
1818
"build:ssr": "npm run build -- vue.common.js,vue-server-renderer",
1919
"test": "npm run lint && flow check && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr",
20-
"test:unit": "NODE_ENV=development karma start build/karma.unit.config.js",
21-
"test:cover": "NODE_ENV=development karma start build/karma.cover.config.js",
20+
"test:unit": "karma start build/karma.unit.config.js",
21+
"test:cover": "karma start build/karma.cover.config.js",
2222
"test:e2e": "npm run build -- vue.js && node test/e2e/runner.js",
23-
"test:ssr": "npm run build:ssr && NODE_ENV=development VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json",
23+
"test:ssr": "npm run build:ssr && VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json",
2424
"test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
2525
"lint": "eslint src build test",
2626
"flow": "flow check",
27-
"sauce": "NODE_ENV=development SAUCE=true karma start build/karma.sauce.config.js",
27+
"sauce": "SAUCE=true karma start build/karma.sauce.config.js",
2828
"bench:ssr": "npm run build:ssr && NODE_ENV=production VUE_ENV=server node benchmarks/ssr/renderToString.js && NODE_ENV=production VUE_ENV=server node benchmarks/ssr/renderToStream.js",
2929
"release": "bash build/release.sh"
3030
},
@@ -47,7 +47,6 @@
4747
"babel-loader": "^6.2.4",
4848
"babel-plugin-coverage": "^1.0.0",
4949
"babel-preset-es2015": "^6.9.0",
50-
"babel-preset-es2015-rollup-vue": "^1.1.0",
5150
"babel-preset-flow-vue": "^1.0.0",
5251
"buble": "^0.13.1",
5352
"chromedriver": "^2.21.2",
@@ -87,6 +86,6 @@
8786
"rollup-watch": "^2.5.0",
8887
"selenium-server": "2.53.0",
8988
"uglify-js": "^2.6.2",
90-
"webpack": "^1.13.1"
89+
"webpack": "^1.13.2"
9190
}
9291
}

0 commit comments

Comments
 (0)