Merge remote-tracking branch 'origin/main' into generate-forge-config-on-build

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:

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",

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",