Skip to content

Commit d104e62

Browse files
committed
🐛 Fix webpack externals
1 parent b17602d commit d104e62

File tree

4 files changed

+811
-603
lines changed

4 files changed

+811
-603
lines changed

.babelrc

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
2-
"presets": ["es2015", "stage-2"],
3-
"plugins": ["transform-runtime"],
2+
"presets": [
3+
["@babel/preset-env", {
4+
"modules": false,
5+
"targets": {
6+
"browsers": [
7+
"last 2 versions"
8+
]
9+
}
10+
}],
11+
"@babel/stage-2"
12+
],
413
"comments": false
514
}

build/webpack.release.min.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config.output.filename = config.output.filename.replace(/\.js$/, '.min.js')
66
delete config.devtool
77

88
config.plugins = [
9+
new webpack.optimize.ModuleConcatenationPlugin(),
910
new webpack.optimize.UglifyJsPlugin({
1011
sourceMap: false,
1112
compress: {

package.json

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-chartjs",
3-
"version": "3.0.0",
3+
"version": "3.0.1-rc2",
44
"description": "Vue.js wrapper for chart.js for creating beautiful charts.",
55
"author": "Jakub Juszczak <[email protected]>",
66
"homepage": "http://vue-chartjs.org",
@@ -53,26 +53,21 @@
5353
"e2e": "node test/e2e/runner.js",
5454
"test": "npm run unit",
5555
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
56-
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.min.js && webpack --progress --hide-modules --config ./build/webpack.release.full.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.full.min.js",
57-
"prepublish": "yarn run lint && yarn run test && yarn run build"
56+
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.min.js",
57+
"prepublishOnly": "yarn run lint && yarn run test && yarn run build"
5858
},
5959
"dependencies": {
60-
"isparta": "^4.0.0",
6160
"lodash.merge": "^4.6.0"
6261
},
6362
"peerDependencies": {
64-
"chart.js": "2.7.0",
65-
"vue": "2.5.2"
63+
"chart.js": "2.7.x"
6664
},
6765
"devDependencies": {
68-
"babel-cli": "^6.24.1",
69-
"babel-core": "^6.25.0",
70-
"babel-loader": "7.1.2",
71-
"babel-plugin-transform-object-assign": "^6.22.0",
72-
"babel-plugin-transform-runtime": "^6.23.0",
73-
"babel-preset-es2015": "^6.24.1",
74-
"babel-preset-stage-2": "^6.24.1",
75-
"babel-runtime": "^6.23.0",
66+
"@babel/cli": "^7.0.0-beta.31",
67+
"@babel/core": "^7.0.0-beta.31",
68+
"@babel/preset-env": "^7.0.0-beta.31",
69+
"@babel/preset-stage-2": "^7.0.0-beta.31",
70+
"babel-loader": "8.0.0-beta.0",
7671
"chai": "^3.5.0",
7772
"chart.js": "2.7.0",
7873
"chromedriver": "^2.28.0",
@@ -98,6 +93,7 @@
9893
"html-webpack-plugin": "^2.28.0",
9994
"http-proxy-middleware": "^0.17.4",
10095
"inject-loader": "^3.0.0",
96+
"isparta": "^4.0.0",
10197
"jasmine-core": "^2.5.2",
10298
"json-loader": "^0.5.4",
10399
"karma": "^1.5.0",
@@ -137,11 +133,6 @@
137133
"node": ">=6.9.0",
138134
"npm": ">= 3.0.0"
139135
},
140-
"babel": {
141-
"presets": [
142-
"es2015"
143-
]
144-
},
145136
"browserify": {
146137
"transform": [
147138
"babelify"

0 commit comments

Comments
 (0)