[pull] master from caprover:master

.dockerignore

@@ -7,7 +7,6 @@
 /currentdirectory
 /node_modules
 /built
-/dist-frontend
 /captain-sample-apps
 
 # JetBrains
@@ -17,4 +16,7 @@
 npm-debug.log
 
 
-.DS_Store
+.DS_Store
+
+.github
+.vscode

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,27 +4,22 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **IMPORTANT:** This is a bug report. If you are having problem with deploying a particular app use the deployment issue type.
 
 > If you are having problems with deploying a particular app using a customized dockerfile - please change your questions to Dockerfile and post it where appropriate such as StackOverflow. This is a Docker question, not a CapRover specific issue.
 
---------------------------------------------------------------------------
+---
 
 What is the problem?
 
-
-
 If applicable, content of `captain-definition` file:
 
-
-
 Steps to reproduce the problem:
 
+Output of the following command on your server:
 
-
-Answers to the following questions where applicable:
-- Your OS and version?
-- RAM?
+```
+uname -a && lsb_release -a && free -h
+```

.github/ISSUE_TEMPLATE/deployment-issue.md

@@ -1,30 +1,25 @@
 ---
 name: Deployment Issue
 about: Problem with deploying your apps
-title: "[Deployment Issue]"
+title: '[Deployment Issue]'
 labels: deployment-issue
 assignees: ''
-
 ---
 
 **IMPORTANT:** Please avoid posting issues that are not specific to CapRover. Issues and questions related to Docker will get closed.
 
 > If you are trying to see how to deploy a particular app using a customized dockerfile - please change your questions to Dockerfile and post it where appropriate such as StackOverflow. This is a Docker question, not a CapRover specific issue.
 
---------------------------------------------------------------------------
+---
 
 What is the problem?
 
-
-
 If applicable, content of `captain-definition` file:
 
-
-
 Steps to reproduce the problem:
 
+Output of the following command on your server:
 
-
-Answers to the following questions if applicable:
-- Your OS and version?
-- RAM?
+```
+uname -a && lsb_release -a && free -h
+```

.github/workflows/build_project.yml

@@ -1,19 +1,23 @@
 name: Run build
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: sudo mkdir /captain && npm ci && npm run build && sudo npm run test
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 18
+            - run: |
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
+                  npm ci 
+                  npm run build 
+                  npm run test

.github/workflows/format_project.yml

@@ -1,19 +1,19 @@
 name: Run formatter
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
 
 jobs:
-  check-code-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: npm ci && npm run formatter
+    check-code-formatting:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 18
+            - run: npm ci && npm run formatter

.github/workflows/lint_project.yml

@@ -1,19 +1,19 @@
 name: Run lint
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - master
 
 jobs:
-  run-tslint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - run: npm ci && npm run tslint
+    run-lint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 18
+            - run: npm ci && npm run lint

.github/workflows/publish_edge.yml

@@ -9,17 +9,17 @@ jobs:
     run-pre-checks:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 14
+                  node-version: 18
             - run: |
-                  sudo mkdir /captain
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
                   npm run build
-                  npm run tslint
+                  npm run lint
                   npm run formatter
-                  sudo npm run test
+                  npm run test
     build-publish-docker-hub:
         needs: run-pre-checks
         runs-on: ubuntu-latest

.github/workflows/publish_release.yml

@@ -9,17 +9,17 @@ jobs:
     run-pre-checks:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v1
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 14
+                  node-version: 18
             - run: |
-                  sudo mkdir /captain
+                  sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
                   npm run build
-                  npm run tslint
+                  npm run lint
                   npm run formatter
-                  sudo npm run test
+                  npm run test
     build-publish-docker-hub:
         needs: run-pre-checks
         runs-on: ubuntu-latest

.gitignore

@@ -5,6 +5,7 @@
 /node_modules
 /built
 /dist-frontend
+/temp-frontend
 
 version
 
@@ -18,3 +19,4 @@ npm-debug.log
 .DS_Store
 /.project
 
+config-override.json

.vscode/extensions.json

@@ -1,10 +1,10 @@
 {
     "recommendations": [
-        "eg2.tslint",
         "streetsidesoftware.code-spell-checker",
         "pflannery.vscode-versionlens",
         "remimarsal.prettier-now",
         "hookyqr.beautify",
-        "esbenp.prettier-vscode"
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint"
     ]
-}
+}

.vscode/settings.json

@@ -3,17 +3,26 @@
     "search.exclude": {
         "**/node_modules": true,
         "**/bower_components": true,
-        "**/dist": true,
+        "**/built": true,
         "**/coverge": true
     },
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.organizeImports": true
+        "source.organizeImports": "explicit",
+        "source.fixAll.eslint": "explicit",
+        "source.addMissingImports": "explicit"
     },
     "typescript.referencesCodeLens.enabled": true,
-    "tslint.ignoreDefinitionFiles": false,
-    "tslint.autoFixOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "tslint.exclude": "**/node_modules/**/*",
-    "cSpell.words": ["csrf", "definitelytyped", "promisified"]
+    "cSpell.words": ["csrf", "definitelytyped", "dockerode", "promisified"],
+    "[shellscript]": {
+        "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "[plaintext]": {
+        "editor.formatOnSave": false,
+        "editor.defaultFormatter": null
+    },
+    "files.associations": {
+        "*.theme": "plaintext"
+    }
 }