@jakubmazanec/carson-templates 2.3.0-unstable.4bf461a → 2.3.0-unstable.4d7b7cd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "2.3.0-unstable.4bf461a",
+  "version": "2.3.0-unstable.4d7b7cd",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",

package/templates/projects/remix-app/Dockerfile.ejs

@@ -11,12 +11,13 @@ for (let project of workspace.projects) {
 }
 
 let copyFilesLines = ['COPY package-lock.json package.json /workspace/'];
+let currentProject = project;
 
 for (let project of workspace.projects) {
-  if (project.config.deployment?.appName) {
+  if (project.config.deployment?.appName && project.name === currentProject.name) {
     copyFilesLines.push(`COPY --from=build /workspace/${project.relativePath}/build /workspace/${project.relativePath}/build`);
     copyFilesLines.push(`COPY --from=build /workspace/${project.relativePath}/package.json /workspace/${project.relativePath}/package.json`);
-  } else {
+  } else if (!project.config.deployment?.appName) {
     if (project.packageJson.bin) {
       copyFilesLines.push(`COPY --from=build /workspace/${project.relativePath}/bin /workspace/${project.relativePath}/bin`);
     }
@@ -56,7 +57,17 @@ RUN npm ci --include=dev --ignore-scripts
 COPY --link . .
 
 # Build
-RUN npm run build
+<%
+if (project.config.deployment?.dbInstance) {
+-%>
+RUN --mount=type=secret,id=EDGEDB_INSTANCE --mount=type=secret,id=EDGEDB_SECRET_KEY EDGEDB_INSTANCE="$(cat /run/secrets/EDGEDB_INSTANCE)" EDGEDB_SECRET_KEY="$(cat /run/secrets/EDGEDB_SECRET_KEY)" npm run build
+<%
+} else {
+-%>
+RUN npm run build -- --filter=<%- project.name %>
+<%
+}
+-%>
 
 # Final stage for app image
 FROM base
@@ -68,6 +79,6 @@ FROM base
 RUN npm ci --omit=dev --ignore-scripts
 
 # Start the server
-WORKDIR /workspace/apps/somewhere
+WORKDIR /workspace/<%- project.relativePath %>
 EXPOSE 5000
 ENTRYPOINT ["npm", "start"]

package/templates/projects/remix-app/tsconfig.json.ejs

@@ -12,8 +12,9 @@ let tsconfig = lodash.merge(
       noEmit: true,
       resolveJsonModule: true,
       rootDir: '.',
+      exactOptionalPropertyTypes: project.config.deployment?.dbInstance ? false : true, // TODO: when EdgeDB client supports `exactOptionalPropertyTypes: true`, remove this line
     },
-    include: ['./env.d.ts', './*', './app/**/*'],
+    include: project.config.deployment?.dbInstance ? ['./app/**/*', './dbschema/**/*', './*'] : ['./app/**/*', './*'],
     references: getReferences(workspace, project),
   },
   project.config.overrides?.tsconfig ?? {},

package/templates/projects/remix-app/tsconfig.typecheck.json.ejs

@@ -2,6 +2,19 @@
 to: 'tsconfig.typecheck.json'
 strategy: overwrite
 ---
+<%
+let tsconfig = lodash.merge(
+  {
+    extends: './tsconfig.json',
+    compilerOptions: {
+      composite: false,
+    },
+    include: project.config.deployment?.dbInstance ? ['./app/**/*', './dbschema/**/*', './tests/**/*', './*'] : ['./app/**/*', './tests/**/*', './*'],
+    references: getReferences(workspace, project),
+  },
+  project.config.overrides?.tsconfig ?? {},
+);
+-%>
 //
 // DO NOT EDIT!
 // This file was autogenerated by Carson.
@@ -10,10 +23,4 @@ strategy: overwrite
 // Run `npx carson update workspace` to regenerate.
 //
 
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "composite": false
-  },
-  "include": ["./app/**/*", "./tests/**/*", "./*"]
-}
+<%- JSON.stringify(tsconfig, null, 2) %>

package/templates/workspace/.dockerignore.ejs

@@ -9,7 +9,17 @@ let lines = [];
 for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
     lines.push(`!${project.relativePath}/app/**`);
+
+    if (project.config.deployment?.dbInstance) {
+      lines.push(`!${project.relativePath}/dbschema/**`);
+    }
+
     lines.push(`!${project.relativePath}/public/**`);
+
+    if (project.config.deployment?.dbInstance) {
+      lines.push(`!${project.relativePath}/edgedb.toml`);
+    }
+
     lines.push(`!${project.relativePath}/env.d.ts`);
     lines.push(`!${project.relativePath}/package.json`);
     lines.push(`!${project.relativePath}/postcss.config.cjs`);

package/templates/workspace/.github/workflows/check-pull-request.yaml.ejs

@@ -97,12 +97,12 @@ for (let project of workspace.projects) {
 -%>
 
       - name: Run tests
+        run: |
+          npm run test -- --filter=<%- project.name %>
         env:
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
           EDGEDB_BRANCH: ${{ github.head_ref }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
-        run: |
-          npm run codegen --workspace <%- project.name %>
 <%
   }
 }

package/templates/workspace/.github/workflows/release-pull-request.yaml.ejs

@@ -2,6 +2,21 @@
 to: '.github/workflows/release-pull-request.yaml'
 strategy: overwrite
 ---
+<%
+let appsWithDb = [];
+
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+    appsWithDb.push(project.name);
+  }
+}
+
+let appsWithDbFilter = appsWithDb.map((name) => `--filter=!${name}`).join(' ');
+
+if (appsWithDbFilter) {
+  appsWithDbFilter = `-- ${appsWithDbFilter}`;
+}
+-%>
 #
 # DO NOT EDIT!
 # This file was autogenerated by Carson.
@@ -47,28 +62,20 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
 
 <%
-if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
 -%>
 
-      - uses: edgedb/setup-edgedb@v1
-        with:
-          server-version: none
+      - uses: superfly/flyctl-actions/setup-flyctl@master
 <%
 }
 
-for (let project of workspace.projects) {
-  if (project.config.deployment?.dbInstance) {
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
 -%>
 
-      - name: Authenticate EdgeDB Cloud
-        env:
-          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
-          EDGEDB_BRANCH: ${{ github.head_ref }}
-          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
-        run: |
-          edgedb project init --link --server-instance <%- project.config.deployment.dbInstance %> --project-dir <%- project.relativePath %>--non-interactive
+      - uses: edgedb/setup-edgedb@v1
+        with:
+          server-version: none
 <%
-  }
 }
 -%>
 
@@ -90,7 +97,24 @@ for (let project of workspace.projects) {
           git config --unset core.filemode
 
       - name: Run tests
-        run: npm test
+        run: npm test <%- appsWithDbFilter %>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Run tests
+        run: |
+          npm run test -- --filter=<%- project.name %>
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.head_ref }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+<%
+  }
+}
+-%>
 
       - name: Check for changes
         run: |
@@ -107,7 +131,24 @@ for (let project of workspace.projects) {
           git config --unset core.filemode
 
       - name: Build packages
-        run: npm run build
+        run: npm run build <%- appsWithDbFilter %>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Build <%- project.name %>
+        run: |
+          npm run build -- --filter=<%- project.name %>
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.head_ref }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+<%
+  }
+}
+-%>
 
       - name: Authenticate to npm registry
         run: |
@@ -130,19 +171,25 @@ for (let project of workspace.projects) {
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: 'true' # must be string, not boolean
 <%
-if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+for (let project of workspace.projects) {
+  if (project.config.deployment?.appName && project.config.deployment?.dbInstance) {
 -%>
 
-      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - name: Deploy <%- project.name %>
+        run: |
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable --build-secret "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
+        env:
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.head_ref }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
 <%
-}
-
-for (let project of workspace.projects) {
-  if (project.config.deployment?.appName) {
+  } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy <%- project.name %>
-        run:
+        run: |
           npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable
         env:
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}

package/templates/workspace/.github/workflows/release.yaml.ejs

@@ -2,6 +2,21 @@
 to: '.github/workflows/release.yaml'
 strategy: overwrite
 ---
+<%
+let appsWithDb = [];
+
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+    appsWithDb.push(project.name);
+  }
+}
+
+let appsWithDbFilter = appsWithDb.map((name) => `--filter=!${name}`).join(' ');
+
+if (appsWithDbFilter) {
+  appsWithDbFilter = `-- ${appsWithDbFilter}`;
+}
+-%>
 #
 # DO NOT EDIT!
 # This file was autogenerated by Carson.
@@ -43,6 +58,24 @@ jobs:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
+<%
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+-%>
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+<%
+}
+
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+-%>
+
+      - uses: edgedb/setup-edgedb@v1
+        with:
+          server-version: none
+<%
+}
+-%>
+
       - name: Install packages
         run: npm ci
 
@@ -60,8 +93,42 @@ jobs:
 
           git config --unset core.filemode
 
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Migrate "<%- project.name %>"
+        run: |
+          edgedb migrate
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.ref_name  }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+<%
+  }
+}
+-%>
+
       - name: Run tests
-        run: npm test
+        run: npm test <%- appsWithDbFilter %>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Run tests
+        run: |
+          npm run test -- --filter=<%- project.name %>
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.head_ref }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+<%
+  }
+}
+-%>
 
       - name: Check for changes
         run: |
@@ -78,7 +145,7 @@ jobs:
           git config --unset core.filemode
 
       - name: Build packages
-        run: npm run build
+        run: npm run build <%- appsWithDbFilter %>
 
       - name: Authenticate to npm registry
         run: |
@@ -130,46 +197,25 @@ jobs:
           git push --follow-tags
 
 <%
-if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
--%>
-
-      - uses: edgedb/setup-edgedb@v1
-        with:
-          server-version: none
-<%
-}
-
 for (let project of workspace.projects) {
-  if (project.config.deployment?.dbInstance) {
+  if (project.config.deployment?.appName && project.config.deployment?.dbInstance) {
 -%>
 
-      - name: Migrate "<%- project.name %>"
+      - name: Deploy "<%- project.name %>"
+        run: |
+          npm run deploy --workspace <%- project.name %> -- --build-secret "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
         env:
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
-          EDGEDB_BRANCH: ${{ github.ref_name  }}
+          EDGEDB_BRANCH: ${{ github.head_ref }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
-        run: |
-          edgedb project init --link --server-instance <%- project.config.deployment.dbInstance %> --project-dir <%- project.relativePath %>--non-interactive
-          edgedb migrate -I <%- project.config.deployment.dbInstance %>
-<%
-  }
-}
--%>
-
 <%
-if (workspace.projects.some((project) => project.config.deployment?.appName)) {
--%>
-
-      - uses: superfly/flyctl-actions/setup-flyctl@master
-<%
-}
-
-for (let project of workspace.projects) {
-  if (project.config.deployment?.appName) {
+  } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy "<%- project.name %>"
-        run:
+        run: |
           npm run deploy --workspace <%- project.name %>
         env:
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
@@ -222,6 +268,24 @@ for (let project of workspace.projects) {
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
+<%
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+-%>
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+<%
+}
+
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+-%>
+
+      - uses: edgedb/setup-edgedb@v1
+        with:
+          server-version: none
+<%
+}
+-%>
+
       - name: Install packages
         run: npm ci
 
@@ -239,8 +303,42 @@ for (let project of workspace.projects) {
 
           git config --unset core.filemode
 
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Migrate "<%- project.name %>"
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.ref_name  }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+        run: |
+          edgedb migrate
+<%
+  }
+}
+-%>
+
+      - name: Run tests
+        run: npm test <%- appsWithDbFilter %>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
       - name: Run tests
-        run: npm test
+        run: |
+          npm run test -- --filter=<%- project.name %>
+        env:
+          EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
+          EDGEDB_BRANCH: ${{ github.head_ref }}
+          EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
+<%
+  }
+}
+-%>
 
       - name: Check for changes
         run: |
@@ -257,7 +355,7 @@ for (let project of workspace.projects) {
           git config --unset core.filemode
 
       - name: Build packages
-        run: npm run build
+        run: npm run build <%- appsWithDbFilter %>
 
       - name: Update documentation
         run: |
@@ -290,45 +388,25 @@ for (let project of workspace.projects) {
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: 'true' # must be string, not boolean
 <%
-if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
--%>
-
-      - uses: edgedb/setup-edgedb@v1
-        with:
-          server-version: none
-<%
-}
-
 for (let project of workspace.projects) {
-  if (project.config.deployment?.dbInstance) {
+  if (project.config.deployment?.appName && project.config.deployment?.dbInstance) {
 -%>
 
-      - name: Migrate "<%- project.name %>"
+      - name: Deploy "<%- project.name %>"
+        run: |
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next --build-secret "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
         env:
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
-          EDGEDB_BRANCH: ${{ github.ref_name  }}
+          EDGEDB_BRANCH: ${{ github.head_ref }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance.split('/')[1] ?? '').toUpperCase() %>_EDGEDB_TOKEN }}
-        run: |
-          edgedb project init --link --server-instance <%- project.config.deployment.dbInstance %> --project-dir <%- project.relativePath %>--non-interactive
-          edgedb migrate -I <%- project.config.deployment.dbInstance %>
 <%
-  }
-}
--%>
-<%
-if (workspace.projects.some((project) => project.config.deployment?.appName)) {
--%>
-
-      - uses: superfly/flyctl-actions/setup-flyctl@master
-<%
-}
-
-for (let project of workspace.projects) {
-  if (project.config.deployment?.appName) {
+  } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy "<%- project.name %>"
-        run:
+        run: |
           npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next
         env:
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}

package/templates/workspace/turbo.json.ejs

@@ -8,7 +8,7 @@ let turboConfig = {
   pipeline: {
     build: {
       dependsOn: ['^build', 'codegen'],
-      outputs: [`${BUILD_DIRECTORY}/**`],
+      outputs: [`${BUILD_DIRECTORY}/**`, 'app/**'],
     },
     clean: {
       cache: false,
@@ -33,7 +33,7 @@ let turboConfig = {
       outputs: [],
     },
     test: {
-      dependsOn: ['^build', 'typecheck', 'lint'],
+      dependsOn: ['^build', 'codegen', 'typecheck', 'lint'],
       outputs: ['coverage/**'],
     },
     typecheck: {
@@ -41,6 +41,7 @@ let turboConfig = {
       outputs: [],
     },
   },
+  globalEnv: workspace.projects.some((project) => project.config.deployment?.dbInstance) ? ['EDGEDB_INSTANCE', 'EDGEDB_BRANCH', 'EDGEDB_SECRET_KEY'] : [],
   globalDependencies: [
     '.editorconfig',
     '.eslintrc.cjs',
@@ -49,6 +50,7 @@ let turboConfig = {
     'tsconfig.json',
     'tsconfig.typecheck.json',
   ],
+
 };
 
 if (workspace.projects.find((project) => project.name === LINTER_CONFIG_PACKAGE_NAME)) {