create-forgeon 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Forgeon project generator CLI",
   "license": "MIT",
   "author": "Forgeon",

package/src/modules/executor.test.mjs

@@ -105,6 +105,20 @@ describe('addModule', () => {
       const appTsx = fs.readFileSync(path.join(projectRoot, 'apps', 'web', 'src', 'App.tsx'), 'utf8');
       assert.match(appTsx, /@forgeon\/i18n-web/);
       assert.match(appTsx, /Language:/);
+
+      const caddyDockerfile = fs.readFileSync(
+        path.join(projectRoot, 'infra', 'docker', 'caddy.Dockerfile'),
+        'utf8',
+      );
+      assert.match(caddyDockerfile, /COPY tsconfig\.base\.json \.\//);
+      assert.match(
+        caddyDockerfile,
+        /COPY packages\/i18n-contracts\/package\.json packages\/i18n-contracts\/package\.json/,
+      );
+      assert.match(
+        caddyDockerfile,
+        /COPY packages\/i18n-web\/package\.json packages\/i18n-web\/package\.json/,
+      );
     } finally {
       fs.rmSync(targetRoot, { recursive: true, force: true });
     }

package/src/modules/i18n.mjs

@@ -134,6 +134,47 @@ function patchApiDockerfile(targetRoot) {
   fs.writeFileSync(dockerfilePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
+function patchProxyDockerfile(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+
+  content = ensureLineAfter(
+    content,
+    'COPY package.json pnpm-workspace.yaml ./',
+    'COPY tsconfig.base.json ./',
+  );
+  content = ensureLineAfter(
+    content,
+    'COPY apps/web/package.json apps/web/package.json',
+    'COPY packages/i18n-contracts/package.json packages/i18n-contracts/package.json',
+  );
+  content = ensureLineAfter(
+    content,
+    'COPY packages/i18n-contracts/package.json packages/i18n-contracts/package.json',
+    'COPY packages/i18n-web/package.json packages/i18n-web/package.json',
+  );
+  content = ensureLineAfter(
+    content,
+    'COPY apps/web apps/web',
+    'COPY packages/i18n-contracts packages/i18n-contracts',
+  );
+  content = ensureLineAfter(
+    content,
+    'COPY packages/i18n-contracts packages/i18n-contracts',
+    'COPY packages/i18n-web packages/i18n-web',
+  );
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
+function patchProxyDockerfiles(targetRoot) {
+  patchProxyDockerfile(path.join(targetRoot, 'infra', 'docker', 'caddy.Dockerfile'));
+  patchProxyDockerfile(path.join(targetRoot, 'infra', 'docker', 'nginx.Dockerfile'));
+}
+
 function patchCompose(targetRoot) {
   const composePath = path.join(targetRoot, 'infra', 'docker', 'compose.yml');
   if (!fs.existsSync(composePath)) {
@@ -230,6 +271,7 @@ export function applyI18nModule({ packageRoot, targetRoot }) {
   patchApiPackage(targetRoot);
   patchWebPackage(targetRoot);
   patchApiDockerfile(targetRoot);
+  patchProxyDockerfiles(targetRoot);
 
   upsertEnvLines(path.join(targetRoot, 'apps', 'api', '.env.example'), [
     'I18N_ENABLED=true',

package/src/presets/i18n.mjs

@@ -26,8 +26,8 @@ export function applyI18nDisabled(targetRoot) {
   }
 
   const apiDockerfile = path.join(targetRoot, 'apps', 'api', 'Dockerfile');
-  if (fs.existsSync(apiDockerfile)) {
-    let content = fs.readFileSync(apiDockerfile, 'utf8');
+  if (fs.existsSync(apiDockerfile)) {
+    let content = fs.readFileSync(apiDockerfile, 'utf8');
     content = content
       .replace(/^COPY packages\/i18n\/package\.json packages\/i18n\/package\.json\r?\n/gm, '')
       .replace(
@@ -41,6 +41,28 @@ export function applyI18nDisabled(targetRoot) {
     fs.writeFileSync(apiDockerfile, content, 'utf8');
   }
 
+  const proxyDockerfiles = [
+    path.join(targetRoot, 'infra', 'docker', 'caddy.Dockerfile'),
+    path.join(targetRoot, 'infra', 'docker', 'nginx.Dockerfile'),
+  ];
+  for (const dockerfilePath of proxyDockerfiles) {
+    if (!fs.existsSync(dockerfilePath)) {
+      continue;
+    }
+
+    const content = fs
+      .readFileSync(dockerfilePath, 'utf8')
+      .replace(
+        /^COPY packages\/i18n-contracts\/package\.json packages\/i18n-contracts\/package\.json\r?\n/gm,
+        '',
+      )
+      .replace(/^COPY packages\/i18n-web\/package\.json packages\/i18n-web\/package\.json\r?\n/gm, '')
+      .replace(/^COPY packages\/i18n-contracts packages\/i18n-contracts\r?\n/gm, '')
+      .replace(/^COPY packages\/i18n-web packages\/i18n-web\r?\n/gm, '');
+
+    fs.writeFileSync(dockerfilePath, content, 'utf8');
+  }
+
   const webPackagePath = path.join(targetRoot, 'apps', 'web', 'package.json');
   if (fs.existsSync(webPackagePath)) {
     const webPackage = JSON.parse(fs.readFileSync(webPackagePath, 'utf8'));

package/templates/base/infra/docker/caddy.Dockerfile

@@ -3,9 +3,10 @@ FROM node:20-alpine AS web-builder
 WORKDIR /app
 RUN corepack enable
 
-COPY package.json pnpm-workspace.yaml ./
-COPY apps/web/package.json apps/web/package.json
-RUN pnpm install --frozen-lockfile=false
+COPY package.json pnpm-workspace.yaml ./
+COPY tsconfig.base.json ./
+COPY apps/web/package.json apps/web/package.json
+RUN pnpm install --frozen-lockfile=false
 
 COPY apps/web apps/web
 WORKDIR /app/apps/web
@@ -13,4 +14,4 @@ RUN pnpm build
 
 FROM caddy:2-alpine
 COPY infra/caddy/Caddyfile /etc/caddy/Caddyfile
-COPY --from=web-builder /app/apps/web/dist /srv
+COPY --from=web-builder /app/apps/web/dist /srv

package/templates/base/infra/docker/nginx.Dockerfile

@@ -3,9 +3,10 @@ FROM node:20-alpine AS web-builder
 WORKDIR /app
 RUN corepack enable
 
-COPY package.json pnpm-workspace.yaml ./
-COPY apps/web/package.json apps/web/package.json
-RUN pnpm install --frozen-lockfile=false
+COPY package.json pnpm-workspace.yaml ./
+COPY tsconfig.base.json ./
+COPY apps/web/package.json apps/web/package.json
+RUN pnpm install --frozen-lockfile=false
 
 COPY apps/web apps/web
 WORKDIR /app/apps/web