@geekmidas/cli 1.2.3 → 1.4.0
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/CHANGELOG.md +12 -0
- package/dist/{CachedStateProvider-DVyKfaMm.mjs → CachedStateProvider-BDq5WqSy.mjs} +1 -1
- package/dist/{CachedStateProvider-DVyKfaMm.mjs.map → CachedStateProvider-BDq5WqSy.mjs.map} +1 -1
- package/dist/CachedStateProvider-CI61keQ1.mjs +3 -0
- package/dist/{HostingerProvider-DqUq6e9i.mjs → HostingerProvider-B9N-TKbp.mjs} +2 -2
- package/dist/{HostingerProvider-DqUq6e9i.mjs.map → HostingerProvider-B9N-TKbp.mjs.map} +1 -1
- package/dist/{LocalStateProvider-DxoSaWUV.mjs → LocalStateProvider-BDm7ZqJo.mjs} +1 -1
- package/dist/{LocalStateProvider-DxoSaWUV.mjs.map → LocalStateProvider-BDm7ZqJo.mjs.map} +1 -1
- package/dist/{Route53Provider-KUAX3vz9.mjs → Route53Provider-DOWmFnwN.mjs} +2 -2
- package/dist/{Route53Provider-KUAX3vz9.mjs.map → Route53Provider-DOWmFnwN.mjs.map} +1 -1
- package/dist/{Route53Provider-CpRIqu69.cjs → Route53Provider-xrWuBXih.cjs} +2 -2
- package/dist/{Route53Provider-CpRIqu69.cjs.map → Route53Provider-xrWuBXih.cjs.map} +1 -1
- package/dist/{SSMStateProvider-D79o_JjM.cjs → SSMStateProvider-DGrqYll0.cjs} +8 -4
- package/dist/SSMStateProvider-DGrqYll0.cjs.map +1 -0
- package/dist/{SSMStateProvider-BjCi_58g.mjs → SSMStateProvider-DT0WV-E_.mjs} +9 -4
- package/dist/SSMStateProvider-DT0WV-E_.mjs.map +1 -0
- package/dist/{bundler-BqTN5Dj5.mjs → bundler-DgXsOSxc.mjs} +3 -3
- package/dist/{bundler-BqTN5Dj5.mjs.map → bundler-DgXsOSxc.mjs.map} +1 -1
- package/dist/chunk-Duj1WY3L.mjs +7 -0
- package/dist/{config-BQ4a36Rq.mjs → config-C1bidhvG.mjs} +2 -2
- package/dist/{config-BQ4a36Rq.mjs.map → config-C1bidhvG.mjs.map} +1 -1
- package/dist/{config-Bayob8pB.cjs → config-C1dM7aZb.cjs} +2 -2
- package/dist/{config-Bayob8pB.cjs.map → config-C1dM7aZb.cjs.map} +1 -1
- package/dist/config.cjs +2 -2
- package/dist/config.d.cts +1 -1
- package/dist/config.d.mts +2 -2
- package/dist/config.mjs +2 -2
- package/dist/{credentials-DT1dSxIx.mjs → credentials-s1kLcIzK.mjs} +1 -1
- package/dist/{credentials-DT1dSxIx.mjs.map → credentials-s1kLcIzK.mjs.map} +1 -1
- package/dist/deploy/sniffer-routes-worker.cjs +65 -0
- package/dist/deploy/sniffer-routes-worker.cjs.map +1 -0
- package/dist/deploy/sniffer-routes-worker.d.cts +1 -0
- package/dist/deploy/sniffer-routes-worker.d.mts +1 -0
- package/dist/deploy/sniffer-routes-worker.mjs +64 -0
- package/dist/deploy/sniffer-routes-worker.mjs.map +1 -0
- package/dist/dokploy-api-DSJYNx88.mjs +3 -0
- package/dist/{dokploy-api-7k3t7_zd.mjs → dokploy-api-z0833e7r.mjs} +1 -1
- package/dist/{dokploy-api-7k3t7_zd.mjs.map → dokploy-api-z0833e7r.mjs.map} +1 -1
- package/dist/{encryption-JtMsiGNp.mjs → encryption-BOH5M-f-.mjs} +1 -1
- package/dist/{encryption-JtMsiGNp.mjs.map → encryption-BOH5M-f-.mjs.map} +1 -1
- package/dist/encryption-a9TNMWav.mjs +3 -0
- package/dist/{index-Bi9vGQJy.d.mts → index-DvpWzLD7.d.mts} +5 -2
- package/dist/index-DvpWzLD7.d.mts.map +1 -0
- package/dist/{index-CufAAnge.d.cts → index-DzmZ6SUW.d.cts} +4 -1
- package/dist/index-DzmZ6SUW.d.cts.map +1 -0
- package/dist/index.cjs +27 -13
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +42 -27
- package/dist/index.mjs.map +1 -1
- package/dist/{openapi-NthphEWK.mjs → openapi-9k6a6VA4.mjs} +2 -2
- package/dist/{openapi-NthphEWK.mjs.map → openapi-9k6a6VA4.mjs.map} +1 -1
- package/dist/{openapi-ZhO7wwya.cjs → openapi-Dcja4e1C.cjs} +2 -2
- package/dist/{openapi-ZhO7wwya.cjs.map → openapi-Dcja4e1C.cjs.map} +1 -1
- package/dist/{openapi-react-query-DGEkD39r.mjs → openapi-react-query-DaTMSPD5.mjs} +1 -1
- package/dist/{openapi-react-query-DGEkD39r.mjs.map → openapi-react-query-DaTMSPD5.mjs.map} +1 -1
- package/dist/openapi-react-query.mjs +1 -1
- package/dist/openapi.cjs +3 -3
- package/dist/openapi.d.mts +1 -1
- package/dist/openapi.mjs +3 -3
- package/dist/{storage-BMW6yLu3.mjs → storage-DmCbr6DI.mjs} +1 -1
- package/dist/{storage-BMW6yLu3.mjs.map → storage-DmCbr6DI.mjs.map} +1 -1
- package/dist/{storage-D8XzjVaO.mjs → storage-Dx_jZbq6.mjs} +1 -1
- package/dist/{types-BldpmqQX.d.mts → types-B9UZ7fOG.d.mts} +1 -1
- package/dist/{types-BldpmqQX.d.mts.map → types-B9UZ7fOG.d.mts.map} +1 -1
- package/dist/workspace/index.cjs +1 -1
- package/dist/workspace/index.d.cts +1 -1
- package/dist/workspace/index.d.mts +2 -2
- package/dist/workspace/index.mjs +1 -1
- package/dist/{workspace-CASoZOjs.mjs → workspace-Cb_I7oCJ.mjs} +5 -8
- package/dist/{workspace-CASoZOjs.mjs.map → workspace-Cb_I7oCJ.mjs.map} +1 -1
- package/dist/{workspace-BMJE18LV.cjs → workspace-CeFgIDC-.cjs} +3 -2
- package/dist/{workspace-BMJE18LV.cjs.map → workspace-CeFgIDC-.cjs.map} +1 -1
- package/package.json +3 -3
- package/src/deploy/SSMStateProvider.ts +14 -3
- package/src/deploy/StateProvider.ts +5 -1
- package/src/deploy/__tests__/SSMStateProvider.spec.ts +12 -0
- package/src/deploy/__tests__/createStateProvider.spec.ts +10 -0
- package/src/deploy/__tests__/env-resolver.spec.ts +145 -2
- package/src/deploy/__tests__/index.spec.ts +393 -5
- package/src/deploy/env-resolver.ts +10 -0
- package/src/deploy/index.ts +11 -0
- package/src/init/generators/monorepo.ts +3 -1
- package/src/init/generators/web.ts +6 -2
- package/src/workspace/schema.ts +2 -0
- package/tsdown.config.ts +1 -0
- package/dist/CachedStateProvider-OiFUGr7p.mjs +0 -3
- package/dist/SSMStateProvider-BjCi_58g.mjs.map +0 -1
- package/dist/SSMStateProvider-D79o_JjM.cjs.map +0 -1
- package/dist/dokploy-api-CHa8G51l.mjs +0 -3
- package/dist/encryption-UUmaWAmz.mjs +0 -3
- package/dist/index-Bi9vGQJy.d.mts.map +0 -1
- package/dist/index-CufAAnge.d.cts.map +0 -1
package/dist/index.cjs
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env -S npx tsx
|
|
2
2
|
const require_chunk = require('./chunk-CUT6urMc.cjs');
|
|
3
|
-
const require_workspace = require('./workspace-
|
|
4
|
-
const require_config = require('./config-
|
|
3
|
+
const require_workspace = require('./workspace-CeFgIDC-.cjs');
|
|
4
|
+
const require_config = require('./config-C1dM7aZb.cjs');
|
|
5
5
|
const require_credentials = require('./credentials-C8DWtnMY.cjs');
|
|
6
|
-
const require_openapi = require('./openapi-
|
|
6
|
+
const require_openapi = require('./openapi-Dcja4e1C.cjs');
|
|
7
7
|
const require_storage = require('./storage-CoCNe0Pt.cjs');
|
|
8
8
|
const require_dokploy_api = require('./dokploy-api-CQvhV6Hd.cjs');
|
|
9
9
|
const require_encryption = require('./encryption-BE0UOb8j.cjs');
|
|
@@ -32,7 +32,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
|
|
|
32
32
|
|
|
33
33
|
//#region package.json
|
|
34
34
|
var name = "@geekmidas/cli";
|
|
35
|
-
var version = "1.
|
|
35
|
+
var version = "1.3.0";
|
|
36
36
|
var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
|
|
37
37
|
var private$1 = false;
|
|
38
38
|
var type = "module";
|
|
@@ -2203,7 +2203,7 @@ async function createDnsProvider(options) {
|
|
|
2203
2203
|
return new HostingerProvider();
|
|
2204
2204
|
}
|
|
2205
2205
|
if (provider === "route53") {
|
|
2206
|
-
const { Route53Provider } = await Promise.resolve().then(() => require("./Route53Provider-
|
|
2206
|
+
const { Route53Provider } = await Promise.resolve().then(() => require("./Route53Provider-xrWuBXih.cjs"));
|
|
2207
2207
|
const route53Config = config;
|
|
2208
2208
|
return new Route53Provider({
|
|
2209
2209
|
region: route53Config.region,
|
|
@@ -4224,6 +4224,10 @@ function resolveEnvVar(varName, context) {
|
|
|
4224
4224
|
if (context.masterKey) return context.masterKey;
|
|
4225
4225
|
break;
|
|
4226
4226
|
}
|
|
4227
|
+
if (context.dependencyUrls && varName.endsWith("_URL")) {
|
|
4228
|
+
const depName = varName.slice(0, -4).toLowerCase();
|
|
4229
|
+
if (context.dependencyUrls[depName]) return context.dependencyUrls[depName];
|
|
4230
|
+
}
|
|
4227
4231
|
if (context.userSecrets) {
|
|
4228
4232
|
if (context.userSecrets.custom[varName]) return context.userSecrets.custom[varName];
|
|
4229
4233
|
if (varName in context.userSecrets.urls) return context.userSecrets.urls[varName];
|
|
@@ -4470,12 +4474,14 @@ async function createStateProvider(options) {
|
|
|
4470
4474
|
if (provider === "ssm") {
|
|
4471
4475
|
if (!workspaceName) throw new Error("Workspace name is required for SSM state provider. Set \"name\" in gkm.config.ts.");
|
|
4472
4476
|
const { LocalStateProvider } = await Promise.resolve().then(() => require("./LocalStateProvider-CdspeSVL.cjs"));
|
|
4473
|
-
const { SSMStateProvider } = await Promise.resolve().then(() => require("./SSMStateProvider-
|
|
4477
|
+
const { SSMStateProvider } = await Promise.resolve().then(() => require("./SSMStateProvider-DGrqYll0.cjs"));
|
|
4474
4478
|
const { CachedStateProvider: CachedStateProvider$1 } = await Promise.resolve().then(() => require("./CachedStateProvider-D_uISMmJ.cjs"));
|
|
4479
|
+
const ssmConfig = config;
|
|
4475
4480
|
const local = new LocalStateProvider(workspaceRoot);
|
|
4476
4481
|
const ssm = SSMStateProvider.create({
|
|
4477
4482
|
workspaceName,
|
|
4478
|
-
region:
|
|
4483
|
+
region: ssmConfig.region,
|
|
4484
|
+
profile: ssmConfig.profile
|
|
4479
4485
|
});
|
|
4480
4486
|
return new CachedStateProvider$1(ssm, local);
|
|
4481
4487
|
}
|
|
@@ -5594,6 +5600,10 @@ async function workspaceDeployCommand(workspace, options) {
|
|
|
5594
5600
|
buildArgs
|
|
5595
5601
|
});
|
|
5596
5602
|
const backendHost = resolveHost(appName, app, stage, dokployConfig, false);
|
|
5603
|
+
const dependencyUrls = {};
|
|
5604
|
+
if (app.dependencies) {
|
|
5605
|
+
for (const dep of app.dependencies) if (publicUrls[dep]) dependencyUrls[dep] = publicUrls[dep];
|
|
5606
|
+
}
|
|
5597
5607
|
const envContext = {
|
|
5598
5608
|
app,
|
|
5599
5609
|
appName,
|
|
@@ -5613,7 +5623,8 @@ async function workspaceDeployCommand(workspace, options) {
|
|
|
5613
5623
|
appHostname: backendHost,
|
|
5614
5624
|
frontendUrls,
|
|
5615
5625
|
userSecrets: stageSecrets ?? void 0,
|
|
5616
|
-
masterKey: appSecrets?.masterKey
|
|
5626
|
+
masterKey: appSecrets?.masterKey,
|
|
5627
|
+
dependencyUrls
|
|
5617
5628
|
};
|
|
5618
5629
|
const appRequirements = sniffedApps.get(appName);
|
|
5619
5630
|
const sniffedVars = appRequirements?.requiredEnvVars ?? [];
|
|
@@ -7081,6 +7092,7 @@ function generateMonorepoFiles(options, _template) {
|
|
|
7081
7092
|
"@biomejs/biome": "~2.3.0",
|
|
7082
7093
|
"@geekmidas/cli": GEEKMIDAS_VERSIONS["@geekmidas/cli"],
|
|
7083
7094
|
esbuild: "~0.27.0",
|
|
7095
|
+
tsx: "~4.20.0",
|
|
7084
7096
|
turbo: "~2.3.0",
|
|
7085
7097
|
typescript: "~5.8.2",
|
|
7086
7098
|
vitest: "~4.0.0"
|
|
@@ -7327,7 +7339,8 @@ export default defineWorkspace({
|
|
|
7327
7339
|
port: 3000,
|
|
7328
7340
|
routes: '${getRoutesGlob()}',
|
|
7329
7341
|
envParser: './src/config/env#envParser',
|
|
7330
|
-
logger: './src/config/logger#logger'
|
|
7342
|
+
logger: './src/config/logger#logger',
|
|
7343
|
+
dependencies: ['auth'],`;
|
|
7331
7344
|
if (telescope) config += `
|
|
7332
7345
|
telescope: {
|
|
7333
7346
|
enabled: true,
|
|
@@ -9905,14 +9918,14 @@ export default nextConfig;
|
|
|
9905
9918
|
jsx: "preserve",
|
|
9906
9919
|
incremental: true,
|
|
9907
9920
|
plugins: [{ name: "next" }],
|
|
9921
|
+
baseUrl: ".",
|
|
9908
9922
|
paths: {
|
|
9909
|
-
"~/*": ["./src/*"],
|
|
9923
|
+
"~/*": ["./src/*", "../../packages/ui/src/*"],
|
|
9910
9924
|
[`${modelsPackage}`]: ["../../packages/models/src"],
|
|
9911
9925
|
[`${modelsPackage}/*`]: ["../../packages/models/src/*"],
|
|
9912
9926
|
[`${uiPackage}`]: ["../../packages/ui/src"],
|
|
9913
9927
|
[`${uiPackage}/*`]: ["../../packages/ui/src/*"]
|
|
9914
|
-
}
|
|
9915
|
-
baseUrl: "."
|
|
9928
|
+
}
|
|
9916
9929
|
},
|
|
9917
9930
|
include: [
|
|
9918
9931
|
"next-env.d.ts",
|
|
@@ -9920,7 +9933,8 @@ export default nextConfig;
|
|
|
9920
9933
|
"**/*.tsx",
|
|
9921
9934
|
".next/types/**/*.ts"
|
|
9922
9935
|
],
|
|
9923
|
-
exclude: ["node_modules"]
|
|
9936
|
+
exclude: ["node_modules"],
|
|
9937
|
+
references: [{ path: "../../packages/ui" }, { path: "../../packages/models" }]
|
|
9924
9938
|
};
|
|
9925
9939
|
const queryClientTs = `import { QueryClient } from '@tanstack/react-query';
|
|
9926
9940
|
|