move back pnpm-workspace.yaml

Author: gdlol

.config/cspell/cspell.json

@@ -3,5 +3,5 @@
   "enableGlobDot": true,
   "useGitignore": true,
   "ignorePaths": ["**/node_modules/**", "LICENSE"],
-  "words": ["devcontainer", "devcontainers", "execa", "packagejson", "pacote", "rsort", "syncpack"]
+  "words": ["devcontainer", "devcontainers", "execa", "npmjs", "packagejson", "pacote", "rsort", "syncpack"]
 }

.config/workspaces/package.json

@@ -0,0 +1,3 @@
+packages:
+  - "create-devcontainer/**"
+  - "!**/dist/"

.config/workspaces/pnpm-workspace.yaml

@@ -1,9 +1,3 @@
 FROM mcr.microsoft.com/devcontainers/javascript-node:20
-ARG WORKSPACES
-ARG COMPOSE_PROJECT_NAME
-
-RUN NODE_MODULES_PATH=${WORKSPACES}/${COMPOSE_PROJECT_NAME}/node_modules && \
-    mkdir --parents "${NODE_MODULES_PATH}" && \
-    chown $(id --user --name 1000): "${NODE_MODULES_PATH}"
 
 RUN npm install --global pnpm@latest-9

.devcontainer/Dockerfile

@@ -5,9 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-      args:
-        - WORKSPACES=${WORKSPACES}
-        - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
     init: true
     volumes:
       - WORKSPACES:${WORKSPACES}
@@ -16,12 +13,9 @@ services:
       - XDG_CACHE_HOME:${XDG_CACHE_HOME}
       - XDG_DATA_HOME:${XDG_DATA_HOME}
       - XDG_STATE_HOME:${XDG_STATE_HOME}
-      - node_modules:${WORKSPACES}/${COMPOSE_PROJECT_NAME}/node_modules
-      - node_modules:${WORKSPACES}/node_modules
 volumes:
   WORKSPACES:
   XDG_CONFIG_HOME:
   XDG_CACHE_HOME:
   XDG_DATA_HOME:
   XDG_STATE_HOME:
-  node_modules:

.devcontainer/docker-compose.yml

@@ -15,6 +15,7 @@
   "workspaces": {
     "../git/attributes": ".gitattributes",
     "../git/ignore": ".gitignore",
-    "package.json": "package.json"
+    "../../package.json": "package.json",
+    "pnpm-workspace.yaml": "pnpm-workspace.yaml"
   }
 }

.devcontainer/dot-config.json

@@ -7,24 +7,26 @@ export interface BaseDotConfigs {
   ".config/git/ignore": string;
   ".config/pnpm/rc": string;
   ".config/prettier/.prettierrc.json": string;
-  ".config/workspaces/package.json": string;
+  ".config/workspaces/pnpm-workspace.yaml": string;
 }
 
-export const createBaseDotConfigs = async (remoteUser: string): Promise<BaseDotConfigs> => {
+export const createBaseDotConfigs = async (projectName: string, remoteUser: string): Promise<BaseDotConfigs> => {
   const templates = await loadTemplates("base", [
     ".config/cspell/cspell.json",
     ".config/git/attributes",
     ".config/git/ignore",
     ".config/pnpm/rc",
     ".config/prettier/.prettierrc.json",
-    ".config/workspaces/package.json",
+    ".config/workspaces/pnpm-workspace.yaml",
   ] satisfies (keyof BaseDotConfigs)[]);
   return {
     ".config/cspell/cspell.json": templates[".config/cspell/cspell.json"],
     ".config/git/attributes": templates[".config/git/attributes"],
     ".config/git/ignore": templates[".config/git/ignore"],
     ".config/pnpm/rc": fillTemplate(templates[".config/pnpm/rc"], { remoteUser }),
     ".config/prettier/.prettierrc.json": templates[".config/prettier/.prettierrc.json"],
-    ".config/workspaces/package.json": templates[".config/workspaces/package.json"],
+    ".config/workspaces/pnpm-workspace.yaml": fillTemplate(templates[".config/workspaces/pnpm-workspace.yaml"], {
+      projectName,
+    }),
   };
 };

create-devcontainer/configs/base/dotConfig.ts

@@ -9,7 +9,7 @@ export type BaseConfigs = BaseDevcontainerConfigs & BaseDotConfigs & BaseWorkspa
 
 export const createBaseConfigs = async (projectName: string, remoteUser = "dev"): Promise<BaseConfigs> => {
   const devcontainerConfigs = await createBaseDevcontainerConfigs(projectName, remoteUser);
-  const dotConfigs = await createBaseDotConfigs(remoteUser);
+  const dotConfigs = await createBaseDotConfigs(projectName, remoteUser);
   const workspaceConfigs = await createBaseWorkspaceConfigs();
   return {
     ...devcontainerConfigs,

create-devcontainer/configs/base/index.ts

@@ -0,0 +1,2 @@
+packages:
+  - "${projectName}/**"