@obh/forge 0.3.3 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generators/root.d.ts.map +1 -1
- package/dist/generators/root.js +4 -1
- package/dist/generators/root.js.map +1 -1
- package/dist/generators/web.d.ts.map +1 -1
- package/dist/generators/web.js +11 -3
- package/dist/generators/web.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/generators/root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"root.d.ts","sourceRoot":"","sources":["../../src/generators/root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI,CAyF1E;AA2ED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM5C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA4C3C"}
|
package/dist/generators/root.js
CHANGED
|
@@ -49,7 +49,10 @@ function addProjectSkeleton(plan, opts) {
|
|
|
49
49
|
},
|
|
50
50
|
}, null, 2) + "\n", "shared TypeScript base config (CommonJS, matches @obh/* packages)");
|
|
51
51
|
plan.create(".gitignore", ["node_modules/", "dist/", "coverage/", "*.log", ".env", ".env.local", ".DS_Store", ""].join("\n"), "gitignore");
|
|
52
|
-
plan.create(".dockerignore",
|
|
52
|
+
plan.create(".dockerignore",
|
|
53
|
+
// NB: no .env* here — apps/admin/.env.production must reach the build context
|
|
54
|
+
// (real .env/.env.local are gitignored, so absent from git-app build clones anyway).
|
|
55
|
+
["node_modules", "**/node_modules", "dist", "**/dist", ".git", "coverage", "*.log", ""].join("\n"), "dockerignore (keeps node_modules/.git out of root-context builds)");
|
|
53
56
|
plan.create(".env.example", envBase(name), "environment example");
|
|
54
57
|
plan.create("migrations/0001_init.sql", INIT_SQL, "initial product migration");
|
|
55
58
|
plan.create("scripts/migrate.ts", MIGRATE_RUNNER, "migration runner (SQL files + platform primitives)");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root.js","sourceRoot":"","sources":["../../src/generators/root.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"root.js","sourceRoot":"","sources":["../../src/generators/root.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/generators/web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,aAAa,CAAA;CACvB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/generators/web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,aAAa,CAAA;CACvB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAyE5D"}
|
package/dist/generators/web.js
CHANGED
|
@@ -58,8 +58,14 @@ function addWebApp(plan, opts) {
|
|
|
58
58
|
plan.create(`${dir}/src/api.ts`, apiTs(opts.scope, opts.example), "admin API client instance");
|
|
59
59
|
plan.create(`${dir}/src/App.tsx`, opts.example === "notes" ? APP_NOTES : APP_BASE, "admin App");
|
|
60
60
|
plan.create(`${dir}/nginx.conf`, NGINX, "nginx SPA config");
|
|
61
|
+
plan.create(`${dir}/.env.production`, ENV_PRODUCTION, "admin production API URL (EDIT before deploying)");
|
|
61
62
|
plan.create(`${dir}/Dockerfile`, dockerfile(pkgName, opts.name), "admin Dockerfile (root-context build)");
|
|
62
63
|
}
|
|
64
|
+
const ENV_PRODUCTION = `# The admin is a static bundle served on its OWN origin, separate from the API.
|
|
65
|
+
# Set this to the API's PUBLIC URL (the go./api. domain in deploy/*/lwd.toml)
|
|
66
|
+
# BEFORE deploying — Vite bakes it into the build. Dev falls back to :8080.
|
|
67
|
+
VITE_API_BASE_URL=https://api.example.com
|
|
68
|
+
`;
|
|
63
69
|
const VITE_CONFIG = `import { defineConfig } from "vite"
|
|
64
70
|
import react from "@vitejs/plugin-react"
|
|
65
71
|
|
|
@@ -99,8 +105,11 @@ function apiTs(scope, example) {
|
|
|
99
105
|
return `import { createClient } from "${scope}/sdk"
|
|
100
106
|
${typeReexport}
|
|
101
107
|
|
|
108
|
+
// \`||\` (not \`??\`): an empty VITE_API_BASE_URL must fall back, never win — a "" here
|
|
109
|
+
// produces a relative /api/... against the admin's own origin. Set VITE_API_BASE_URL
|
|
110
|
+
// (apps/admin/.env.production) to the API's public URL for production builds.
|
|
102
111
|
export const api = createClient({
|
|
103
|
-
baseUrl: import.meta.env.VITE_API_BASE_URL
|
|
112
|
+
baseUrl: import.meta.env.VITE_API_BASE_URL || "http://localhost:8080",
|
|
104
113
|
token: () => localStorage.getItem("token"),
|
|
105
114
|
})
|
|
106
115
|
`;
|
|
@@ -190,8 +199,7 @@ WORKDIR /repo
|
|
|
190
199
|
RUN npm install -g pnpm@9
|
|
191
200
|
COPY . .
|
|
192
201
|
RUN pnpm install --no-frozen-lockfile
|
|
193
|
-
|
|
194
|
-
ENV VITE_API_BASE_URL=$VITE_API_BASE_URL
|
|
202
|
+
# VITE_API_BASE_URL is read from apps/admin/.env.production at build time.
|
|
195
203
|
# "..." builds the workspace SDK (a dependency) before Vite bundles the admin.
|
|
196
204
|
RUN pnpm --filter "${pkgName}..." build
|
|
197
205
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/generators/web.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/generators/web.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const FORGE_VERSION = "0.3.
|
|
1
|
+
export declare const FORGE_VERSION = "0.3.5";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FORGE_VERSION = void 0;
|
|
4
4
|
// Single source of truth for the Forge version stamped into forge.json.
|
|
5
|
-
exports.FORGE_VERSION = "0.3.
|
|
5
|
+
exports.FORGE_VERSION = "0.3.5";
|
|
6
6
|
//# sourceMappingURL=version.js.map
|