Merge branch 'master' into fortuna-keep

.eslintrc.json

@@ -60,6 +60,29 @@
         ]
       }
     ],
+    "import/order": [
+      "error",
+      {
+        "groups": [
+          "builtin",
+          "external",
+          "internal"
+        ],
+        "pathGroups": [
+          {
+            "pattern": "@material/**",
+            "group": "external",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["@material/**"],
+        "newlines-between": "always",
+        "alphabetize": {
+          "order": "asc",
+          "caseInsensitive": true
+        }
+      }
+    ],
     "no-prototype-builtins": "off",
     "prefer-const": "error",
     "@typescript-eslint/ban-types": "off",

.gitattributes

@@ -1,4 +1,14 @@
 * text=auto eol=lf
+
+# Windows Batch Script
 *.bat eol=crlf
+
+# NSIS Installation Script
+*.nsh eol=crlf
+
+# Tap Driver Installation Script
+third_party/tap-windows6/bin/**/*.inf eol=crlf
+third_party/tap-windows6/bin/**/*.h eol=crlf
+
 # Allow the build folders to be searched by GitHub's T file search
 build/** linguist-generated=false

.github/workflows/build_and_test_debug_client.yml

@@ -33,9 +33,6 @@ jobs:
       - name: Install NPM Dependencies
         run: npm set cache .npm && npm ci
 
-      - name: Run Linter
-        run: npm run action lint
-
       - name: Build Web App
         run: npm run action client/src/www/build
 
@@ -133,7 +130,7 @@ jobs:
 
       - name: Build Tun2Socks (required for Test OutlineAppleLib)
         run: npm run action client/src/tun2socks/build macos
-  
+
       - name: Test OutlineAppleLib
         run: npm run action client/src/cordova/test macos
 
@@ -174,7 +171,7 @@ jobs:
           go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Tun2Socks (required for Test OutlineAppleLib)
-        run: npm run action client/src/tun2socks/build ios  
+        run: npm run action client/src/tun2socks/build ios
 
       - name: Test OutlineAppleLib
         run: npm run action client/src/cordova/test ios

.github/workflows/build_and_test_debug_manager.yml

@@ -14,30 +14,9 @@ on:
       - master
 
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/[email protected]
-
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: ./server_manager/package.json
-
-      - name: Install NPM Dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
-
   web_test:
     name: Web Test
     runs-on: ubuntu-latest
-    needs: lint
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -54,7 +33,7 @@ jobs:
 
       - name: Manager Web Test
         run: npm run action server_manager/test
-      
+
   linux_debug_build:
     name: Linux Debug Build
     runs-on: ubuntu-latest
@@ -101,7 +80,7 @@ jobs:
 
       - name: Build Windows Manager
         run: npm run action server_manager/electron_app/build windows
-      
+
   mac_debug_build:
     name: MacOS Debug Build
     runs-on: macos-11
@@ -121,7 +100,7 @@ jobs:
 
       - name: Install NPM Dependencies
         run: npm ci
- 
+
       - name: Set XCode Version
         run: sudo xcode-select -switch /Applications/Xcode_13.2.app
 

.github/workflows/lint.yml

@@ -0,0 +1,35 @@
+name: Lint
+
+concurrency:
+  group: ${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches:
+      - master
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./package-lock.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint

.github/workflows/test_infrastructure.yml

@@ -0,0 +1,35 @@
+name: Build and Test / Infrastructure
+
+concurrency:
+  group: '${{ github.head_ref || github.ref }} Infrastructure'
+  cancel-in-progress: true
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Infrastructure Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: ./infrastructure/package.json
+
+      - name: Install NPM Dependencies
+        run: npm ci
+
+      - name: Infrastructure Test
+        run: npm run action infrastructure/test

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 .idea
+.task
 .vs/
 .vscode
 *.DS_Store