From 2356580cee9d485d6e33d7b51ea2d83632cf791e Mon Sep 17 00:00:00 2001 From: unarist Date: Sat, 17 Jun 2017 08:14:42 +0900 Subject: [PATCH] Use cross-env for npm run on Windows (#3789) --- package.json | 9 +++++---- yarn.lock | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 462772e187..a6aa1ce1c8 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,14 @@ "license": "AGPL-3.0", "scripts": { "postversion": "git push --tags", - "build:development": "NODE_ENV=development yarn webpack -- --config config/webpack/development.js", - "build:production": "NODE_ENV=production yarn webpack -- --config config/webpack/production.js", + "build:development": "cross-env NODE_ENV=development yarn webpack -- --config config/webpack/development.js", + "build:production": "cross-env NODE_ENV=production yarn webpack -- --config config/webpack/production.js", "manage:translations": "node ./config/webpack/translationRunner.js", "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js", - "storybook": "NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook", + "storybook": "cross-env NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook", "test": "npm run test:lint && npm run test:mocha", "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ storybook/ streaming/", - "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.js", + "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.js", "postinstall": "npm rebuild node-sass" }, "repository": { @@ -40,6 +40,7 @@ "babel-preset-react": "^6.24.1", "classnames": "^2.2.5", "compression-webpack-plugin": "^0.4.0", + "cross-env": "^5.0.1", "css-loader": "^0.28.4", "dotenv": "^4.0.0", "emojione": "^2.2.7", diff --git a/yarn.lock b/yarn.lock index c11b7718a4..960c2ca029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1894,6 +1894,13 @@ create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.5 loose-envify "^1.3.1" object-assign "^4.1.1" +cross-env@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.1.tgz#ff4e72ea43b47da2486b43a7f2043b2609e44913" + dependencies: + cross-spawn "^5.1.0" + is-windows "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -1908,6 +1915,14 @@ cross-spawn@^4.0.0: lru-cache "^4.0.1" which "^1.2.9" +cross-spawn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -3668,6 +3683,10 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" +is-windows@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -6201,6 +6220,16 @@ shallowequal@0.2.x, shallowequal@^0.2.2: dependencies: lodash.keys "^3.1.2" +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + shelljs@^0.7.5, shelljs@^0.7.7: version "0.7.8" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"