From b838e6ffc8c95881f52eb6e2dd374b13681063d4 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Tue, 30 Aug 2016 19:30:08 +0300 Subject: [PATCH 01/17] Upgrading to latest packages --- .travis.yml | 2 +- package.json | 56 +++++++++++++++++++++--------------------- src/SketchField.jsx | 7 +++++- src/pencil.js | 6 ++--- webpack.library.cfg.js | 2 -- webpack.server.js | 16 ++++++------ 6 files changed, 46 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4322fb1..0e249fb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ before_install: language: node_js node_js: - - '0.12' + - '6.2.2' diff --git a/package.json b/package.json index 79ed5b72..dce0110f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-sketch", - "version": "0.2.7", + "version": "0.2.8", "description": "Sketch Element for React based applications, backed-up by fabricjs as its core", "keywords": [ "react", @@ -37,33 +37,33 @@ "posttest": "npm run lint" }, "engines": { - "node": ">0.4.0 <1.0.0" + "node": ">=4.4.1 <7.0.0" }, "devDependencies": { - "babel-cli": "^6.11.4", - "babel-core": "^6.11.4", + "babel-cli": "^6.14.0", + "babel-core": "^6.14.0", "babel-eslint": "^6.1.2", - "babel-loader": "^6.2.4", + "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.12.0", - "babel-polyfill": "^6.9.1", - "babel-preset-es2015": "^6.9.0", + "babel-polyfill": "^6.13.0", + "babel-preset-es2015": "^6.14.0", "babel-preset-es2015-loose": "^7.0.0", "babel-preset-react": "^6.11.1", "babel-preset-react-hmre": "^1.1.1", "babel-preset-stage-0": "^6.5.0", - "canvas": "1.3.16", + "canvas": "1.4.0", "chai": "^3.5.0", - "core-js": "^2.4.1", - "css-loader": "^0.23.1", - "eslint": "^3.2.2", + "css-loader": "^0.24.0", + "eslint": "^3.4.0", "eslint-loader": "^1.5.0", - "eslint-plugin-react": "^6.0.0", - "fabric": "1.6.2", - "flexboxgrid": "^6.3.0", + "eslint-plugin-react": "^6.2.0", + "fabric": "1.6.3", + "flexboxgrid": "^6.3.1", "html-webpack-plugin": "^2.22.0", - "karma": "^1.1.2", + "jsdom": "^9.4.2", + "karma": "^1.2.0", "karma-babel-preprocessor": "^6.0.1", "karma-chai": "^0.1.0", "karma-coverage": "^1.1.1", @@ -72,27 +72,27 @@ "karma-phantomjs-launcher": "^1.0.1", "karma-phantomjs-shim": "^1.4.0", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^1.7.0", - "material-ui": "^0.15.3", - "mocha": "^3.0.1", + "karma-webpack": "^1.8.0", + "material-ui": "^0.15.4", + "mocha": "^3.0.2", "my-local-ip": "^1.0.0", "open": "0.0.5", "open-browser-webpack-plugin": "0.0.2", - "phantomjs": "^2.1.7", - "phantomjs-prebuilt": "^2.1.10", - "react-addons-test-utils": "15.2.1", - "react-color": "^2.2.2", + "phantomjs-prebuilt": "^2.1.12", + "react-addons-test-utils": "15.3.1", + "react-color": "^2.2.6", "react-hot-loader": "^1.3.0", "react-tap-event-plugin": "latest", "rimraf": "^2.5.4", "style-loader": "^0.13.1", - "webpack": "^1.13.1", - "webpack-dev-server": "^1.14.1", - "weinre": "^2.0.0-pre-I0Z7U9OV" + "webpack": "^1.13.2", + "webpack-dev-server": "^1.15.0", + "weinre": "^2.0.0-pre-I0Z7U9OV", + "xmldom": "^0.1.22" }, "dependencies": { - "react": "15.2.1", - "react-addons-pure-render-mixin": "15.2.1", - "react-dom": "15.2.1" + "react": "15.3.1", + "react-addons-pure-render-mixin": "15.3.1", + "react-dom": "15.3.1" } } diff --git a/src/SketchField.jsx b/src/SketchField.jsx index 457cd72c..42c36671 100644 --- a/src/SketchField.jsx +++ b/src/SketchField.jsx @@ -91,7 +91,12 @@ class SketchField extends Component { defaultData, defaultDataType} = this.props; - let canvas = this._fc = new fabric.Canvas(this._canvas.id); + let canvas = this._fc = new fabric.Canvas(this._canvas.id/*, { + preserveObjectStacking: false, + renderOnAddRemove: false, + skipTargetFind: true + }*/); + this._initTools(canvas); let selectedTool = this._tools[tool]; diff --git a/src/pencil.js b/src/pencil.js index 317782b5..907a2e1e 100644 --- a/src/pencil.js +++ b/src/pencil.js @@ -6,10 +6,8 @@ class Pencil extends FabricCanvasTool { configureCanvas(props) { this._canvas.isDrawingMode = true; - // Initial line configuration - let {freeDrawingBrush} = this._canvas; - freeDrawingBrush.width = props.lineWidth; - freeDrawingBrush.color = props.lineColor; + this._canvas.freeDrawingBrush.width = props.lineWidth; + this._canvas.freeDrawingBrush.color = props.lineColor; } } diff --git a/webpack.library.cfg.js b/webpack.library.cfg.js index 7ab15ae0..aa3f6d5a 100644 --- a/webpack.library.cfg.js +++ b/webpack.library.cfg.js @@ -8,7 +8,6 @@ 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 HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin'); const srcPath = path.join(__dirname, 'src'); @@ -67,7 +66,6 @@ module.exports = { new NoErrorsPlugin(), new OccurenceOrderPlugin(), new AggressiveMergingPlugin(), - new HotModuleReplacementPlugin(), new IgnorePlugin(new RegExp('^(fs|ipc)$')), new DefinePlugin({'process.env.NODE_ENV': '"production"'}) ] diff --git a/webpack.server.js b/webpack.server.js index 729db89d..6bba532c 100644 --- a/webpack.server.js +++ b/webpack.server.js @@ -5,8 +5,9 @@ require('core-js/fn/object/assign'); const path = require('path'); const webpack = require('webpack'); -const WebpackDevServer = require('webpack-dev-server'); const myLocalIP = require('my-local-ip'); +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 HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); @@ -51,7 +52,7 @@ var config = { { test: /\.(js|jsx)$/, include: [srcPath], - exclude: /(node_modules|bower_components)/, + exclude: /(node_modules|bower_components|lib)/, loader: 'eslint-loader' } ], @@ -60,8 +61,8 @@ var config = { { test: /\.(js|jsx)$/, include: [srcPath, examplesPath], - exclude: /(node_modules|bower_components)/, - loaders: ['react-hot', 'babel'] + exclude: /(node_modules|bower_components|lib)/, + loaders: ['babel'] } ] }, @@ -77,15 +78,16 @@ var config = { filename: 'index.html', chunks: ['examples'] }), - new OpenBrowserPlugin({url: 'http://localhost:' + port}) + new DefinePlugin({'process.env.NODE_ENV': '"development"'}), + new OpenBrowserPlugin({url: 'http://' + host + ':' + port}) ] }; new WebpackDevServer(webpack(config), config.devServer) - .listen(config.port, '0.0.0.0', function (err) { + .listen(config.port, host, function (err) { if (err) { console.log(err); } - console.log('Serving from http://localhost:' + config.port); + console.log('Serving from http://' + host + ':' + port); } ); From abda6a66deb8535848775b141a21831fa12ee261 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Tue, 30 Aug 2016 19:44:44 +0300 Subject: [PATCH 02/17] removing devtool as it creates flickers to circle elements when in dev mode --- webpack.server.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webpack.server.js b/webpack.server.js index 6bba532c..d2b05c57 100644 --- a/webpack.server.js +++ b/webpack.server.js @@ -12,6 +12,14 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const NoErrorsPlugin = require('webpack/lib/NoErrorsPlugin'); const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); + +const IgnorePlugin = require('webpack/lib/IgnorePlugin'); +const DedupePlugin = require('webpack/lib/optimize/DedupePlugin'); +const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); +const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin'); +const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin'); + + const srcPath = path.join(__dirname, 'src'); const examplesPath = path.join(__dirname, 'examples'); @@ -38,7 +46,6 @@ var config = { }, debug: true, cache: true, - devtool: 'eval', devServer: { historyApiFallback: true, stats: {colors: true}, From 97db38895bf9f300216b101978d8a02e60cd9846 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 09:50:24 +0300 Subject: [PATCH 03/17] removing devtool as it creates flickers to circle elements when in dev mode --- .travis.yml | 2 +- webpack.server.js | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e249fb3..1df2def0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ before_install: language: node_js node_js: - - '6.2.2' + - '4.4.1' diff --git a/webpack.server.js b/webpack.server.js index d2b05c57..115cf3b1 100644 --- a/webpack.server.js +++ b/webpack.server.js @@ -7,27 +7,20 @@ const path = require('path'); const webpack = require('webpack'); const myLocalIP = require('my-local-ip'); 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 HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlugin'); - -const IgnorePlugin = require('webpack/lib/IgnorePlugin'); -const DedupePlugin = require('webpack/lib/optimize/DedupePlugin'); -const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); -const OccurenceOrderPlugin = require('webpack/lib/optimize/OccurenceOrderPlugin'); -const AggressiveMergingPlugin = require('webpack/lib/optimize/AggressiveMergingPlugin'); - - const srcPath = path.join(__dirname, 'src'); const examplesPath = path.join(__dirname, 'examples'); -const OpenBrowserPlugin = require('open-browser-webpack-plugin'); - const port = 23000; const host = myLocalIP(); -var config = { + +const config = { port: port, entry: { examples: [ From 1b17f6074c6b83b53d2edb9e86f2644d5077eb51 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:07:21 +0300 Subject: [PATCH 04/17] travis changes --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1df2def0..7a99ca63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ before_install: - sudo apt-get -qq update - - sudo apt-get install -y libcairo2-dev libjpeg-dev libgif-dev npm nodejs libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ + - sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ + - sudo apt-get install -y npm nodejs - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi language: node_js node_js: - - '4.4.1' + - '6.2.2' \ No newline at end of file From 853cfc729b938bbbf6738c0df8336d7a68a65613 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:08:46 +0300 Subject: [PATCH 05/17] travis changes --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a99ca63..94d5d24a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ before_install: - sudo apt-get -qq update - - sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ - sudo apt-get install -y npm nodejs - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi + - sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ + - sudo npm install canvas language: node_js node_js: From d115806e0636d530980e1eecc1163abbf5a42419 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:12:13 +0300 Subject: [PATCH 06/17] travis changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 94d5d24a..b5b25382 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ before_install: - sudo apt-get install -y npm nodejs - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi - sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ - - sudo npm install canvas + - npm install canvas language: node_js node_js: From bac7993d91ca883e0d7ce4e70721bf5d756cf378 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:19:45 +0300 Subject: [PATCH 07/17] travis changes --- karma.config.js | 1 - package.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/karma.config.js b/karma.config.js index 634c90a3..d597c98b 100644 --- a/karma.config.js +++ b/karma.config.js @@ -34,7 +34,6 @@ module.exports = function (config) { modulesDirectories: [ 'node_modules' ], - devtool: 'inline-source-map', resolve: { extensions: ['', '.js', '.jsx'], alias: { diff --git a/package.json b/package.json index dce0110f..0923b58c 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "babel-preset-react": "^6.11.1", "babel-preset-react-hmre": "^1.1.1", "babel-preset-stage-0": "^6.5.0", - "canvas": "1.4.0", + "babel-runtime": "^6.11.6", + "canvas": "1.3.17", "chai": "^3.5.0", "css-loader": "^0.24.0", "eslint": "^3.4.0", From b6a0e688d2cf772a2195b79bcb265868f6c6f065 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:22:50 +0300 Subject: [PATCH 08/17] travis changes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0923b58c..cef5c9c6 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "babel-preset-react-hmre": "^1.1.1", "babel-preset-stage-0": "^6.5.0", "babel-runtime": "^6.11.6", - "canvas": "1.3.17", + "canvas": "1.3.16", "chai": "^3.5.0", "css-loader": "^0.24.0", "eslint": "^3.4.0", From e7c7b64f02eb5a9073897e05c34271ce3cfb4799 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:28:21 +0300 Subject: [PATCH 09/17] travis changes --- .travis.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5b25382..b9f76ba2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,20 @@ -before_install: - - sudo apt-get -qq update - - sudo apt-get install -y npm nodejs - - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi - - sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ - - npm install canvas - language: node_js node_js: - - '6.2.2' \ No newline at end of file + - "6" + - "5" + - "4" + - "0.12" + - "0.11" + - "0.10" +env: + - CXX=g++-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 +before_install: + - sudo apt-get update -qq + - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev +script: 'npm run build && npm run test \ No newline at end of file From bc4bcace12c728401499a5ece014e1b24a9ccb96 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:29:48 +0300 Subject: [PATCH 10/17] travis changes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cef5c9c6..93528d8c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "babel-preset-react-hmre": "^1.1.1", "babel-preset-stage-0": "^6.5.0", "babel-runtime": "^6.11.6", - "canvas": "1.3.16", + "canvas": "1.4.0", "chai": "^3.5.0", "css-loader": "^0.24.0", "eslint": "^3.4.0", From 01c6e3e67bbcac6f4fe0a774d91742caec0fd240 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:31:29 +0300 Subject: [PATCH 11/17] travis changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9f76ba2..9750137b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 + - g++-4.8 before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev From baffc6b23a68c3099fb5bf0a6f752b35cd8d9229 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:32:27 +0300 Subject: [PATCH 12/17] travis changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9750137b..a2f927d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ addons: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev -script: 'npm run build && npm run test \ No newline at end of file +script: 'npm run build && npm run test' From 5b1f0054d702ac61e59b0aa580dc4bda45cea091 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:38:44 +0300 Subject: [PATCH 13/17] travis changes --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2f927d8..61402d78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,6 @@ language: node_js node_js: - "6" - - "5" - - "4" - - "0.12" - - "0.11" - - "0.10" env: - CXX=g++-4.8 addons: @@ -17,4 +12,4 @@ addons: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev -script: 'npm run build && npm run test' +script: 'npm install && npm run build && npm run test' From 1b60b02966b8f7fb4dc83dce2f4b20aef96d0961 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:39:29 +0300 Subject: [PATCH 14/17] travis changes --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 61402d78..aa738e6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js node_js: - "6" + - "5" + - "4" env: - CXX=g++-4.8 addons: From ae3635c04933c712b9f41e6cb8094652b999cd56 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:47:09 +0300 Subject: [PATCH 15/17] adding 'inline-source-map' as devtool --- karma.config.js | 1 + webpack.examples.cfg.js | 2 +- webpack.server.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/karma.config.js b/karma.config.js index d597c98b..fe0b398a 100644 --- a/karma.config.js +++ b/karma.config.js @@ -51,6 +51,7 @@ module.exports = function (config) { ] }, debug: false, + devtool: 'inline-source-map', stats: { colors: true, reasons: true diff --git a/webpack.examples.cfg.js b/webpack.examples.cfg.js index 0a6a2013..c24c49c3 100644 --- a/webpack.examples.cfg.js +++ b/webpack.examples.cfg.js @@ -29,7 +29,7 @@ var config = { }, debug: false, cache: true, - devtool: 'sourcemap', + devtool: 'inline-source-map', module: { loaders: [ {test: /\.html$/, loader: 'html-loader', include: [examplesPath], exclude: /base\.html$/}, diff --git a/webpack.server.js b/webpack.server.js index 115cf3b1..a3646b83 100644 --- a/webpack.server.js +++ b/webpack.server.js @@ -39,6 +39,7 @@ const config = { }, debug: true, cache: true, + devtool: 'inline-source-map', devServer: { historyApiFallback: true, stats: {colors: true}, From d5d04aff6a929ee690c59697c9580ce2ec6e5502 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:51:51 +0300 Subject: [PATCH 16/17] travis changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa738e6f..e8a1bea4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ addons: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev -script: 'npm install && npm run build && npm run test' +script: 'npm run build && npm run test' From b8d699c85db1d96ec73f0830e982ea006f15bd35 Mon Sep 17 00:00:00 2001 From: Thomas Bolis Date: Wed, 31 Aug 2016 10:55:11 +0300 Subject: [PATCH 17/17] adding 'inline-source-map' as devtool --- webpack.examples.cfg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.examples.cfg.js b/webpack.examples.cfg.js index c24c49c3..d7f5a5d8 100644 --- a/webpack.examples.cfg.js +++ b/webpack.examples.cfg.js @@ -29,7 +29,7 @@ var config = { }, debug: false, cache: true, - devtool: 'inline-source-map', + devtool: 'source-map', module: { loaders: [ {test: /\.html$/, loader: 'html-loader', include: [examplesPath], exclude: /base\.html$/},