[Dependencies] Replaced ts-node with tsx, removed dotenv (#3198)

* refactor: ds-react uses tsx instead of ts-node * refactor: ds-tailwind uses tsx * refactor: Website backup and search uses tsx * refactor: Test urls and rss-feed uses tsx * refactor: Prop-updates uses tsx * refactor: All website scripts uses tsx * refactor: removed dotenv dependency from website * feat: removed all dependencies to dotenv * bug: Remove need for env in validate build script * test: Create empty env file * test: Scope env-file to build-dir * bug: Fallback to empty env when no env exsists * feat: Better error-messaging when fetching new icons * Update @navikt/aksel-icons/package.json Co-authored-by: Halvor Haugan <[email protected]> --------- Co-authored-by: Halvor Haugan <[email protected]>
navikt · Oct 8, 2024 · bdbd6c2 · bdbd6c2
1 parent f0e6c94
commit bdbd6c2
Show file tree

Hide file tree

Showing 21 changed files with 59 additions and 219 deletions.
diff --git a/.github/workflows/aksel-dev.yml b/.github/workflows/aksel-dev.yml
@@ -34,6 +34,9 @@ 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,6 +32,9 @@ 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 }}
@@ -68,6 +71,9 @@ 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,6 +23,9 @@ 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,6 +31,9 @@ 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/@navikt/aksel-icons/config/figma/fetch-icons.mjs b/@navikt/aksel-icons/config/figma/fetch-icons.mjs
@@ -1,6 +1,7 @@
 const file_key = "wEdyFjCQSBR3U7FvrMbPXa";
 
 export const fetchIcons = async () => {
+  console.info("Fetching new icons from Figma...");
   const data = await fetch(
     `https://api.figma.com/v1/files/${file_key}/components`,
     {
@@ -15,6 +16,10 @@ export const fetchIcons = async () => {
       throw e.message;
     });
 
+  if (data?.err) {
+    throw new Error(data.err);
+  }
+
   if (!data?.meta?.components || data?.meta?.components.length === 0) {
     throw new Error("Fant ingen publiserte ikoner");
   }

diff --git a/@navikt/aksel-icons/config/figma/index.mjs b/@navikt/aksel-icons/config/figma/index.mjs
@@ -1,12 +1,10 @@
-import { config } from "dotenv";
 import { existsSync, mkdirSync, readdirSync, rmSync, writeFileSync } from "fs";
 import { resolve } from "path";
 import { fetchDownloadUrls, fetchIcon, fetchIcons } from "./fetch-icons.mjs";
 import { resolveName } from "./icon-name.mjs";
 import { makeConfig } from "./make-configs.mjs";
 import { paginate } from "./paginate.mjs";
 
-config();
 /* https://www.figma.com/file/wEdyFjCQSBR3U7FvrMbPXa/Core-Icons-Next?node-id=277%3A1221&t=mUJzFvnsceYYXNL5-0 */
 
 const iconFolder = "./icons";
@@ -16,6 +14,7 @@ if (!process.env.FIGMA_TOKEN) {
 }
 
 async function main() {
+  console.info("Started icon-update from Figma");
   let icons = await fetchIcons();
 
   const totalIcons = icons.length;

diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -62,7 +62,7 @@
     "update-metadata": "node config/metadata.js",
     "write-packagejson": "echo '{\"type\": \"module\"}' > dist/react/esm/package.json",
     "build": "yarn copy && yarn create-icons && concurrently \"tsc\" \"tsc -p tsconfig.esm.json && tsc-alias -p tsconfig.esm.json && yarn write-packagejson\" && node config/cleanTypes.js && yarn update-metadata && yarn parse-svg",
-    "fetch-new:icons": "node config/figma/index.mjs",
+    "fetch-new:icons": "tsx --env-file=.env config/figma/index.mjs",
     "zip:icons": "node config/zip.js",
     "test": "vitest run",
     "test:watch": "vitest watch"
@@ -73,7 +73,6 @@
     "concurrently": "7.2.1",
     "copyfiles": "^2.4.1",
     "cross-zip-cli": "1.0.0",
-    "dotenv": "^10.0.0",
     "fast-glob": "3.2.11",
     "hast-util-select": "5.0.5",
     "js-yaml": "^4.1.0",
@@ -83,6 +82,7 @@
     "react": "^18.0.0",
     "rehype-parse": "8.0.4",
     "tsc-alias": "1.8.8",
+    "tsx": "^4.7.1",
     "typescript": "^5.1.6",
     "unified": "10.1.2",
     "vitest": "^1.2.2"

diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json
@@ -583,7 +583,7 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "docgen": "yarn ts-node ../../../scripts/docgen.ts",
+    "docgen": "yarn tsx ../../../scripts/docgen.ts",
     "write-packagejson": "echo '{\"type\": \"module\"}' > esm/package.json",
     "clean": "rimraf cjs esm",
     "build": "concurrently \"tsc -p tsconfig.build.json\" \"tsc -p tsconfig.esm.json && tsc-alias -p tsconfig.esm.json && yarn write-packagejson\" ",
@@ -614,8 +614,8 @@
     "react-router-dom": "^6.3.0",
     "rimraf": "6.0.1",
     "swr": "^1.1.2",
-    "ts-node": "^10.9.1",
     "tsc-alias": "1.8.8",
+    "tsx": "^4.19.1",
     "typescript": "^5.1.6",
     "vitest": "^1.2.2"
   },

diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -15,7 +15,7 @@
     "tailwind.config.d.ts"
   ],
   "scripts": {
-    "build": "ts-node ./src",
+    "build": "yarn tsx ./src",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
@@ -29,7 +29,7 @@
     "color": "4.2.3",
     "lodash": "^4.17.21",
     "tailwindcss": "^3.3.3",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.19.1",
     "typescript": "^5.1.6",
     "vitest": "^1.2.2"
   },

diff --git a/aksel.nav.no/website/package.json b/aksel.nav.no/website/package.json
@@ -13,22 +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": "ts-node --project tsconfig.json ./scripts/create-index",
+    "update:searchindex": "yarn tsx --env-file=.env ./scripts/create-index",
     "e2e": "yarn build && yarn start-server-and-test 'yarn start' http://localhost:3000 'yarn playwright'",
-    "e2e:full": "yarn build && ts-node ./e2e/genUrls.ts && FULL_TEST=true yarn start-server-and-test start http://localhost:3000 playwright",
-    "e2e:ci-full": "ts-node ./e2e/genUrls.ts && FULL_TEST=true yarn start-server-and-test start http://localhost:3000 playwright",
-    "update:rss": "ts-node --project tsconfig.tsnode.json ./scripts/generate-rss-feed",
-    "update:props": "ts-node --project tsconfig.tsnode.json ./scripts/update-props",
-    "update:tokens": "ts-node --project tsconfig.tsnode.json ./scripts/update-tokens",
-    "update:eksempler": "ts-node --project tsconfig.tsnode.json ./scripts/update-examples/update-sanity",
-    "validate:eksempler": "ts-node --project tsconfig.tsnode.json ./scripts/update-examples/validate",
-    "update:changelog": "ts-node --project tsconfig.tsnode.json ./scripts/changelog",
+    "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",
+    "validate:eksempler": "yarn tsx ./scripts/update-examples/validate",
+    "update:changelog": "yarn tsx --env-file=.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": "ts-node scripts/backup.js",
+    "backup": "yarn tsx --env-file=.env scripts/backup.ts",
+    "generate-testpaths": "yarn tsx --env-file=.env ./scripts/generate-testpaths.ts",
     "watch:tw": "yarn tailwindcss -i ./components/styles/index.css -o ./dist/tw.css --watch"
   },
   "dependencies": {
@@ -91,7 +92,6 @@
     "babel-loader": "^8.2.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.0",
-    "dotenv": "^10.0.0",
     "jsdom": "^22.1.0",
     "json5": "2.2.1",
     "pino-pretty": "^10.0.0",
@@ -101,7 +101,7 @@
     "rss": "^1.2.2",
     "showdown": "^2.1.0",
     "start-server-and-test": "^2.0.3",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.19.1",
     "typescript": "^5.1.6",
     "vitest": "^1.2.2"
   }

diff --git a/aksel.nav.no/website/scripts/backup.js → aksel.nav.no/website/scripts/backup.ts b/aksel.nav.no/website/scripts/backup.js → aksel.nav.no/website/scripts/backup.ts
diff --git a/aksel.nav.no/website/scripts/changelog.ts b/aksel.nav.no/website/scripts/changelog.ts
@@ -1,13 +1,10 @@
 import { htmlToBlocks } from "@sanity/block-tools";
 import { Schema } from "@sanity/schema";
-import dotenv from "dotenv";
 import fs from "fs";
 import { JSDOM } from "jsdom";
 import showdown from "showdown";
 import { noCdnClient } from "../sanity/interface/client.server";
 
-dotenv.config();
-
 main();
 
 export async function main() {
@@ -46,7 +43,7 @@ export async function main() {
     .fields.find((field) => field.name === "body").type;
 
   const blocks = htmlToBlocks(html, blockContentType, {
-    parseHtml: (htmlStr) => new JSDOM(htmlStr).window.document,
+    parseHtml: (htmlStr) => new JSDOM(htmlStr).window._document,
   });
   blocks.shift();
 

diff --git a/aksel.nav.no/website/scripts/create-index.ts b/aksel.nav.no/website/scripts/create-index.ts
@@ -1,15 +1,15 @@
-import dotenv from "dotenv";
 import fs from "fs";
 import { groupBy, omit } from "lodash";
 import { allArticleDocuments } from "../sanity/config";
 import { noCdnClient } from "../sanity/interface/client.server";
 
-dotenv.config();
-
 main();
 
 async function main() {
   await createIndex();
+  console.info(
+    "Successfully created searchindex and added it to public folder",
+  );
 }
 
 async function createIndex() {

diff --git a/aksel.nav.no/website/scripts/generate-rss-feed.tsx b/aksel.nav.no/website/scripts/generate-rss-feed.tsx
@@ -1,12 +1,8 @@
-import dotenv from "dotenv";
 import fs from "fs";
 import path from "path";
 import RSS from "rss";
 import { noCdnClient } from "../sanity/interface/client.server";
 
-dotenv.config();
-dotenv.config({ path: `.env.local` });
-
 generateRssFeed();
 
 async function generateRssFeed() {

diff --git a/aksel.nav.no/website/e2e/genUrls.ts → ....no/website/scripts/generate-testpaths.ts b/aksel.nav.no/website/e2e/genUrls.ts → ....no/website/scripts/generate-testpaths.ts
@@ -1,11 +1,16 @@
-import dotenv from "dotenv";
 import fs from "fs";
 import { sitemapPages } from "../sanity/interface/interface";
 
-dotenv.config();
-
 const token = process.env.SANITY_READ_NO_DRAFTS;
 
+if (!token) {
+  console.error("Missing SANITY_READ_NO_DRAFTS");
+  process.exit(1);
+}
+
+/**
+ * Generate a list of urls for e2e tests
+ */
 sitemapPages(token)
   .then((pages) =>
     fs.writeFileSync(

diff --git a/aksel.nav.no/website/scripts/update-examples/update-sanity.ts b/aksel.nav.no/website/scripts/update-examples/update-sanity.ts
@@ -1,4 +1,3 @@
-import dotenv from "dotenv";
 import { CodeExampleSchemaT } from "../../components/types";
 import { noCdnClient } from "../../sanity/interface/client.server";
 import { extractMetadata } from "./parts/extract-metadata";
@@ -7,8 +6,6 @@ import { parseCodeFiles } from "./parts/parse-code-files";
 import { validateExamples } from "./parts/validate-examples";
 import { RootDirectoriesT, rootDirectories } from "./types";
 
-dotenv.config();
-
 const isDryRun = process.argv.includes("--dry-run");
 
 (async function () {

diff --git a/aksel.nav.no/website/scripts/update-props.tsx b/aksel.nav.no/website/scripts/update-props.tsx
@@ -1,11 +1,7 @@
-import dotenv from "dotenv";
 import fs from "fs";
 import path from "path";
 import { noCdnClient } from "../sanity/interface/client.server";
 
-dotenv.config();
-dotenv.config({ path: `.env.local` });
-
 updateProps();
 
 async function updateProps() {

diff --git a/aksel.nav.no/website/scripts/update-tokens.tsx b/aksel.nav.no/website/scripts/update-tokens.tsx
@@ -1,10 +1,7 @@
-import dotenv from "dotenv";
 import core from "@navikt/ds-css/tokens.json";
 import tokens from "@navikt/ds-tokens/docs.json";
 import { noCdnClient } from "../sanity/interface/client.server";
 
-dotenv.config();
-
 const allTokens: { title: string; kategori: string }[] = [
   ...Object.keys(tokens).map((x) => ({ title: x, kategori: "core" })),
   ...Object.keys(core).map((x) => ({ title: x, kategori: "comp" })),
@@ -47,7 +44,7 @@ export const updateTokens = async () => {
 
   await transactionClient
     .commit()
-    .then(() => console.info(`Updated tokens`))
+    .then(() => console.info(`Updated tokens!`))
     .catch((e) => console.error(e.message));
 };
 

diff --git a/aksel.nav.no/website/tsconfig.json b/aksel.nav.no/website/tsconfig.json
@@ -41,12 +41,6 @@
       }
     ]
   },
-  "ts-node": {
-    "compilerOptions": {
-      "module": "commonjs",
-      "lib": ["dom", "dom.iterable", "esnext", "ES2021.String"]
-    }
-  },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules", "e2e", "./scripts/**"]
 }
diff --git a/aksel.nav.no/website/tsconfig.tsnode.json b/aksel.nav.no/website/tsconfig.tsnode.json