@jakubmazanec/carson-templates 2.3.0 → 2.4.0-next.83fd9d1

package/build/getAppUrl.d.ts

@@ -0,0 +1,2 @@
+import { type Project } from '@jakubmazanec/carson';
+export declare function getAppUrl(project: Project, deploymentEnvironment?: string): string;

package/build/getAppUrl.js

@@ -0,0 +1,13 @@
+"use strict";
+export function getAppUrl(project, deploymentEnvironment) {
+  let appName = project.config.deployment?.appName;
+  let appUrl = project.config.deployment?.appUrl;
+  if (appUrl && deploymentEnvironment === void 0 || !appName && appUrl) {
+    return appUrl;
+  }
+  if (!appName) {
+    return `http://localhost:5000`;
+  }
+  return `https://${deploymentEnvironment ? `${appName}-${deploymentEnvironment}` : appName}.fly.dev`;
+}
+//# sourceMappingURL=getAppUrl.js.map

package/build/getAppUrl.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../source/getAppUrl.ts"],
+  "sourcesContent": ["import {type Project} from '@jakubmazanec/carson';\n\nexport function getAppUrl(project: Project, deploymentEnvironment?: string) {\n  let appName = (project.config as {deployment?: {appName?: string}}).deployment?.appName;\n  let appUrl = (project.config as {deployment?: {appUrl?: string}}).deployment?.appUrl;\n\n  if ((appUrl && deploymentEnvironment === undefined) || (!appName && appUrl)) {\n    return appUrl;\n  }\n\n  if (!appName) {\n    return `http://localhost:5000`;\n  }\n\n  return `https://${deploymentEnvironment ? `${appName}-${deploymentEnvironment}` : appName}.fly.dev`;\n}\n"],
+  "mappings": ";AAEO,gBAAS,UAAU,SAAkB,uBAAgC;AAC1E,MAAI,UAAW,QAAQ,OAA6C,YAAY;AAChF,MAAI,SAAU,QAAQ,OAA4C,YAAY;AAE9E,MAAK,UAAU,0BAA0B,UAAe,CAAC,WAAW,QAAS;AAC3E,WAAO;AAAA,EACT;AAEA,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AAEA,SAAO,WAAW,wBAAwB,GAAG,OAAO,IAAI,qBAAqB,KAAK,OAAO;AAC3F;",
+  "names": []
+}

package/build/main.d.ts

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './getAppUrl.js';
 export * from './getDependencies.js';
 export * from './getDevelopmentBranch.js';
 export * from './getMainBranch.js';

package/build/main.js

@@ -1,5 +1,6 @@
 "use strict";
 export * from "./constants.js";
+export * from "./getAppUrl.js";
 export * from "./getDependencies.js";
 export * from "./getDevelopmentBranch.js";
 export * from "./getMainBranch.js";

package/build/main.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../source/main.ts"],
-  "sourcesContent": ["export * from './constants.js';\nexport * from './getDependencies.js';\nexport * from './getDevelopmentBranch.js';\nexport * from './getMainBranch.js';\nexport * from './getReferences.js';\nexport * from './getWorkspaceName.js';\nexport {default as lodash} from 'lodash';\nexport {default as semver} from 'semver';\n"],
-  "mappings": ";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAAQ,WAAW,cAAa;AAChC,SAAQ,WAAW,cAAa;",
+  "sourcesContent": ["export * from './constants.js';\nexport * from './getAppUrl.js';\nexport * from './getDependencies.js';\nexport * from './getDevelopmentBranch.js';\nexport * from './getMainBranch.js';\nexport * from './getReferences.js';\nexport * from './getWorkspaceName.js';\nexport {default as lodash} from 'lodash';\nexport {default as semver} from 'semver';\n"],
+  "mappings": ";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAAQ,WAAW,cAAa;AAChC,SAAQ,WAAW,cAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "2.3.0",
+  "version": "2.4.0-next.83fd9d1",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",

package/source/getAppUrl.ts

@@ -0,0 +1,16 @@
+import {type Project} from '@jakubmazanec/carson';
+
+export function getAppUrl(project: Project, deploymentEnvironment?: string) {
+  let appName = (project.config as {deployment?: {appName?: string}}).deployment?.appName;
+  let appUrl = (project.config as {deployment?: {appUrl?: string}}).deployment?.appUrl;
+
+  if ((appUrl && deploymentEnvironment === undefined) || (!appName && appUrl)) {
+    return appUrl;
+  }
+
+  if (!appName) {
+    return `http://localhost:5000`;
+  }
+
+  return `https://${deploymentEnvironment ? `${appName}-${deploymentEnvironment}` : appName}.fly.dev`;
+}

package/source/main.ts

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './getAppUrl.js';
 export * from './getDependencies.js';
 export * from './getDevelopmentBranch.js';
 export * from './getMainBranch.js';

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

@@ -43,6 +43,13 @@ WORKDIR /workspace
 # Set up env variables
 ENV NODE_ENV=production
 <%
+if (project.config.deployment?.appName) {
+-%>
+ARG VITE_APP_URL
+ENV VITE_APP_URL=$VITE_APP_URL
+<%
+}
+
 if (project.config.deployment?.dbInstance) {
 -%>
 ARG EDGEDB_INSTANCE

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

@@ -171,21 +171,23 @@ for (let project of workspace.projects) {
 
       - name: Deploy <%- project.name %>
         run: |
-          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable --build-arg "VITE_APP_URL=$VITE_APP_URL" --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
         env:
-          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
-          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
+          VITE_APP_URL: <%- getAppUrl(project, 'unstable') %>
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
           EDGEDB_BRANCH: ${{ github.head_ref }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance).toUpperCase() %>_EDGEDB_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy <%- project.name %>
         run: |
-          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable --build-arg "VITE_APP_URL=$VITE_APP_URL"
         env:
+          VITE_APP_URL: <%- getAppUrl(project, 'unstable') %>
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
           FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%

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

@@ -214,21 +214,23 @@ for (let project of workspace.projects) {
 
       - name: Deploy "<%- project.name %>"
         run: |
-          npm run deploy --workspace <%- project.name %> -- --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
+          npm run deploy --workspace <%- project.name %> -- --build-arg "VITE_APP_URL=$VITE_APP_URL" --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
         env:
-          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
-          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
+          VITE_APP_URL: <%- getAppUrl(project) %>
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
           EDGEDB_BRANCH: ${{ github.ref_name }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance).toUpperCase() %>_EDGEDB_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy "<%- project.name %>"
         run: |
-          npm run deploy --workspace <%- project.name %>
+          npm run deploy --workspace <%- project.name %> -- --build-arg "VITE_APP_URL=$VITE_APP_URL"
         env:
+          VITE_APP_URL: <%- getAppUrl(project) %>
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
           FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
@@ -405,21 +407,23 @@ for (let project of workspace.projects) {
 
       - name: Deploy "<%- project.name %>"
         run: |
-          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next --build-arg "VITE_APP_URL=$VITE_APP_URL" --build-arg "EDGEDB_INSTANCE=$EDGEDB_INSTANCE" --build-arg "EDGEDB_BRANCH=$EDGEDB_BRANCH" --build-secret "EDGEDB_SECRET_KEY=$EDGEDB_SECRET_KEY"
         env:
-          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
-          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
+          VITE_APP_URL: <%- getAppUrl(project, 'next') %>
           EDGEDB_INSTANCE: <%- project.config.deployment.dbInstance %>
           EDGEDB_BRANCH: ${{ github.ref_name }}
           EDGEDB_SECRET_KEY: ${{ secrets.<%- lodash.snakeCase(project.config.deployment.dbInstance).toUpperCase() %>_EDGEDB_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   } else if (project.config.deployment?.appName) {
 -%>
 
       - name: Deploy "<%- project.name %>"
         run: |
-          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next
+          npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next --build-arg "VITE_APP_URL=$VITE_APP_URL"
         env:
+          VITE_APP_URL: <%- getAppUrl(project, 'next') %>
           FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
           FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%

package/templates/workspace/turbo.json.ejs

@@ -41,7 +41,7 @@ let turboConfig = {
       outputs: [],
     },
   },
-  globalEnv: workspace.projects.some((project) => project.config.deployment?.dbInstance) ? ['EDGEDB_INSTANCE', 'EDGEDB_BRANCH', 'EDGEDB_SECRET_KEY'] : [],
+  globalEnv: [],
   globalDependencies: [
     '.editorconfig',
     '.eslintrc.cjs',
@@ -50,9 +50,16 @@ let turboConfig = {
     'tsconfig.json',
     'tsconfig.typecheck.json',
   ],
-
 };
 
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+  turboConfig.globalEnv.push('VITE_APP_URL');
+}
+
+if (workspace.projects.some((project) => project.config.deployment?.dbInstance)) {
+  turboConfig.globalEnv.push('EDGEDB_INSTANCE', 'EDGEDB_BRANCH', 'EDGEDB_SECRET_KEY');
+}
+
 if (workspace.projects.find((project) => project.name === LINTER_CONFIG_PACKAGE_NAME)) {
   turboConfig.pipeline.lint.dependsOn = [`${LINTER_CONFIG_PACKAGE_NAME}#build`, '^build', 'codegen'];
 }