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..824ec4b7c2 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,15 @@ "onAutoForward": "notify" } }, - "onCreateCommand": "pnpm install && pnpm recursive install --filter ./packages", + "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": { - "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" } } } diff --git a/package.json b/package.json index fde27adc80..11890f0757 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "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", "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",