Merge branch 'stage'

OS2iot · Mar 5, 2024 · d4626eb · d4626eb
2 parents 774133b + fef516b
commit d4626eb
Show file tree

Hide file tree

Showing 80 changed files with 15,664 additions and 17,257 deletions.
diff --git a/.github/workflows/on-push-pr.action.yml b/.github/workflows/on-push-pr.action.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-node@v3
         name: Set NodeJS version
         with:
-          node-version: 14
+          node-version: 18
       - name: Install packages
         run: "npm ci"
       - name: Build source

diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,11 @@
+module.exports = {
+  trailingComma: "es5",
+  tabWidth: 4,
+  printWidth: 120,
+  semi: true,
+  singleQuote: false,
+  useTabs: false,
+  bracketSpacing: true,
+  arrowParens: "avoid",
+  endOfLine: "auto",
+};
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://mherman.org/blog/dockerizing-an-angular-app/
 # base image
-FROM node:14-alpine as DEV
+FROM node:16-alpine as DEV
 
 # removed this for now
 # install chrome for protractor tests

diff --git a/angular.json b/angular.json
@@ -25,7 +25,7 @@
             "assets": [
               "src/favicon.ico",
               "src/assets",
-              { "glob": "**/*", "input": "node_modules/monaco-editor", "output": "assets/monaco-editor" }
+              { "glob": "**/*", "input": "node_modules/monaco-editor", "output": "/assets/monaco/" }
             ],
             "styles": [
               "./node_modules/animate.css/animate.min.css",