Merge remote-tracking branch 'origin/development' into power

.dockerignore

@@ -0,0 +1,8 @@
+# node modules
+node_modules
+
+# texture cache
+cache
+
+# api credentials
+credentials.json

.github/workflows/ci-cd.yml

@@ -1,148 +1,181 @@
 # This CI Workflow was deployed and configured by WarpWing and Nate.
-name: CI/CD
+name: "CI/CD"
 
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 env:
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "16"
+  CONTAINER_REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  es-lint:
+  pnpm:
+    name: install dependencies (pnpm)
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
+          cache: "pnpm"
+
+      - name: Install node dependencies
+        run: pnpm i
+
+  es-lint:
+    name: check linting (es-lint)
+    needs: [pnpm]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v3
 
       - name: Setup pnpm
-        uses: pnpm/[email protected]
+        uses: pnpm/action-setup@v2
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: es-lint
+      - name: Check ESlint
         run: pnpm lint
 
   ejs-lint:
+    name: check linting (ejs-lint)
+    needs: [pnpm]
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: ejs-lint
+      - name: Check ejs-lint
         run: pnpm lint:ejs
 
   prettier:
+    name: check format (prettier)
+    needs: [pnpm]
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: prettier
+      - name: Check Prettier
         run: pnpm prettier
 
-  check-ts:
-    name: check typescript
+  typescript:
+    name: test compile (typescript)
+    needs: [es-lint, ejs-lint, prettier]
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: tsc
+      - name: Compile TypeScript
         run: npx tsc -p public/resources/ts --noEmit
 
   rollup:
-    name: rollup
+    name: test compile (rollup)
+    needs: [es-lint, ejs-lint, prettier]
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: rollup
+      - name: Compile Rollup
         run: pnpm rollup
 
-  build-scss:
-    name: build scss
+  scss:
+    name: test compile (scss)
+    needs: [es-lint, ejs-lint, prettier]
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Setup pnpm
-        uses: pnpm/[email protected]
+          cache: "pnpm"
 
       - name: Install node dependencies
         run: pnpm i
 
-      - name: build scss
+      - name: Build SCSS
         run: pnpm scss
 
   deploy-production:
-    name: deploy production
+    name: deploy (production)
     if: |
       github.ref == 'refs/heads/production'
       && github.repository_owner == 'SkyCryptWebsite'
       && github.event_name != 'pull_request'
-    needs: [ejs-lint, check-ts, rollup, build-scss]
+    needs: [typescript, rollup, scss]
     runs-on: ubuntu-latest
     steps:
-      - name: SSH and deploy-production
+      - name: SSH and Deploy to Production
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.VPS_HOST }}
@@ -153,15 +186,15 @@ jobs:
           script: ~/deploy-production.sh
 
   deploy-development:
-    name: deploy development
+    name: deploy (development)
     if: |
       github.ref == 'refs/heads/development'
       && github.repository_owner == 'SkyCryptWebsite'
       && github.event_name != 'pull_request'
-    needs: [ejs-lint, check-ts, rollup, build-scss]
+    needs: [typescript, rollup, scss]
     runs-on: ubuntu-latest
     steps:
-      - name: SSH and deploy-development
+      - name: SSH and Deploy to Development
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.VPS_HOST }}
@@ -170,3 +203,39 @@ jobs:
           key: ${{ secrets.VPS_KEY }}
           script_stop: true
           script: ~/deploy-development.sh
+
+  package-container:
+    name: package container
+    if: |
+      (github.ref == 'refs/heads/production' || github.ref == 'refs/heads/development')
+      && github.repository_owner == 'SkyCryptWebsite'
+      && github.event_name != 'pull_request'
+    needs: [typescript, rollup, scss]
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v3
+
+      - name: Registry login
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.CONTAINER_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/codeql-analysis.yml

@@ -1,35 +1,30 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
+  schedule:
+    - cron: "30 1 * * *"
+#  push:
+#    branches: ["development", "production"]
+#  pull_request:
+#    branches: ["development", "production"]
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+
     permissions:
-      actions: read
-      contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["javascript"]
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
-          languages: ${{ matrix.language }}
+          languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/conflicts.yml

@@ -0,0 +1,16 @@
+name: "Mark Conflicts"
+
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for PR conflicts
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "has conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/greetings.yml

@@ -1,4 +1,4 @@
-name: SkyCryptGreetings
+name: "Greetings"
 
 on: [issues]
 
@@ -8,7 +8,8 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/first-interaction@v1
+      - name: Greet newcomer
+        uses: actions/first-interaction@v1
         continue-on-error: true
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.npmrc

@@ -0,0 +1 @@
+enable-pre-post-scripts=true