From 9cc14d5a25b8ec20663d384e1eb2f80a8bd4167e Mon Sep 17 00:00:00 2001 From: cwang Date: Thu, 16 Mar 2017 14:29:42 +0800 Subject: [PATCH 1/4] add cross-env in UI to accommodate compilation in Windows --- ui/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/package.json b/ui/package.json index 081ce37b86..79680b612c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "thingsboard", "private": true, - "version": "1.2.1", + "version": "1.2.0", "description": "Thingsboard UI", "licenses": [ { @@ -11,7 +11,7 @@ ], "scripts": { "start": "babel-node --max_old_space_size=4096 server.js", - "build": "NODE_ENV=production webpack -p" + "build": "cross-env NODE_ENV=production webpack -p" }, "dependencies": { "@flowjs/ng-flow": "^2.7.1", @@ -48,6 +48,7 @@ "canvas-gauges": "^2.0.9", "clipboard": "^1.5.15", "compass-sass-mixins": "^0.12.7", + "cross-env": "^3.2.4", "flot": "git://github.com/flot/flot.git#0.9-work", "font-awesome": "^4.6.3", "javascript-detect-element-resize": "^0.5.3", From c830b8dbc705161fd44e82a11b5d9a85e77a4364 Mon Sep 17 00:00:00 2001 From: cwang Date: Thu, 16 Mar 2017 14:32:32 +0800 Subject: [PATCH 2/4] add cross-env in UI to accommodate compilation in Windows --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index 79680b612c..f820d41425 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "thingsboard", "private": true, - "version": "1.2.0", + "version": "1.2.1", "description": "Thingsboard UI", "licenses": [ { From 3af5f750a57283a40e65930306465a43c54f832d Mon Sep 17 00:00:00 2001 From: cwang Date: Thu, 16 Mar 2017 16:35:57 +0800 Subject: [PATCH 3/4] fix a spelling mistake --- ui/src/app/locale/locale.constant.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index 670d2c1179..6d4e5a5b04 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -693,7 +693,7 @@ export default angular.module('thingsboard.locale', []) "title-required": "Widget title is required.", "type": "Widget type", "resources": "Resources", - "resource-url": "JavaScript/CSS URI", + "resource-url": "JavaScript/CSS URL", "remove-resource": "Remove resource", "add-resource": "Add resource", "html": "HTML", From 2b3bb24a64c802b55f698cb203319e5a284a7a5e Mon Sep 17 00:00:00 2001 From: Walter W Date: Thu, 16 Mar 2017 17:40:13 +0800 Subject: [PATCH 4/4] Move cross-env to devDependency --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index f820d41425..60ee4bd382 100644 --- a/ui/package.json +++ b/ui/package.json @@ -48,7 +48,6 @@ "canvas-gauges": "^2.0.9", "clipboard": "^1.5.15", "compass-sass-mixins": "^0.12.7", - "cross-env": "^3.2.4", "flot": "git://github.com/flot/flot.git#0.9-work", "font-awesome": "^4.6.3", "javascript-detect-element-resize": "^0.5.3", @@ -90,6 +89,7 @@ "babel-preset-react": "^6.16.0", "connect-history-api-fallback": "^1.3.0", "copy-webpack-plugin": "^3.0.1", + "cross-env": "^3.2.4", "css-loader": "^0.25.0", "eslint": "^3.4.0", "eslint-config-angular": "^0.5.0",