diff --git a/package.json b/package.json index 07cbf9f6..637c0562 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-sketch", - "version": "0.2.12", + "version": "0.2.2", "description": "Sketch Element for React based applications, backed-up by fabricjs as its core", "keywords": [ "react", @@ -40,57 +40,57 @@ "node": ">=4.4.1 <7.0.0" }, "devDependencies": { - "babel-cli": "^6.16.0", - "babel-core": "^6.16.0", - "babel-eslint": "^7.0.0", - "babel-loader": "^6.2.5", - "babel-plugin-transform-object-assign": "^6.8.0", - "babel-plugin-transform-react-display-name": "^6.8.0", - "babel-plugin-transform-runtime": "^6.15.0", - "babel-polyfill": "^6.16.0", - "babel-preset-es2015": "^6.16.0", + "babel-cli": "^6.22.2", + "babel-core": "^6.22.1", + "babel-eslint": "^7.1.1", + "babel-loader": "^6.2.10", + "babel-plugin-transform-object-assign": "^6.22.0", + "babel-plugin-transform-react-display-name": "^6.22.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-polyfill": "^6.22.0", + "babel-preset-es2015": "^6.22.0", "babel-preset-es2015-loose": "^8.0.0", - "babel-preset-react": "^6.16.0", - "babel-preset-stage-0": "^6.16.0", - "babel-runtime": "^6.11.6", - "canvas": "1.5.0", + "babel-preset-react": "^6.22.0", + "babel-preset-stage-0": "^6.22.0", + "babel-runtime": "^6.22.0", + "canvas": "1.6.2", "chai": "^3.5.0", - "css-loader": "^0.25.0", - "eslint": "^3.6.1", - "eslint-loader": "^1.5.0", - "eslint-plugin-react": "^6.3.0", - "fabric": "1.6.4", + "css-loader": "^0.26.1", + "eslint": "^3.14.1", + "eslint-loader": "^1.6.1", + "eslint-plugin-react": "^6.9.0", + "fabric": "1.7.3", "flexboxgrid": "^6.3.1", - "html-webpack-plugin": "^2.22.0", - "karma": "^1.3.0", + "html-webpack-plugin": "^2.28.0", + "karma": "^1.4.1", "karma-babel-preprocessor": "^6.0.1", "karma-chai": "^0.1.0", "karma-coverage": "^1.1.1", - "karma-mocha": "^1.2.0", - "karma-mocha-reporter": "^2.2.0", + "karma-mocha": "^1.3.0", + "karma-mocha-reporter": "^2.2.2", "karma-phantomjs-launcher": "^1.0.2", "karma-phantomjs-shim": "^1.4.0", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^1.8.0", - "material-ui": "^0.15.4", - "mocha": "^3.1.0", + "karma-webpack": "^2.0.2", + "material-ui": "^0.16.7", + "mocha": "^3.2.0", "my-local-ip": "^1.0.0", "open": "0.0.5", - "open-browser-webpack-plugin": "0.0.2", - "phantomjs-prebuilt": "^2.1.12", - "react-addons-test-utils": "15.3.2", - "react-color": "^2.3.2", + "open-browser-webpack-plugin": "0.0.3", + "phantomjs-prebuilt": "^2.1.14", + "react-addons-test-utils": "15.4.2", + "react-color": "^2.11.1", "react-hot-loader": "^3.0.0-beta.5", - "react-tap-event-plugin": "^1.0.0", + "react-tap-event-plugin": "^2.0.1", "rimraf": "^2.5.4", "style-loader": "^0.13.1", - "webpack": "^1.13.2", - "webpack-dev-server": "^1.16.1", + "webpack": "^2.2.1", + "webpack-dev-server": "^1.16.3", "weinre": "^2.0.0-pre-I0Z7U9OV" }, "dependencies": { - "react": "15.3.2", - "react-addons-pure-render-mixin": "15.3.2", - "react-dom": "15.3.2" + "react": "15.4.2", + "react-addons-pure-render-mixin": "15.4.2", + "react-dom": "15.4.2" } } diff --git a/webpack.examples.cfg.js b/webpack.examples.cfg.js index ebc5dd58..64435445 100644 --- a/webpack.examples.cfg.js +++ b/webpack.examples.cfg.js @@ -7,10 +7,9 @@ const examplesPath = path.join(__dirname, 'examples'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const IgnorePlugin = require('webpack/lib/IgnorePlugin'); const DefinePlugin = require('webpack/lib/DefinePlugin'); -const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin'); -const DedupePlugin = require('webpack/lib/optimize/DedupePlugin'); const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); -const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin'); +const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin'); +const OccurrenceOrderPlugin = require('webpack/lib/optimize/OccurrenceOrderPlugin'); const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin'); @@ -25,9 +24,8 @@ var config = { publicPath: '' }, resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, - debug: false, cache: true, devtool: 'source-map', module: { @@ -38,14 +36,13 @@ var config = { test: /\.(js|jsx)$/, include: [srcPath, examplesPath], exclude: /(node_modules|bower_components|lib)/, - loaders: ['babel'] + loaders: ['babel-loader'] } ] }, plugins: [ - new DedupePlugin(), new UglifyJsPlugin(), - new OccurenceOrderPlugin(), + new OccurrenceOrderPlugin(), new AggressiveMergingPlugin(), new IgnorePlugin(new RegExp('^(fs|ipc)$')), new DefinePlugin({ @@ -54,7 +51,7 @@ var config = { } }), new HotModuleReplacementPlugin(), - new NoErrorsPlugin(), + new NoEmitOnErrorsPlugin(), new HtmlWebpackPlugin({ title: 'React Sketch', description: 'Sketch Element for React based applications, backed-up by fabricjs as its core', diff --git a/webpack.library.cfg.js b/webpack.library.cfg.js index 3a140336..2d67e59d 100644 --- a/webpack.library.cfg.js +++ b/webpack.library.cfg.js @@ -4,10 +4,9 @@ var path = require('path'); const IgnorePlugin = require('webpack/lib/IgnorePlugin'); const DefinePlugin = require('webpack/lib/DefinePlugin'); -const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin'); -const DedupePlugin = require('webpack/lib/optimize/DedupePlugin'); const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); -const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin'); +const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin'); +const OccurrenceOrderPlugin = require('webpack/lib/optimize/OccurrenceOrderPlugin'); const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin'); const srcPath = path.join(__dirname, 'src'); @@ -42,9 +41,8 @@ module.exports = { //externals: [/^(?!fabric|canvas|base64-js|ieee754|isarray|jsdom|xmldom)[a-z\-0-9]+$/], externals: explicitExternals.concat(externals), resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, - debug: false, cache: true, module: { loaders: [ @@ -52,19 +50,18 @@ module.exports = { test: /\.(js|jsx)$/, include: [srcPath], exclude: /(node_modules|bower_components|lib)/, - loaders: ['babel'] + loaders: ['babel-loader'] } ] }, plugins: [ - new DedupePlugin(), new UglifyJsPlugin({ compress: { warnings: false } }), - new NoErrorsPlugin(), - new OccurenceOrderPlugin(), + new NoEmitOnErrorsPlugin(), + new OccurrenceOrderPlugin(), new AggressiveMergingPlugin(), new IgnorePlugin(new RegExp('^(fs|ipc)$')), new DefinePlugin({ diff --git a/webpack.server.js b/webpack.server.js index 6379c5d9..f4a804f9 100644 --- a/webpack.server.js +++ b/webpack.server.js @@ -10,8 +10,8 @@ const WebpackDevServer = require('webpack-dev-server'); const DefinePlugin = require('webpack/lib/DefinePlugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); -const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin'); const OpenBrowserPlugin = require('open-browser-webpack-plugin'); +const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin'); const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); const srcPath = path.join(__dirname, 'src'); @@ -21,7 +21,6 @@ const port = 23000; const host = myLocalIP(); const config = { - port: port, entry: { examples: [ 'webpack-dev-server/client?http://' + host + ':' + port, @@ -35,9 +34,8 @@ const config = { publicPath: '/' }, resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, - debug: true, cache: true, devtool: 'inline-source-map', devServer: { @@ -49,27 +47,19 @@ const config = { hot: true }, module: { - preLoaders: [ - { - test: /\.(js|jsx)$/, - include: [srcPath], - exclude: /(node_modules|bower_components|lib)/, - loader: 'eslint-loader' - } - ], loaders: [ {test: /\.css$/, loader: 'style-loader!css-loader'}, { test: /\.(js|jsx)$/, include: [srcPath, examplesPath], exclude: /(node_modules|bower_components|lib)/, - loaders: ['babel'] + loaders: ['babel-loader'] } ] }, plugins: [ new HotModuleReplacementPlugin(), - new NoErrorsPlugin(), + new NoEmitOnErrorsPlugin(), new HtmlWebpackPlugin({ title: 'React Sketch', description: 'Sketch Element for React based applications, backed-up by fabricjs as its core', @@ -89,7 +79,7 @@ const config = { }; new WebpackDevServer(webpack(config), config.devServer) - .listen(config.port, host, function (err) { + .listen(port, host, function (err) { if (err) { console.log(err); }