@jakubmazanec/carson-templates 2.2.1 → 2.3.0-unstable.1a1eb5f

package/package.json

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

package/templates/projects/remix-app/.eslintrc.cjs.ejs

@@ -2,6 +2,13 @@
 to: '.eslintrc.cjs'
 strategy: overwrite
 ---
+<%
+let lintIgnorePatterns = [
+  ...LINT_IGNORE_PATTERNS,
+  'dbschema/edgeql-js/',
+  'dbschema/interfaces.*',
+];
+-%>
 /**
  * DO NOT EDIT!
  * This file was autogenerated by Carson.
@@ -17,5 +24,5 @@ module.exports = {
     '@jakubmazanec/eslint-config/nodejs',
     '@jakubmazanec/eslint-config/prettier',
   ],
-  ignorePatterns: <%- JSON.stringify(LINT_IGNORE_PATTERNS, null, 2) %>,
+  ignorePatterns: <%- JSON.stringify(lintIgnorePatterns, null, 2) %>,
 };

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

@@ -1,5 +1,6 @@
 ---
 to: 'Dockerfile'
+if: <%- Boolean(project.config.deployment?.appName) %>
 strategy: overwrite
 ---
 <%

package/templates/projects/remix-app/edgedb.toml.ejs

@@ -0,0 +1,7 @@
+---
+to: 'edgedb.toml'
+if: <%- Boolean(project.config.deployment?.dbInstance) %>
+strategy: overwrite
+---
+[edgedb]
+server-version = "5.2"

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/.github/workflows/check-pull-request.yaml.ejs

@@ -2,6 +2,21 @@
 to: '.github/workflows/check-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.
@@ -45,6 +60,17 @@ jobs:
         with:
           node-version: 20
 
+<%
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+-%>
+
+      - uses: edgedb/setup-edgedb@v1
+        with:
+          server-version: none
+<%
+}
+-%>
+
       - name: Install packages
         run: npm ci
 
@@ -62,8 +88,61 @@ jobs:
 
           git config --unset core.filemode
 
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: DEBUG - Run only codegen, directly
+        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 %>
+
+<%
+  }
+}
+-%>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: DEBUG - Run only codegen, via Turborepo
+        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: |
+          npx turbo run codegen --filter=<%- project.name %> -vv
+
+<%
+  }
+}
+-%>
+
       - name: Run tests
-        run: npm test
+        run: npm test <%- appsWithDbFilter %>
+
+<%
+for (let project of workspace.projects) {
+  if (project.config.deployment?.dbInstance) {
+-%>
+
+      - name: Run tests
+        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 test -- --filter=<%- project.name %> -vv
+<%
+  }
+}
+-%>
 
       - name: Check for changes
         run: |

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.
@@ -46,6 +61,17 @@ jobs:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
+<%
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+-%>
+
+      - uses: edgedb/setup-edgedb@v1
+        with:
+          server-version: none
+<%
+}
+-%>
+
       - name: Install packages
         run: npm ci
 
@@ -64,7 +90,24 @@ jobs:
           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
+        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 test -- --filter=<%- project.name %> -vv
+<%
+  }
+}
+-%>
 
       - name: Check for changes
         run: |

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

@@ -128,6 +128,34 @@ jobs:
       - name: Push changes
         run: |
           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) {
+-%>
+
+      - 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 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)) {
 -%>
@@ -140,7 +168,7 @@ for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
 -%>
 
-      - name: Deploy <%- project.name %>
+      - name: Deploy "<%- project.name %>"
         run:
           npm run deploy --workspace <%- project.name %>
         env:
@@ -262,6 +290,32 @@ 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) {
+-%>
+
+      - 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 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)) {
 -%>
 
@@ -273,7 +327,7 @@ for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
 -%>
 
-      - name: Deploy <%- project.name %>
+      - name: Deploy "<%- project.name %>"
         run:
           npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next
         env: