chore: updated project structure for alignment

MatrixAI · Jun 25, 2023 · c80ada6 · c80ada6
1 parent 7891215
commit c80ada6
Show file tree

Hide file tree

Showing 15 changed files with 930 additions and 520 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -28,6 +28,17 @@
     "no-constant-condition": 0,
     "no-useless-escape": 0,
     "no-console": "error",
+    "no-restricted-globals": [
+      "error",
+      {
+        "name": "global",
+        "message": "Use `globalThis` instead"
+      },
+      {
+        "name": "window",
+        "message": "Use `globalThis` instead"
+      }
+    ],
     "require-yield": 0,
     "eqeqeq": ["error", "smart"],
     "spaced-comment": [
@@ -39,7 +50,8 @@
         },
         "block": {
           "exceptions": ["*"]
-        }
+        },
+        "markers": ["/"]
       }
     ],
     "capitalized-comments": [
@@ -80,7 +92,8 @@
         ],
         "pathGroupsExcludedImportTypes": [
           "type"
-        ]
+        ],
+        "newlines-between": "never"
       }
     ],
     "@typescript-eslint/no-namespace": 0,
@@ -102,7 +115,7 @@
     "@typescript-eslint/consistent-type-imports": ["error"],
     "@typescript-eslint/consistent-type-exports": ["error"],
     "no-throw-literal": "off",
-    "@typescript-eslint/no-throw-literal": ["error"],
+    "@typescript-eslint/no-throw-literal": "off",
     "@typescript-eslint/no-floating-promises": ["error", {
       "ignoreVoid": true,
       "ignoreIIFE": true

diff --git a/.github/workflows/codesee-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml
@@ -1,7 +1,9 @@
+# This workflow was added by CodeSee. Learn more at https://codesee.io/
+# This is v2.0 of this workflow file
 on:
   push:
     branches:
-      - master
+      - staging
   pull_request_target:
     types: [opened, synchronize, reopened]
 
@@ -18,3 +20,4 @@ jobs:
       - uses: Codesee-io/codesee-action@v2
         with:
           codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
+          codesee-url: https://app.codesee.io
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -184,7 +184,7 @@ build:windows:
     - ./scripts/choco-install.ps1
     - refreshenv
     - npm install --ignore-scripts
-    - $env:Path = "$(npm bin);" + $env:Path
+    - $env:Path = "$(npm root)\.bin;" + $env:Path
     - npm run prebuild --verbose
     - npm test -- --ci --coverage
     - npm run bench
@@ -221,7 +221,7 @@ build:macos:
     - ./scripts/brew-install.sh
     - hash -r
     - npm install --ignore-scripts
-    - export PATH="$(npm bin):$PATH"
+    - export PATH="$(npm root)/.bin:$PATH"
     - npm run prebuild --verbose
     - npm test -- --ci --coverage
     - npm run bench

diff --git a/jest.config.js b/jest.config.js
@@ -33,8 +33,21 @@ module.exports = {
   roots: ['<rootDir>/tests'],
   testMatch: ['**/?(*.)+(spec|test|unit.test).+(ts|tsx|js|jsx)'],
   transform: {
-    '^.+\\.tsx?$': 'ts-jest',
-    '^.+\\.jsx?$': 'babel-jest',
+    "^.+\\.(t|j)sx?$": [
+      "@swc/jest",
+      {
+        jsc: {
+          parser: {
+            syntax: "typescript",
+            tsx: true,
+            decorators: compilerOptions.experimentalDecorators,
+            dynamicImport: true,
+          },
+          target: compilerOptions.target.toLowerCase(),
+          keepClassNames: true,
+        },
+      }
+    ],
   },
   reporters: [
     'default',
@@ -60,6 +73,9 @@ module.exports = {
   // Setup files after env are executed before each test file
   // after the jest test environment is installed
   // Can access globals
-  setupFilesAfterEnv: ['<rootDir>/tests/setupAfterEnv.ts'],
+  setupFilesAfterEnv: [
+    'jest-extended/all',
+    '<rootDir>/tests/setupAfterEnv.ts'
+  ],
   moduleNameMapper: moduleNameMapper,
 };