Skip to content

Commit

Permalink
πŸ› Fix webpack externals
Browse files Browse the repository at this point in the history
  • Loading branch information
apertureless committed Nov 6, 2017
1 parent b17602d commit d104e62
Show file tree
Hide file tree
Showing 4 changed files with 811 additions and 603 deletions.
13 changes: 11 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"presets": ["es2015", "stage-2"],
"plugins": ["transform-runtime"],
"presets": [
["@babel/preset-env", {
"modules": false,
"targets": {
"browsers": [
"last 2 versions"
]
}
}],
"@babel/stage-2"
],
"comments": false
}
1 change: 1 addition & 0 deletions build/webpack.release.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ config.output.filename = config.output.filename.replace(/\.js$/, '.min.js')
delete config.devtool

config.plugins = [
new webpack.optimize.ModuleConcatenationPlugin(),
new webpack.optimize.UglifyJsPlugin({
sourceMap: false,
compress: {
Expand Down
29 changes: 10 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-chartjs",
"version": "3.0.0",
"version": "3.0.1-rc2",
"description": "Vue.js wrapper for chart.js for creating beautiful charts.",
"author": "Jakub Juszczak <[email protected]>",
"homepage": "http://vue-chartjs.org",
Expand Down Expand Up @@ -53,26 +53,21 @@
"e2e": "node test/e2e/runner.js",
"test": "npm run unit",
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
"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",
"prepublish": "yarn run lint && yarn run test && yarn run build"
"release": "webpack --progress --hide-modules --config ./build/webpack.release.js && NODE_ENV=production webpack --progress --hide-modules --config ./build/webpack.release.min.js",
"prepublishOnly": "yarn run lint && yarn run test && yarn run build"
},
"dependencies": {
"isparta": "^4.0.0",
"lodash.merge": "^4.6.0"
},
"peerDependencies": {
"chart.js": "2.7.0",
"vue": "2.5.2"
"chart.js": "2.7.x"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6.25.0",
"babel-loader": "7.1.2",
"babel-plugin-transform-object-assign": "^6.22.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.23.0",
"@babel/cli": "^7.0.0-beta.31",
"@babel/core": "^7.0.0-beta.31",
"@babel/preset-env": "^7.0.0-beta.31",
"@babel/preset-stage-2": "^7.0.0-beta.31",
"babel-loader": "8.0.0-beta.0",
"chai": "^3.5.0",
"chart.js": "2.7.0",
"chromedriver": "^2.28.0",
Expand All @@ -98,6 +93,7 @@
"html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.4",
"inject-loader": "^3.0.0",
"isparta": "^4.0.0",
"jasmine-core": "^2.5.2",
"json-loader": "^0.5.4",
"karma": "^1.5.0",
Expand Down Expand Up @@ -137,11 +133,6 @@
"node": ">=6.9.0",
"npm": ">= 3.0.0"
},
"babel": {
"presets": [
"es2015"
]
},
"browserify": {
"transform": [
"babelify"
Expand Down
Loading

0 comments on commit d104e62

Please sign in to comment.