Merge pull request #5 from soliantconsulting/bugfix/appconfig-mustache

fix: update packages to correctly load app config
soliantconsulting · Nov 6, 2024 · df0cf50 · df0cf50
2 parents 22794bd + 3bfd49d
commit df0cf50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/skeleton/templates/bitbucket-pipelines.yml.mustache b/skeleton/templates/bitbucket-pipelines.yml.mustache
@@ -13,7 +13,7 @@ definitions:
           - corepack enable
           - pnpm install
           - pnpm exec biome ci .
-          - pnpm exec typecheck
+          - pnpm typecheck
         caches:
           - pnpm
     - step: &deploy

diff --git a/skeleton/base/packages/api/package.json → ...plates/packages/api/package.json.mustache b/skeleton/base/packages/api/package.json → ...plates/packages/api/package.json.mustache
@@ -1,5 +1,5 @@
 {
-    "name": "api",
+    "name": "@{{{apiName}}}/api",
     "version": "1.0.0",
     "private": true,
     "type": "module",
@@ -14,6 +14,9 @@
         "@types/node": "^20.16.11"
     },
     "dependencies": {
+{{#if (has features "appconfig")}}
+        "@{{{apiName}}}/app-config": "workspace:*",
+{{/if}}
         "@koa/cors": "^5.0.0",
         "body-parser": "^1.20.3",
         "compression": "^1.7.4",

diff --git a/skeleton/templates/packages/api/src/index.ts.mustache b/skeleton/templates/packages/api/src/index.ts.mustache
@@ -11,7 +11,9 @@ import {
     methodNotAllowedHandler,
 } from "koa-jsonapi-zod";
 import Router from "koa-tree-router";
+{{#if (has features "appconfig")}}
 import { appConfigHandler } from "@{{{apiName}}}/app-config";
+{{/if}}
 import { registerRoutes } from "./route/index.js";
 import { orm, requestContextMiddleware } from "./util/mikro-orm.js";
 import { logger, requestLoggerMiddleware } from "./util/logger.js";

diff --git a/...fig/base/packages/app-config/package.json → .../packages/appconfig/package.json.mustache b/...fig/base/packages/app-config/package.json → .../packages/appconfig/package.json.mustache
@@ -1,5 +1,5 @@
 {
-    "name": "app-config",
+    "name": "@{{{apiName}}}/app-config",
     "version": "1.0.0",
     "private": true,
     "type": "module",