From 2f6041d451dd359f0b80b026582f45dc5b2ce34a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 3 Apr 2017 17:23:51 -0600 Subject: [PATCH 1/4] add cross-env support --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9685afd..29d851b 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "description": "A sample app created with starter-kit", "scripts": { "setup": "node other/setup.js", - "start": "NODE_ENV=development node server.js", - "test-ci": "npm run lint && NODE_ENV=test karma start ./karma.conf.js --single-run --browsers PhantomJS", - "test": "npm run lint && NODE_ENV=test karma start ./karma.conf.js --single-run", - "tdd": "NODE_ENV=test karma start ./karma.conf.js --browsers Chrome", + "start": "cross-env NODE_ENV=development node server.js", + "test-ci": "npm run lint && cross-env NODE_ENV=test karma start ./karma.conf.js --single-run --browsers PhantomJS", + "test": "npm run lint && cross-env NODE_ENV=test karma start ./karma.conf.js --single-run", + "tdd": "cross-env NODE_ENV=test karma start ./karma.conf.js --browsers Chrome", "lint": "eslint src/**", "coveralls": "npm run test-ci && node node_modules/lcov-filter/index.js ./coverage/phantomjs/lcov.info spec | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", - "build": "rm -rf ./dist && NODE_ENV=production ./node_modules/.bin/webpack && cp -r domo/* dist/", + "build": "rm -rf ./dist && cross-env NODE_ENV=production ./node_modules/.bin/webpack && cp -r domo/* dist/", "preversion": "npm run test-ci", "version": "npm run build && npm run changelog && git add -A CHANGELOG.md", "postversion": "git push && git push --tags", @@ -45,6 +45,7 @@ "chalk": "^1.1.1", "conventional-changelog": "^0.5.3", "coveralls": "^2.11.6", + "cross-env": "^4.0.0", "css-loader": "^0.23.0", "cssnano": "^3.4.0", "cz-conventional-changelog": "^1.1.5", From d757d726cc652701ba8331e7c73edac9964a4cf4 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 3 Apr 2017 17:24:05 -0600 Subject: [PATCH 2/4] add devtoken support in proxy --- other/server.es6.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/other/server.es6.js b/other/server.es6.js index bd6b185..06dc427 100644 --- a/other/server.es6.js +++ b/other/server.es6.js @@ -155,6 +155,12 @@ function createContext(designId, mapping) { function checkSession() { return new Promise((resolve, reject) => { + if (typeof mostRecent.devtoken !== 'undefined') { + // we don't have any way to check tokens, so we'll default to accept + // until this is fixed + resolve(true); + } + const options = { url: `https://${mostRecent.instance}/auth/validate`, method: 'GET', From 09106986bcb8c2fbfe0f1335d929910f040c7385 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 3 Apr 2017 17:38:01 -0600 Subject: [PATCH 3/4] explicit angular dependencies New issue related to angular-material and angular-animate: [angular-material issue](https://github.com/angular/material/issues/10475) --- package.json | 6 +++--- src/desktop/desktop.html | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 29d851b..c9ee572 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,8 @@ "@domoinc/da-plop": "^3.0.0", "@domoinc/multi-line-chart": "^4.0.11", "@domoinc/query": "^1.0.3", - "angular-animate": "^1.5.7", - "angular-aria": "^1.5.7", - "angular-material": "^1.1.0-rc.5", + "angular-aria": "1.5.3", + "angular-animate": "1.5.3", "autoprefixer": "^6.1.2", "babel-core": "^6.3.17", "babel-loader": "^6.2.0", @@ -99,6 +98,7 @@ "webpack-dev-server": "^1.14.0" }, "dependencies": { + "angular-material": "^1.1.3", "enquire.js": "^2.1.1", "ryuu.js": "2.5.4" }, diff --git a/src/desktop/desktop.html b/src/desktop/desktop.html index 7fc286b..cd87425 100644 --- a/src/desktop/desktop.html +++ b/src/desktop/desktop.html @@ -14,7 +14,6 @@ - From 83c6c9ea54d3cb31e99e26410cd156105c8d420a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 3 Apr 2017 17:59:28 -0600 Subject: [PATCH 4/4] lock ngMaterial version to avoid future bugs with ng dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9ee572..b5975f5 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "webpack-dev-server": "^1.14.0" }, "dependencies": { - "angular-material": "^1.1.3", + "angular-material": "1.1.3", "enquire.js": "^2.1.1", "ryuu.js": "2.5.4" },