From 01e5f43593bb85ad3db5eb560e202b4c3acf536c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Thu, 6 Nov 2025 09:44:35 +0000 Subject: [PATCH 1/7] chore(devcontainer): remove Dockerfile and update devcontainer.json configuration --- .devcontainer/Dockerfile | 13 ------------- .devcontainer/devcontainer.json | 24 +++++++----------------- 2 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index bb9577c6c9..0000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG VARIANT="16-bullseye" -FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT} - -# [Optional] Uncomment this section to install additional OS packages. -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install jq httpie - -# [Optional] Uncomment if you want to install an additional version of node using nvm -# ARG EXTRA_NODE_VERSION=10 -# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" - -# [Optional] Uncomment if you want to install more global node packages -RUN su node -c "npm install -g pnpm gitmoji-cli" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9b1635fb14..df35576a99 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,17 +1,9 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/typescript-node +// For configuration details, see https://containers.dev/implementors/json_reference/ { "name": "Node.js & TypeScript", "runArgs": ["--init"], - "build": { - "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick a Node version: 16, 14, 12. - // Append -bullseye or -buster to pin to an OS version. - // Use -bullseye variants on local on arm64/Apple Silicon. - "args": { - "VARIANT": "22-bullseye" - } - }, + // https://github.com/devcontainers/images/tree/main/src/typescript-node + "image": "mcr.microsoft.com/devcontainers/typescript-node:22-bullseye", "customizations": { "vscode": { "settings": { @@ -70,15 +62,13 @@ "onAutoForward": "notify" } }, - "onCreateCommand": "pnpm install && pnpm recursive install --filter ./packages", + "onCreateCommand": "npm install -g pnpm gitmoji-cli && pnpm install && pnpm recursive install --filter ./packages", "remoteUser": "node", "features": { - "docker-in-docker": "20.10", - "docker-from-docker": "20.10", - "git": "latest", + "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}, "github-cli": "latest", - "ghcr.io/devcontainers/features/sshd:1": { - "version": "latest" + "ghcr.io/devcontainers/features/node:1": { + "version": "22.12.0" } } } From 54fa4574039564b1a5f94865c4fb9c8679c8ea3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Thu, 6 Nov 2025 10:11:05 +0000 Subject: [PATCH 2/7] fix: update docu:start script to specify host in order to be recognized by the container host. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9f5d3e791..d140ce59c7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "build:storybook:data-grid": "pnpm --filter ./packages/eds-data-grid-react run build:storybook", "demo:dev": "pnpm --filter eds-demo run dev", "docu:clear": "pnpm --filter design-system-docs run clear", - "docu:start": "pnpm --filter ./apps/design-system-docs run start", + "docu:start": "pnpm --filter ./apps/design-system-docs run start --host 0.0.0.0", "docu:build": "node scripts/extract-prerequisites.js && pnpm --filter ./apps/design-system-docs run build", "docu:prerequisites": "node scripts/extract-prerequisites.js", "docu:serve": "pnpm --filter ./apps/design-system-docs run serve", From 4837748f609070abe04f1c7747d39817f0a8aff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Thu, 6 Nov 2025 10:14:21 +0000 Subject: [PATCH 3/7] fix: add .pnpm-store to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5d0c3f928e..a2570f1ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ node_modules pnpm-debug.log .DS_Store # use pnpm +.pnpm-store package-lock.json packages/*/package-lock.yaml scripts/*/package-lock.yaml @@ -21,4 +22,4 @@ docz-fresh .idea .size-snapshot.json storybook-build -review.txt \ No newline at end of file +review.txt From 7680ee4e9d99043ca086533940668c3d8171ad50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Thu, 6 Nov 2025 10:51:08 +0000 Subject: [PATCH 4/7] fix(devcontainer): add postCreateCommand for ARM-based host dependencies --- .devcontainer/devcontainer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index df35576a99..86d5653f57 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -63,6 +63,8 @@ } }, "onCreateCommand": "npm install -g pnpm gitmoji-cli && pnpm install && pnpm recursive install --filter ./packages", + // Install additional dependencies for axe linter, especially for devcontainers where the host is ARM-based (e.g., Macbook M1+). + "postCreateCommand": "sudo dpkg --add-architecture amd64 && sudo apt-get update && sudo apt-get install -y libc6:amd64 libstdc++6:amd64 && sudo ln -sf /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2", "remoteUser": "node", "features": { "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}, From be1cfe60c4969e38441589b72e74f5d49a2c2279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Mon, 8 Dec 2025 09:20:23 +0000 Subject: [PATCH 5/7] fix: remove duplicate docu:start script in package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index b025b43167..01e8099a16 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "demo:lint": "pnpm --filter eds-demo run lint", "demo:test:e2e": "pnpm --filter eds-demo run test:e2e", "docu:clear": "pnpm --filter design-system-docs run clear", - "docu:start": "pnpm --filter ./apps/design-system-docs run start", "docu:build": "pnpm run extract-prerequisites && pnpm --filter ./apps/design-system-docs run build", "docu:start": "pnpm --filter ./apps/design-system-docs run start --host 0.0.0.0", "palette:dev": "pnpm --filter @equinor/eds-color-palette-generator dev", From f1fee6ba69cb999ccd52eaec5bfe27ad91873ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Mon, 8 Dec 2025 14:43:19 +0100 Subject: [PATCH 6/7] Update .devcontainer/devcontainer.json Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 86d5653f57..824ec4b7c2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -63,7 +63,7 @@ } }, "onCreateCommand": "npm install -g pnpm gitmoji-cli && pnpm install && pnpm recursive install --filter ./packages", - // Install additional dependencies for axe linter, especially for devcontainers where the host is ARM-based (e.g., Macbook M1+). + // Install additional dependencies for axe linter, especially for devcontainers where the host is ARM-based (e.g., MacBook M1+). "postCreateCommand": "sudo dpkg --add-architecture amd64 && sudo apt-get update && sudo apt-get install -y libc6:amd64 libstdc++6:amd64 && sudo ln -sf /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2", "remoteUser": "node", "features": { From 53892a3a04fade0003f4cd8d9b80fc9b3b19a362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hjalmar=20Otto=20Fj=C3=B8sne?= Date: Tue, 9 Dec 2025 08:39:15 +0100 Subject: [PATCH 7/7] Apply suggestion from @Copilot The docu:serve should not have been removed in the first place, only the --host flag was to be amended to the docu:start Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 01e8099a16..11890f0757 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "docu:clear": "pnpm --filter design-system-docs run clear", "docu:build": "pnpm run extract-prerequisites && pnpm --filter ./apps/design-system-docs run build", "docu:start": "pnpm --filter ./apps/design-system-docs run start --host 0.0.0.0", + "docu:serve": "pnpm --filter ./apps/design-system-docs run serve", "palette:dev": "pnpm --filter @equinor/eds-color-palette-generator dev", "palette:build": "pnpm --filter @equinor/eds-color-palette-generator build", "palette:build:cli": "pnpm --filter @equinor/eds-color-palette-generator build:cli",