Remove creation of empty .env files in workflows (#3294)

navikt · Nov 7, 2024 · 97fbd9d · 97fbd9d
1 parent 1fdb7c8
commit 97fbd9d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/aksel-dev.yml b/.github/workflows/aksel-dev.yml
@@ -34,9 +34,6 @@ jobs:
       - name: Install dependencies
         run: yarn
 
-      - name: Create empty .env file (Can be removed when env-file-if-exists is implemented in node v22)
-        run: echo "" > ./aksel.nav.no/website/.env
-
       - name: Build application
         env:
           SANITY_READ: ${{ secrets.SANITY_READ }}

diff --git a/.github/workflows/aksel-prod.yml b/.github/workflows/aksel-prod.yml
@@ -32,9 +32,6 @@ jobs:
           yarn boot
           yarn docgen
 
-      - name: Create empty .env file (Can be removed when env-file-if-exists is implemented in node v22)
-        run: echo "" > ./aksel.nav.no/website/.env
-
       - name: Update sanity sync
         env:
           SANITY_WRITE: ${{ secrets.SANITY_WRITE }}
@@ -71,9 +68,6 @@ jobs:
       - name: Tests
         run: yarn workspace website test
 
-      - name: Create empty .env file (Can be removed when env-file-if-exists is implemented in node v22)
-        run: echo "" > ./aksel.nav.no/website/.env
-
       - name: Build application
         env:
           SANITY_READ: ${{ secrets.SANITY_READ }}

diff --git a/.github/workflows/backup-sanity.yml b/.github/workflows/backup-sanity.yml
@@ -23,9 +23,6 @@ jobs:
       - name: Install dependencies
         run: cd aksel.nav.no/website && yarn
 
-      - name: Create empty .env file (Can be removed when env-file-if-exists is implemented in node v22)
-        run: echo "" > ./aksel.nav.no/website/.env
-
       - name: Export dataset
         env:
           SANITY_READ: ${{ secrets.SANITY_READ }}

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -31,9 +31,6 @@ jobs:
         run: |
           yarn boot
 
-      - name: Create empty .env file (Can be removed when env-file-if-exists is implemented in node v22)
-        run: echo "" > ./aksel.nav.no/website/.env
-
       - name: Build application
         env:
           SANITY_READ: ${{ secrets.SANITY_READ }}

diff --git a/aksel.nav.no/website/package.json b/aksel.nav.no/website/package.json
@@ -13,23 +13,23 @@
     "cp:static": "copyfiles -E -u 1 '.next/static/**' .next/standalone/aksel.nav.no/website/.next/",
     "cp:public": "copyfiles -E 'public/**' .next/standalone/aksel.nav.no/website/",
     "cp:assets": "yarn cp:playroom && yarn cp:public && yarn cp:static",
-    "update:searchindex": "yarn tsx --env-file=.env ./scripts/create-index",
+    "update:searchindex": "yarn tsx --env-file-if-exists=.env ./scripts/create-index",
     "e2e": "yarn build && yarn start-server-and-test 'yarn start' http://localhost:3000 'yarn playwright'",
     "e2e:full": "yarn build && yarn generate-testpaths && FULL_TEST=true yarn start-server-and-test start http://localhost:3000 playwright",
     "e2e:ci-full": "yarn generate-testpaths && FULL_TEST=true yarn start-server-and-test start http://localhost:3000 playwright",
-    "update:rss": "yarn tsx --env-file=.env ./scripts/generate-rss-feed",
-    "update:props": "yarn tsx --env-file=.env ./scripts/update-props",
-    "update:tokens": "yarn tsx --env-file=.env ./scripts/update-tokens",
-    "update:eksempler": "yarn tsx --env-file=.env ./scripts/update-examples/update-sanity",
+    "update:rss": "yarn tsx --env-file-if-exists=.env ./scripts/generate-rss-feed",
+    "update:props": "yarn tsx --env-file-if-exists=.env ./scripts/update-props",
+    "update:tokens": "yarn tsx --env-file-if-exists=.env ./scripts/update-tokens",
+    "update:eksempler": "yarn tsx --env-file-if-exists=.env ./scripts/update-examples/update-sanity",
     "validate:eksempler": "yarn tsx ./scripts/update-examples/validate",
-    "update:changelog": "yarn tsx --env-file=.env ./scripts/changelog",
+    "update:changelog": "yarn tsx --env-file-if-exists=.env ./scripts/changelog",
     "update:sanity": "yarn update:tokens && yarn update:props && yarn update:eksempler && yarn update:changelog",
     "analyze": "cross-env ANALYZE=true yarn build",
     "test": "vitest run -c config/vitest.config.ts",
     "test:watch": "vitest watch -c config/vitest.config.ts",
     "playwright": "playwright test",
-    "backup": "yarn tsx --env-file=.env scripts/backup.ts",
-    "generate-testpaths": "yarn tsx --env-file=.env ./scripts/generate-testpaths.ts",
+    "backup": "yarn tsx --env-file-if-exists=.env scripts/backup.ts",
+    "generate-testpaths": "yarn tsx --env-file-if-exists=.env ./scripts/generate-testpaths.ts",
     "watch:tw": "yarn tailwindcss -i ./components/styles/index.css -o ./dist/tw.css --watch"
   },
   "dependencies": {