trying to fix build

primer · Apr 18, 2024 · 7f81e64 · 7f81e64
1 parent 722eaa7
commit 7f81e64
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/a11y-contrast.yml b/.github/workflows/a11y-contrast.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Install dependencies
         run: npm ci --no-audit --no-fund --ignore-scripts
 
-      - name: Build tokens
-        run: npm run build
+      - name: Build v8 tokens
+        run: npm run build:v8
 
       - name: Run required checks
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,9 +27,12 @@ jobs:
       - name: Build v1 tokens
         run: npm run build
 
-      - name: Build v8 tokens
+      - name: Build v8 tokens & fallbacks
         run: npm run build:v8
 
+      - name: Build fallbacks
+        run: npm run build:fallbacks
+
       - name: Code linting check
         run: npm run lint
 
@@ -56,6 +59,8 @@ jobs:
         run: npm ci
       - name: Build v8 tokens
         run: npm run build:v8
+      - name: Build fallbacks
+        run: npm run build:fallbacks
       - name: Build storybook
         working-directory: docs/storybook
         run: |

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,6 +17,6 @@ jobs:
     with:
       node_version: 20
       install: npm ci --legacy-peer-deps --no-audit --no-fund && npm run install:storybook
-      build: npm run build && cd docs/storybook && npm run build:prod
+      build: npm run build && npm run build:next && cd docs/storybook && npm run build:prod
       output_dir: docs/public
 
diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml
@@ -16,7 +16,7 @@ jobs:
     with:
       node_version: 20
       install: npm ci --no-audit --no-fund --ignore-scripts && npm run install:storybook
-      build: npm run build && cd docs/storybook && npm run build:preview
+      build: npm run build && npm run build:next && cd docs/storybook && npm run build:preview
       output_dir: docs/public
 
   post_storybook:

diff --git a/.github/workflows/release_canary.yml b/.github/workflows/release_canary.yml
@@ -25,11 +25,14 @@ jobs:
           node-version: 20
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps --no-audit --no-fund --include=dev
+        run: npm ci --no-audit --no-fund --include=dev
 
       - name: Build tokens
         run: npm run build
 
+      - name: Build v8 tokens
+        run: npm run build:v8
+
       - name: Create .npmrc
         run: |
           cat << EOF > "$HOME/.npmrc"

diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
@@ -24,11 +24,14 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: npm ci --no-audit --no-fund --include=dev
 
       - name: Build tokens
         run: npm run build
 
+      - name: Build tokens v8
+        run: npm run build:v8
+
       - name: Create .npmrc
         run: |
           cat << EOF > "$HOME/.npmrc"

diff --git a/package.json b/package.json
@@ -28,12 +28,11 @@
   },
   "homepage": "https://github.com/primer/primitives#readme",
   "scripts": {
-    "build": "npm run build:v8 && npm run build:fallbacks && npm run build:figma",
+    "build": "ts-node ./scripts/build.ts && tsc --project tsconfig.build.json",
+    "build:next": "npm run build:v8 && npm run build:fallbacks && npm run build:figma",
     "build:v8": "ts-node ./scripts/buildTokens.ts",
     "build:fallbacks": "ts-node ./scripts/buildFallbacks.ts",
     "build:figma": "ts-node scripts/buildFigma.ts",
-    "build:tokens": "node -e \"require('./build')._init()\"",
-    "build:new-tokens": "npm run build:tokens && npm run build",
     "tokenJson:check": "ts-node scripts/diffThemes.ts && ts-node scripts/diffTokenProps.ts",
     "contrast:check": "ts-node scripts/color-contrast.ts",
     "format": "prettier --write  '**/*.{js,jsx,ts,tsx,md,mdx,css}'",