From 8d0a8a4800d246e8c7cb3eef34bb7b5a6d54f509 Mon Sep 17 00:00:00 2001 From: Karson Miller Date: Mon, 24 Feb 2025 20:29:38 +0000 Subject: [PATCH 1/3] Add Dev container, bump to pnpm 10, install and building working --- .devcontainer/Dockerfile | 46 +++++++++++++++++++++++++++++++++ .devcontainer/devcontainer.json | 14 ++++++++++ .gitignore | 1 + package.json | 5 ++-- 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..22fb081f --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,46 @@ +# Use a base image for the development container +FROM mcr.microsoft.com/vscode/devcontainers/base:debian-12 + +# Install necessary dependencies for the development container +RUN apt-get update && apt-get install -y \ + curl \ + git \ + build-essential \ + libssl-dev \ + pkg-config \ + libgtk-3-dev \ + libwebkit2gtk-4.0-dev \ + && rm -rf /var/lib/apt/lists/* + +# Install Node.js +RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ + && apt-get install -y nodejs + +# Install pnpm +RUN npm install -g pnpm + +# Add pnpm global bin directory to PATH +ENV PATH="/home/vscode/.local/share/pnpm:${PATH}" + +# Install storybook globally +RUN pnpm add @storybook/cli + +# Install Rust as root (into /root/.cargo) +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + +# Copy the Cargo installation to the vscode user's home directory +RUN mkdir -p /home/vscode && \ + cp -r /root/.cargo /home/vscode/ && \ + chown -R vscode:vscode /home/vscode/.cargo + +# Update PATH so that cargo binaries are available for the vscode user +ENV PATH="/home/vscode/.cargo/bin:${PATH}" + +# Switch to vscode user to set the default rust toolchain +USER vscode +RUN rustup default stable + +# Switch back to root if needed for subsequent commands +USER root + + diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..4e2cbb9a --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,14 @@ +{ + "name": "JDM Editor Dev Container", + "dockerFile": "Dockerfile", + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "editor.formatOnSave": true + }, + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "ms-azuretools.vscode-docker", + "ms-vscode-remote.remote-containers" + ] +} diff --git a/.gitignore b/.gitignore index 3c24bae4..435ab4b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ dist /node_modules node_modules /target +/.pnpm-store # Ignore *.log* diff --git a/package.json b/package.json index 6f7bfd0b..ede6e85b 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,11 @@ "prettier": "prettier --check .", "prettier:fix": "pnpm prettier --write", "format": "run-s lint prettier", - "format:fix": "run-s lint:fix prettier:fix" + "format:fix": "run-s lint:fix prettier:fix", + "storybook": "lerna run storybook" }, "engines": { - "pnpm": "~9" + "pnpm": "~10" }, "devDependencies": { "@swc/core": "^1.7.26", From 923e4b0296663595b44312ec36969940e63650bf Mon Sep 17 00:00:00 2001 From: Karson Miller Date: Mon, 24 Feb 2025 20:52:34 +0000 Subject: [PATCH 2/3] add clean command to help with possible install issues --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ede6e85b..4c1e6481 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "prettier:fix": "pnpm prettier --write", "format": "run-s lint prettier", "format:fix": "run-s lint:fix prettier:fix", - "storybook": "lerna run storybook" + "storybook": "lerna run storybook", + "clean": "rm -rf node_modules && rm -rf **/node_modules && rm -rf package-lock.json" }, "engines": { "pnpm": "~10" From 72be4d32282677823635f25df9b9bb3defa95a6b Mon Sep 17 00:00:00 2001 From: Karson Miller Date: Mon, 24 Feb 2025 20:59:23 +0000 Subject: [PATCH 3/3] remove format:fix command --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 4c1e6481..dfce68c8 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "prettier": "prettier --check .", "prettier:fix": "pnpm prettier --write", "format": "run-s lint prettier", - "format:fix": "run-s lint:fix prettier:fix", "storybook": "lerna run storybook", "clean": "rm -rf node_modules && rm -rf **/node_modules && rm -rf package-lock.json" },