Merge branch 'themoeway:master' into master

yomidevs · Dec 16, 2023 · 8dd4ec8 · 8dd4ec8
2 parents 766387e + 730b34c
commit 8dd4ec8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,11 +25,19 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Build Libs
+        run: npm run build-libs
+
       - name: Lint JS
         run: npm run test-lint-js
         env:
           CI: true
 
+      - name: Validate JS Types
+        run: npm run test-ts
+        env:
+          CI: true
+
       - name: Lint CSS
         run: npm run test-lint-css
         env:
@@ -40,9 +48,6 @@ jobs:
         env:
           CI: true
 
-      - name: Build Libs
-        run: npm run build-libs
-
       - name: Tests
         run: npm run test-code
         env:

diff --git a/package.json b/package.json
@@ -9,11 +9,12 @@
     "scripts": {
         "build": "node ./dev/bin/build.js",
         "build-libs": "node ./dev/bin/build-libs.js",
-        "test": "npm run test-lint-js && npm run test-ts && npm run test-ts-dev && npm run test-ts-test && npm run test-lint-css && npm run test-lint-html && npm run test-code && npm run test-build",
+        "test": "npm run test-lint-js && npm run test-ts && npm run test-lint-css && npm run test-lint-html && npm run test-code && npm run test-build",
         "test-lint-js": "npx eslint .",
         "test-lint-css": "npx stylelint \"ext/**/*.css\" \"test/**/*.css\" \"dev/**/*.css\"",
         "test-lint-html": "npx html-validate \"ext/**/*.html\" \"test/**/*.html\" \"dev/**/*.html\"",
-        "test-ts": "npx tsc --noEmit --project jsconfig.json",
+        "test-ts": "npm run test-ts-main && npm run test-ts-dev && npm run test-ts-test",
+        "test-ts-main": "npx tsc --noEmit --project jsconfig.json",
         "test-ts-dev": "npx tsc --noEmit --project dev/jsconfig.json",
         "test-ts-test": "npx tsc --noEmit --project test/jsconfig.json",
         "test-code": "vitest run",