diff --git a/docker-compose-embedding.yml b/docker-compose-embedding.yml
old mode 100644
new mode 100755
index cfa19d38b..0691e1c31
--- a/docker-compose-embedding.yml
+++ b/docker-compose-embedding.yml
@@ -6,24 +6,33 @@ version: '3.8'
services:
node: &node
- image: docker.mirror.hashicorp.services/node:12
+ image: docker.mirror.hashicorp.services/node:14
volumes:
- './:/src'
- 'icu_node_modules:/src/node_modules'
- 'icu_addons_api_node_modules:/src/addons/api/node_modules'
- 'icu_addons_auth_node_modules:/src/addons/auth/node_modules'
+ - 'icu_addons_core_node_modules:/src/addons/core/node_modules'
- 'icu_addons_rose_node_modules:/src/addons/rose/node_modules'
- 'icu_ui_admin_node_modules:/src/ui/admin/node_modules'
+ - 'icu_ui_desktop_node_modules:/src/ui/desktop/node_modules'
working_dir: /src
- build:
+ build-admin:
<<: *node
entrypoint: bash
command: '-c "yarn install && yarn build:ui:admin && chmod -R 777 ."'
+ build-desktop-production:
+ <<: *node
+ entrypoint: bash
+ command: '-c "yarn install && yarn build:ui:desktop:production && chmod -R 777 ."'
+
volumes:
icu_node_modules:
icu_addons_api_node_modules:
icu_addons_auth_node_modules:
+ icu_addons_core_node_modules:
icu_addons_rose_node_modules:
icu_ui_admin_node_modules:
+ icu_ui_desktop_node_modules:
diff --git a/package.json b/package.json
old mode 100644
new mode 100755
index 29f13e814..0a772b37e
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"build": "yarn build:ui:admin",
"build:ui:admin": "cd ui/admin && yarn build",
"build:ui:desktop": "cd ui/desktop && yarn build",
+ "build:ui:desktop:production": "cd ui/desktop && yarn build:production",
"lint": "npm-run-all lint:*",
"lint:addons-api": "cd addons/api && yarn lint",
"lint:addons-auth": "cd addons/auth && yarn lint",
@@ -63,7 +64,8 @@
"xmlhttprequest-ssl": "^1.6.2",
"underscore": "^1.12.1",
"hosted-git-info": "3.0.8",
- "trim": "~1.0.1"
+ "trim": "~1.0.1",
+ "browserslist": "^4.16.5"
},
"config": {
"commitizen": {
diff --git a/ui/admin/app/index.html b/ui/admin/app/index.html
index 1362f8b65..befb5d7b5 100644
--- a/ui/admin/app/index.html
+++ b/ui/admin/app/index.html
@@ -12,7 +12,7 @@
-
+
{{content-for "head-footer"}}
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
old mode 100644
new mode 100755
index ad95f6b81..dd4b5b794
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -11,7 +11,8 @@
},
"scripts": {
"doc:toc": "doctoc README.md",
- "build": "EMBER_CLI_ELECTRON=true ember build --environment=production && yarn build:desktop",
+ "build": "EMBER_CLI_ELECTRON=true yarn build:production && yarn build:desktop",
+ "build:production": "ember build --environment=production",
"build:development": "ember build",
"prebuild:desktop": "cp -r dist/ electron-app/ember-dist/",
"build:desktop": "cd electron-app && yarn make",
diff --git a/yarn.lock b/yarn.lock
index d89874aa1..f01866ca4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5962,32 +5962,14 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@4.14.2:
- version "4.14.2"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
- integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
+browserslist@4.14.2, browserslist@^3.2.6, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.5:
+ version "4.16.6"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+ integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
dependencies:
- caniuse-lite "^1.0.30001125"
- electron-to-chromium "^1.3.564"
- escalade "^3.0.2"
- node-releases "^1.1.61"
-
-browserslist@^3.2.6:
- version "3.2.8"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
- integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
- dependencies:
- caniuse-lite "^1.0.30000844"
- electron-to-chromium "^1.3.47"
-
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3:
- version "4.16.4"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58"
- integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==
- dependencies:
- caniuse-lite "^1.0.30001208"
+ caniuse-lite "^1.0.30001219"
colorette "^1.2.2"
- electron-to-chromium "^1.3.712"
+ electron-to-chromium "^1.3.723"
escalade "^3.1.1"
node-releases "^1.1.71"
@@ -6323,7 +6305,7 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001208:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001219:
version "1.0.30001228"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
@@ -8140,10 +8122,10 @@ electron-rebuild@^2.0.3:
tar "^6.0.5"
yargs "^16.0.0"
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.712:
- version "1.3.712"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz#ae467ffe5f95961c6d41ceefe858fc36eb53b38f"
- integrity sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw==
+electron-to-chromium@^1.3.723:
+ version "1.3.738"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz#aec24b091c82acbfabbdcce08076a703941d17ca"
+ integrity sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==
element-resize-detector@^1.2.2:
version "1.2.2"
@@ -9735,7 +9717,7 @@ es6-weak-map@^2.0.1:
es6-iterator "^2.0.3"
es6-symbol "^3.1.1"
-escalade@^3.0.2, escalade@^3.1.1:
+escalade@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -15585,7 +15567,7 @@ node-pre-gyp@^0.11.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.61, node-releases@^1.1.71:
+node-releases@^1.1.71:
version "1.1.71"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==