Mercurial > hg > thermostat-ng > web-client
changeset 140:70dadb296f6b
Windows compatibility fixes
This patch introduces Windows compatibility to the web client.
There were two main changes made
1) The version of Webpack must now be greater than 2.6.1, to force Promise compatibility.
2) All hardcoded paths in the scripts were removed. In particular, things like
"clean": "\"$(npm bin)/rimraf\" checkstyle coverage dist test-reports",
had to change to
"clean": "rimraf checkstyle coverage dist test-reports",
Reviewed-by: almacdon
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-July/024284.html
| author | Simon Tooke <stooke@redhat.com> |
|---|---|
| date | Wed, 26 Jul 2017 09:41:58 -0400 |
| parents | 8f45d0870bfe |
| children | 78532770ce37 |
| files | package.json |
| diffstat | 1 files changed, 23 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/package.json Fri Jul 21 12:36:22 2017 -0400 +++ b/package.json Wed Jul 26 09:41:58 2017 -0400 @@ -65,40 +65,40 @@ "sinon": "^2.1.0", "style-loader": "^0.16.1", "url-join": "^2.0.1", - "webpack": "^2.3.2", + "webpack": "^2.6.1", "webpack-dev-server": "^2.4.2" }, "scripts": { - "clean": "\"$(npm bin)/rimraf\" checkstyle coverage dist test-reports", + "clean": "rimraf checkstyle coverage dist test-reports", "license-check": "node license-check/perform-license-check.js", "license-update": "node license-check/perform-license-update.js", - "prelint": "\"$(npm bin)/mkdirp\" checkstyle", - "lint-js": "\"$(npm bin)/eslint\" --ext '!.spec.js' -c .eslintrc.yaml src || npm run lint-js-checkstyle", - "lint-js-checkstyle": "\"$(npm bin)/eslint\" -c .eslintrc.yaml -f checkstyle -o checkstyle/checkstyle-src.xml src", - "lint-html": "\"$(npm bin)/htmlhint\" -c .htmlhintrc 'src/**/*.html' || npm run lint-html-checkstyle", - "lint-html-checkstyle": "\"$(npm bin)/htmlhint\" -c .htmlhintrc -f checkstyle 'src/**/*.html' > checkstyle/checkstyle-html.xml", - "lint-tests": "\"$(npm bin)/eslint\" -c .eslintrc.test.yaml src --ext .spec.js || npm run lint-test-checkstyle", - "lint-tests-checkstyle": "\"$(npm bin)/eslint\" -c .eslintrc.test.yaml --ext .spec.js -f checkstyle -o checkstyle/checkstyle-test.xml src", - "lint-itests": "\"$(npm bin)/eslint\" -c .eslintrc.test.yaml integration-test --ext .spec.js || npm run lint-itest-checkstyle", - "lint-itests-checkstyle": "\"$(npm bin)/eslint\" -c .eslintrc.test.yaml --ext .spec.js -f checkstyle -o checkstyle/checkstyle-itest.xml src", + "prelint": "mkdirp checkstyle", + "lint-js": "eslint --ext '!.spec.js' -c .eslintrc.yaml src || npm run lint-js-checkstyle", + "lint-js-checkstyle": "eslint -c .eslintrc.yaml -f checkstyle -o checkstyle/checkstyle-src.xml src", + "lint-html": "htmlhint -c .htmlhintrc 'src/**/*.html' || npm run lint-html-checkstyle", + "lint-html-checkstyle": "htmlhint -c .htmlhintrc -f checkstyle 'src/**/*.html' > checkstyle/checkstyle-html.xml", + "lint-tests": "eslint -c .eslintrc.test.yaml src --ext .spec.js || npm run lint-test-checkstyle", + "lint-tests-checkstyle": "eslint -c .eslintrc.test.yaml --ext .spec.js -f checkstyle -o checkstyle/checkstyle-test.xml src", + "lint-itests": "eslint -c .eslintrc.test.yaml integration-test --ext .spec.js || npm run lint-itest-checkstyle", + "lint-itests-checkstyle": "eslint -c .eslintrc.test.yaml --ext .spec.js -f checkstyle -o checkstyle/checkstyle-itest.xml src", "lint": "npm run lint-js && npm run lint-html", "prebuild": "npm run clean && npm run license-check && npm run lint", - "build": "\"$(npm bin)/webpack\" --bail --progress --profile", + "build": "webpack --bail --progress --profile", "postbuild": "npm test", - "stop-mockapi": "\"$(npm bin)\"/forever stop --silent mock-api/mockapi.server.js || true", + "stop-mockapi": "forever stop --silent mock-api/mockapi.server.js || true", "prestart-mockapi": "npm run stop-mockapi", - "start-mockapi": "\"$(npm bin)\"/forever start --watch --watchDirectory mock-api mock-api/mockapi.server.js", + "start-mockapi": "forever start --watch --watchDirectory mock-api mock-api/mockapi.server.js", "predevserver": "npm run prebuild && npm run stop-daemon && npm run start-mockapi", - "devserver": "\"$(npm bin)/webpack-dev-server\" --progress", + "devserver": "webpack-dev-server --progress", "pretest": "npm run lint-tests", - "test": "\"$(npm bin)/karma\" start", + "test": "karma start", "pretest-watch": "npm run pretest", - "test-watch": "\"$(npm bin)/karma\" start --auto-watch --no-single-run", - "prestart-integration-test-server": "npm run stop-integration-test-server && \"$(npm bin)\"/webdriver-manager update", - "start-integration-test-server": "\"$(npm bin)\"/forever start -t \"$(npm bin)\"/webdriver-manager start", + "test-watch": "karma start --auto-watch --no-single-run", + "prestart-integration-test-server": "npm run stop-integration-test-server && webdriver-manager update", + "start-integration-test-server": "forever start -t webdriver-manager start", "poststart-integration-test-server": "node integration-test/wait-for-selenium.js", - "stop-integration-test-server": "\"$(npm bin)\"/forever stop -t --silent \"$(npm bin)\"/webdriver-manager || true", - "poststop-integration-test-server": "\"$(npm bin)\"/webdriver-manager shutdown", + "stop-integration-test-server": "forever stop -t --silent webdriver-manager || true", + "poststop-integration-test-server": "webdriver-manager shutdown", "preintegration-test": "npm run lint-itests && npm run start-integration-test-server", "integration-test": "protractor integration-test/integration-test.config.js", "postintegration-test": "npm run stop-integration-test-server", @@ -106,8 +106,8 @@ "start-image": "node server.js", "stop": "npm run stop-mockapi && npm run stop-daemon", "prestart-daemon": "npm run stop-daemon", - "start-daemon": "\"$(npm bin)\"/forever start --watch server.js", - "stop-daemon": "\"$(npm bin)\"/forever stop --silent server.js || true", + "start-daemon": "forever start --watch server.js", + "stop-daemon": "forever stop --silent server.js || true", "verify": "npm run build && npm start && npm run integration-test && npm run stop" }, "dependencies": {