From 726de9775a83463a2840fe9d4f3e61778224096b Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford Date: Tue, 11 Apr 2017 11:31:18 -0400 Subject: [PATCH 1/3] Standardize repository settings Add missing file types to `.gitattributes`. Use `node` instead of deprecated `stable` version specifier for Travis. Set dev tool to `cheap-module-source-map`. --- .gitattributes | 2 ++ .travis.yml | 2 +- webpack.config.js | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 103710fec..84e89375a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,9 +14,11 @@ *.js text eol=lf *.js.map text eol=lf *.json text eol=lf +*.jsx text eol=lf *.md text eol=lf *.vert text eol=lf *.xml text eol=lf +*.yml text eol=lf # Prefer LF for these files .editorconfig text eol=lf diff --git a/.travis.yml b/.travis.yml index f05873dbc..2b354af21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js node_js: - '4.2' -- 'stable' +- 'node' cache: directories: - node_modules diff --git a/webpack.config.js b/webpack.config.js index 693b18861..409bb72a2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,6 +16,7 @@ module.exports = { host: '0.0.0.0', port: process.env.PORT || 8601 }, + devtool: 'cheap-module-source-map', entry: { lib: ['react', 'react-dom'], gui: './src/index.jsx' From d4cdf97f6ef6d65e80fe525df0475ed9a8b2c483 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford Date: Tue, 11 Apr 2017 15:16:23 -0400 Subject: [PATCH 2/3] Make `npm run build` work on Windows Use `rimraf` and `mkdirp` instead of `rm -rf` and `mkdir -p`. --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 955551384..34a16a22c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "./src/index.js", "scripts": { "build": "npm run clean && webpack --progress --colors --bail", - "clean": "rm -rf ./build && mkdir -p build", + "clean": "rimraf ./build && mkdirp build", "deploy": "touch build/.nojekyll && gh-pages -t -d build -m \"Build for $(git log --pretty=format:%H -n1)\"", "lint": "eslint . --ext .js,.jsx", "start": "webpack-dev-server", @@ -67,5 +67,9 @@ "webpack": "2.3.2", "webpack-dev-server": "^2.4.1", "xhr": "2.4.0" + }, + "dependencies": { + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1" } } From 7b151c36122995f3f0edd325d1cec3d62595c612 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford Date: Thu, 13 Apr 2017 12:05:27 -0400 Subject: [PATCH 3/3] Move `mkdirp` and `rimraf` to dev dependencies These dependencies are only needed by `npm run clean` and (indirectly) `npm run build` which only work when the other dev dependencies are installed. --- package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 34a16a22c..ce13086bc 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "lodash.isequal": "4.5.0", "lodash.omit": "4.5.0", "lodash.pick": "4.4.0", + "mkdirp": "^0.5.1", "minilog": "3.1.0", "postcss-import": "9.1.0", "postcss-loader": "1.3.3", @@ -55,6 +56,7 @@ "react-tabs": "0.8.2", "redux": "3.6.0", "redux-throttle": "0.1.1", + "rimraf": "^2.6.1", "scratch-audio": "latest", "scratch-blocks": "latest", "scratch-render": "latest", @@ -67,9 +69,5 @@ "webpack": "2.3.2", "webpack-dev-server": "^2.4.1", "xhr": "2.4.0" - }, - "dependencies": { - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1" } }