Skip to content

Commit ee2b1c3

Browse files
committed
Maintenance release
- Upgrading packages - performing required updates to support webpack v2.x
1 parent f5c9635 commit ee2b1c3

File tree

4 files changed

+53
-69
lines changed

4 files changed

+53
-69
lines changed

package.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-sketch",
3-
"version": "0.2.12",
3+
"version": "0.2.2",
44
"description": "Sketch Element for React based applications, backed-up by fabricjs as its core",
55
"keywords": [
66
"react",
@@ -40,57 +40,57 @@
4040
"node": ">=4.4.1 <7.0.0"
4141
},
4242
"devDependencies": {
43-
"babel-cli": "^6.16.0",
44-
"babel-core": "^6.16.0",
45-
"babel-eslint": "^7.0.0",
46-
"babel-loader": "^6.2.5",
47-
"babel-plugin-transform-object-assign": "^6.8.0",
48-
"babel-plugin-transform-react-display-name": "^6.8.0",
49-
"babel-plugin-transform-runtime": "^6.15.0",
50-
"babel-polyfill": "^6.16.0",
51-
"babel-preset-es2015": "^6.16.0",
43+
"babel-cli": "^6.22.2",
44+
"babel-core": "^6.22.1",
45+
"babel-eslint": "^7.1.1",
46+
"babel-loader": "^6.2.10",
47+
"babel-plugin-transform-object-assign": "^6.22.0",
48+
"babel-plugin-transform-react-display-name": "^6.22.0",
49+
"babel-plugin-transform-runtime": "^6.22.0",
50+
"babel-polyfill": "^6.22.0",
51+
"babel-preset-es2015": "^6.22.0",
5252
"babel-preset-es2015-loose": "^8.0.0",
53-
"babel-preset-react": "^6.16.0",
54-
"babel-preset-stage-0": "^6.16.0",
55-
"babel-runtime": "^6.11.6",
56-
"canvas": "1.5.0",
53+
"babel-preset-react": "^6.22.0",
54+
"babel-preset-stage-0": "^6.22.0",
55+
"babel-runtime": "^6.22.0",
56+
"canvas": "1.6.2",
5757
"chai": "^3.5.0",
58-
"css-loader": "^0.25.0",
59-
"eslint": "^3.6.1",
60-
"eslint-loader": "^1.5.0",
61-
"eslint-plugin-react": "^6.3.0",
62-
"fabric": "1.6.4",
58+
"css-loader": "^0.26.1",
59+
"eslint": "^3.14.1",
60+
"eslint-loader": "^1.6.1",
61+
"eslint-plugin-react": "^6.9.0",
62+
"fabric": "1.7.3",
6363
"flexboxgrid": "^6.3.1",
64-
"html-webpack-plugin": "^2.22.0",
65-
"karma": "^1.3.0",
64+
"html-webpack-plugin": "^2.28.0",
65+
"karma": "^1.4.1",
6666
"karma-babel-preprocessor": "^6.0.1",
6767
"karma-chai": "^0.1.0",
6868
"karma-coverage": "^1.1.1",
69-
"karma-mocha": "^1.2.0",
70-
"karma-mocha-reporter": "^2.2.0",
69+
"karma-mocha": "^1.3.0",
70+
"karma-mocha-reporter": "^2.2.2",
7171
"karma-phantomjs-launcher": "^1.0.2",
7272
"karma-phantomjs-shim": "^1.4.0",
7373
"karma-sourcemap-loader": "^0.3.7",
74-
"karma-webpack": "^1.8.0",
75-
"material-ui": "^0.15.4",
76-
"mocha": "^3.1.0",
74+
"karma-webpack": "^2.0.2",
75+
"material-ui": "^0.16.7",
76+
"mocha": "^3.2.0",
7777
"my-local-ip": "^1.0.0",
7878
"open": "0.0.5",
79-
"open-browser-webpack-plugin": "0.0.2",
80-
"phantomjs-prebuilt": "^2.1.12",
81-
"react-addons-test-utils": "15.3.2",
82-
"react-color": "^2.3.2",
79+
"open-browser-webpack-plugin": "0.0.3",
80+
"phantomjs-prebuilt": "^2.1.14",
81+
"react-addons-test-utils": "15.4.2",
82+
"react-color": "^2.11.1",
8383
"react-hot-loader": "^3.0.0-beta.5",
84-
"react-tap-event-plugin": "^1.0.0",
84+
"react-tap-event-plugin": "^2.0.1",
8585
"rimraf": "^2.5.4",
8686
"style-loader": "^0.13.1",
87-
"webpack": "^1.13.2",
88-
"webpack-dev-server": "^1.16.1",
87+
"webpack": "^2.2.1",
88+
"webpack-dev-server": "^1.16.3",
8989
"weinre": "^2.0.0-pre-I0Z7U9OV"
9090
},
9191
"dependencies": {
92-
"react": "15.3.2",
93-
"react-addons-pure-render-mixin": "15.3.2",
94-
"react-dom": "15.3.2"
92+
"react": "15.4.2",
93+
"react-addons-pure-render-mixin": "15.4.2",
94+
"react-dom": "15.4.2"
9595
}
9696
}

webpack.examples.cfg.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ const examplesPath = path.join(__dirname, 'examples');
77
const HtmlWebpackPlugin = require('html-webpack-plugin');
88
const IgnorePlugin = require('webpack/lib/IgnorePlugin');
99
const DefinePlugin = require('webpack/lib/DefinePlugin');
10-
const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin');
11-
const DedupePlugin = require('webpack/lib/optimize/DedupePlugin');
1210
const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin');
13-
const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin');
11+
const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin');
12+
const OccurrenceOrderPlugin = require('webpack/lib/optimize/OccurrenceOrderPlugin');
1413
const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin');
1514
const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin');
1615

@@ -25,9 +24,8 @@ var config = {
2524
publicPath: ''
2625
},
2726
resolve: {
28-
extensions: ['', '.js', '.jsx']
27+
extensions: ['.js', '.jsx']
2928
},
30-
debug: false,
3129
cache: true,
3230
devtool: 'source-map',
3331
module: {
@@ -38,14 +36,13 @@ var config = {
3836
test: /\.(js|jsx)$/,
3937
include: [srcPath, examplesPath],
4038
exclude: /(node_modules|bower_components|lib)/,
41-
loaders: ['babel']
39+
loaders: ['babel-loader']
4240
}
4341
]
4442
},
4543
plugins: [
46-
new DedupePlugin(),
4744
new UglifyJsPlugin(),
48-
new OccurenceOrderPlugin(),
45+
new OccurrenceOrderPlugin(),
4946
new AggressiveMergingPlugin(),
5047
new IgnorePlugin(new RegExp('^(fs|ipc)$')),
5148
new DefinePlugin({
@@ -54,7 +51,7 @@ var config = {
5451
}
5552
}),
5653
new HotModuleReplacementPlugin(),
57-
new NoErrorsPlugin(),
54+
new NoEmitOnErrorsPlugin(),
5855
new HtmlWebpackPlugin({
5956
title: 'React Sketch',
6057
description: 'Sketch Element for React based applications, backed-up by fabricjs as its core',

webpack.library.cfg.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ var path = require('path');
44

55
const IgnorePlugin = require('webpack/lib/IgnorePlugin');
66
const DefinePlugin = require('webpack/lib/DefinePlugin');
7-
const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin');
8-
const DedupePlugin = require('webpack/lib/optimize/DedupePlugin');
97
const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin');
10-
const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin');
8+
const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin');
9+
const OccurrenceOrderPlugin = require('webpack/lib/optimize/OccurrenceOrderPlugin');
1110
const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin');
1211

1312
const srcPath = path.join(__dirname, 'src');
@@ -42,29 +41,27 @@ module.exports = {
4241
//externals: [/^(?!fabric|canvas|base64-js|ieee754|isarray|jsdom|xmldom)[a-z\-0-9]+$/],
4342
externals: explicitExternals.concat(externals),
4443
resolve: {
45-
extensions: ['', '.js', '.jsx']
44+
extensions: ['.js', '.jsx']
4645
},
47-
debug: false,
4846
cache: true,
4947
module: {
5048
loaders: [
5149
{
5250
test: /\.(js|jsx)$/,
5351
include: [srcPath],
5452
exclude: /(node_modules|bower_components|lib)/,
55-
loaders: ['babel']
53+
loaders: ['babel-loader']
5654
}
5755
]
5856
},
5957
plugins: [
60-
new DedupePlugin(),
6158
new UglifyJsPlugin({
6259
compress: {
6360
warnings: false
6461
}
6562
}),
66-
new NoErrorsPlugin(),
67-
new OccurenceOrderPlugin(),
63+
new NoEmitOnErrorsPlugin(),
64+
new OccurrenceOrderPlugin(),
6865
new AggressiveMergingPlugin(),
6966
new IgnorePlugin(new RegExp('^(fs|ipc)$')),
7067
new DefinePlugin({

webpack.server.js

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const WebpackDevServer = require('webpack-dev-server');
1010

1111
const DefinePlugin = require('webpack/lib/DefinePlugin');
1212
const HtmlWebpackPlugin = require('html-webpack-plugin');
13-
const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin');
1413
const OpenBrowserPlugin = require('open-browser-webpack-plugin');
14+
const NoEmitOnErrorsPlugin = require('webpack/lib/NoEmitOnErrorsPlugin');
1515
const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin');
1616

1717
const srcPath = path.join(__dirname, 'src');
@@ -21,7 +21,6 @@ const port = 23000;
2121
const host = myLocalIP();
2222

2323
const config = {
24-
port: port,
2524
entry: {
2625
examples: [
2726
'webpack-dev-server/client?http://' + host + ':' + port,
@@ -35,9 +34,8 @@ const config = {
3534
publicPath: '/'
3635
},
3736
resolve: {
38-
extensions: ['', '.js', '.jsx']
37+
extensions: ['.js', '.jsx']
3938
},
40-
debug: true,
4139
cache: true,
4240
devtool: 'inline-source-map',
4341
devServer: {
@@ -49,27 +47,19 @@ const config = {
4947
hot: true
5048
},
5149
module: {
52-
preLoaders: [
53-
{
54-
test: /\.(js|jsx)$/,
55-
include: [srcPath],
56-
exclude: /(node_modules|bower_components|lib)/,
57-
loader: 'eslint-loader'
58-
}
59-
],
6050
loaders: [
6151
{test: /\.css$/, loader: 'style-loader!css-loader'},
6252
{
6353
test: /\.(js|jsx)$/,
6454
include: [srcPath, examplesPath],
6555
exclude: /(node_modules|bower_components|lib)/,
66-
loaders: ['babel']
56+
loaders: ['babel-loader']
6757
}
6858
]
6959
},
7060
plugins: [
7161
new HotModuleReplacementPlugin(),
72-
new NoErrorsPlugin(),
62+
new NoEmitOnErrorsPlugin(),
7363
new HtmlWebpackPlugin({
7464
title: 'React Sketch',
7565
description: 'Sketch Element for React based applications, backed-up by fabricjs as its core',
@@ -89,7 +79,7 @@ const config = {
8979
};
9080

9181
new WebpackDevServer(webpack(config), config.devServer)
92-
.listen(config.port, host, function (err) {
82+
.listen(port, host, function (err) {
9383
if (err) {
9484
console.log(err);
9585
}

0 commit comments

Comments
 (0)