@codemarc/blt 1.10.6 → 1.10.8
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/commands/app/paths.d.ts +1 -0
- package/dist/commands/app/paths.d.ts.map +1 -1
- package/dist/commands/app/paths.js +10 -3
- package/dist/commands/app/paths.js.map +1 -1
- package/dist/commands/app/pos.d.ts +7 -0
- package/dist/commands/app/pos.d.ts.map +1 -1
- package/dist/commands/app/pos.js +19 -12
- package/dist/commands/app/pos.js.map +1 -1
- package/dist/commands/app/site-env.d.ts +1 -0
- package/dist/commands/app/site-env.d.ts.map +1 -1
- package/dist/commands/app/site-env.js +6 -2
- package/dist/commands/app/site-env.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare function findWorkspaceRoot(startDir?: string): string;
|
|
2
2
|
export declare function resolveDeploySiteDir(target: string, workspaceRoot?: string): string;
|
|
3
|
+
export declare function resolveDeploySitesRoot(siteDir: string): string;
|
|
3
4
|
export declare function resolveDataRepoDir(workspaceRoot?: string): string;
|
|
4
5
|
export declare function resolveDataEnvBundle(envName: string, dataDir?: string): string;
|
|
5
6
|
export { trailzEnvBasePath, trailzEnvBundlePath } from "./env-check";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/commands/app/paths.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,QAAQ,SAAgB,GAAG,MAAM,CAmBlE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,SAAsB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/commands/app/paths.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,QAAQ,SAAgB,GAAG,MAAM,CAmBlE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,SAAsB,GAAG,MAAM,CAUhG;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,aAAa,SAAsB,GAAG,MAAM,CAM9E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,SAAuB,GAAG,MAAM,CAM5F;AAED,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -17,12 +17,19 @@ export function findWorkspaceRoot(startDir = process.cwd()) {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
export function resolveDeploySiteDir(target, workspaceRoot = findWorkspaceRoot()) {
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
const candidates = [
|
|
21
|
+
join(workspaceRoot, "deploy", "sites", "bltcore.com", target),
|
|
22
|
+
join(workspaceRoot, "deploy", "sites", `${target}.bltcore.com`),
|
|
23
|
+
];
|
|
24
|
+
const siteDir = candidates.find((candidate) => existsSync(candidate));
|
|
25
|
+
if (!siteDir) {
|
|
26
|
+
throw new Error(`Deploy site directory not found. Checked: ${candidates.join(", ")}`);
|
|
23
27
|
}
|
|
24
28
|
return siteDir;
|
|
25
29
|
}
|
|
30
|
+
export function resolveDeploySitesRoot(siteDir) {
|
|
31
|
+
return join(findWorkspaceRoot(siteDir), "deploy", "sites");
|
|
32
|
+
}
|
|
26
33
|
export function resolveDataRepoDir(workspaceRoot = findWorkspaceRoot()) {
|
|
27
34
|
const dataDir = join(workspaceRoot, "data");
|
|
28
35
|
if (!existsSync(dataDir)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/commands/app/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;IACzD,IAAI,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,SAAS,CAAC;QACT,IACC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACzC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAChC,CAAC;YACF,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACd,6FAA6F,CAC7F,CAAC;QACH,CAAC;QACD,OAAO,GAAG,MAAM,CAAC;IAClB,CAAC;AACF,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAc,EAAE,aAAa,GAAG,iBAAiB,EAAE;IACvF,MAAM,
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/commands/app/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;IACzD,IAAI,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,SAAS,CAAC;QACT,IACC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACzC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAChC,CAAC;YACF,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACd,6FAA6F,CAC7F,CAAC;QACH,CAAC;QACD,OAAO,GAAG,MAAM,CAAC;IAClB,CAAC;AACF,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAc,EAAE,aAAa,GAAG,iBAAiB,EAAE;IACvF,MAAM,UAAU,GAAG;QAClB,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC;QAC7D,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC;KAC/D,CAAC;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,6CAA6C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACrD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,aAAa,GAAG,iBAAiB,EAAE;IACrE,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,OAAO,GAAG,kBAAkB,EAAE;IACnF,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
import type { Logger } from "@caporal/core";
|
|
2
2
|
export declare const DEFAULT_POS_BRANCH = "laf-test";
|
|
3
|
+
export declare const POS_REMOTE_DEPLOY_COMMAND = "sudo rm -rf app.last && mv app app.last && unzip app.zip && cd app && docker compose up -d";
|
|
3
4
|
export type DeployPosAppOptions = {
|
|
4
5
|
target: string;
|
|
5
6
|
branch: string;
|
|
6
7
|
env?: string;
|
|
7
8
|
};
|
|
9
|
+
export declare function resolvePosDeployPaths(siteDir: string): {
|
|
10
|
+
sitesRoot: string;
|
|
11
|
+
dockerfile: string;
|
|
12
|
+
keysBase: string;
|
|
13
|
+
siteEnvHelper: string;
|
|
14
|
+
};
|
|
8
15
|
export declare function deployPosApp(opts: DeployPosAppOptions, logger: Logger): Promise<void>;
|
|
9
16
|
//# sourceMappingURL=pos.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pos.d.ts","sourceRoot":"","sources":["../../../src/commands/app/pos.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"pos.d.ts","sourceRoot":"","sources":["../../../src/commands/app/pos.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAW5C,eAAO,MAAM,kBAAkB,aAAa,CAAC;AAC7C,eAAO,MAAM,yBAAyB,+FACuD,CAAC;AAE9F,MAAM,MAAM,mBAAmB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACtB,CASA;AAoBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+F3F"}
|
package/dist/commands/app/pos.js
CHANGED
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
import { appendFileSync, existsSync, rmSync, writeFileSync } from "node:fs";
|
|
2
|
-
import {
|
|
3
|
-
import { findWorkspaceRoot, resolveDeploySiteDir } from "./paths";
|
|
2
|
+
import { join, relative } from "node:path";
|
|
3
|
+
import { findWorkspaceRoot, resolveDeploySiteDir, resolveDeploySitesRoot } from "./paths";
|
|
4
4
|
import { ensureAppEnv } from "./env-check";
|
|
5
5
|
import { decryptTrailzEnvBase } from "./env-decrypt";
|
|
6
|
-
import { loadSiteEnvContext, renderNginxTemplatesIfPresent } from "./site-env";
|
|
6
|
+
import { loadSiteEnvContext, renderNginxTemplatesIfPresent, resolveSiteEnvHelper, } from "./site-env";
|
|
7
7
|
import { runCommand } from "./shell";
|
|
8
8
|
export const DEFAULT_POS_BRANCH = "laf-test";
|
|
9
|
+
export const POS_REMOTE_DEPLOY_COMMAND = "sudo rm -rf app.last && mv app app.last && unzip app.zip && cd app && docker compose up -d";
|
|
10
|
+
export function resolvePosDeployPaths(siteDir) {
|
|
11
|
+
const workspaceRoot = findWorkspaceRoot(siteDir);
|
|
12
|
+
const sitesRoot = resolveDeploySitesRoot(siteDir);
|
|
13
|
+
return {
|
|
14
|
+
sitesRoot,
|
|
15
|
+
dockerfile: relative(sitesRoot, join(siteDir, "Dockerfile")),
|
|
16
|
+
keysBase: join(workspaceRoot, ".trailz", "keys", "keys"),
|
|
17
|
+
siteEnvHelper: resolveSiteEnvHelper(siteDir),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
9
20
|
function removeIfExists(path) {
|
|
10
21
|
if (existsSync(path)) {
|
|
11
22
|
rmSync(path, { recursive: true, force: true });
|
|
@@ -24,6 +35,7 @@ export async function deployPosApp(opts, logger) {
|
|
|
24
35
|
const workspaceRoot = findWorkspaceRoot();
|
|
25
36
|
const siteDir = resolveDeploySiteDir(opts.target, workspaceRoot);
|
|
26
37
|
const site = loadSiteEnvContext(siteDir, logger);
|
|
38
|
+
const paths = resolvePosDeployPaths(siteDir);
|
|
27
39
|
const envName = opts.env ?? site.bltEnvName;
|
|
28
40
|
const envPlain = join(siteDir, ".env");
|
|
29
41
|
const appZip = join(siteDir, "app.zip");
|
|
@@ -36,13 +48,11 @@ export async function deployPosApp(opts, logger) {
|
|
|
36
48
|
ensureAppEnv({ envName, cwd: siteDir, logger });
|
|
37
49
|
logger.info(`Deploying POS branch "${opts.branch}" with env "${envName}" to "${site.target}"`);
|
|
38
50
|
logger.info(`Site directory: ${siteDir}`);
|
|
39
|
-
runCommand("bash", ["-lc", `smash -n
|
|
51
|
+
runCommand("bash", ["-lc", `smash -n ${JSON.stringify(paths.keysBase)} | grep GITHUB_TOKEN > .env`], logger, { cwd: siteDir });
|
|
40
52
|
runCommand("bash", ["-lc", `printf '\\nTZ=America/New_York\\n' >> .env`], logger, {
|
|
41
53
|
cwd: siteDir,
|
|
42
54
|
});
|
|
43
|
-
|
|
44
|
-
const siteFolder = basename(siteDir);
|
|
45
|
-
runCommand("docker", ["build", "-f", `${siteFolder}/Dockerfile`, "-t", "blt-core-pos", "."], logger, { cwd: sitesRoot });
|
|
55
|
+
runCommand("docker", ["build", "-f", paths.dockerfile, "-t", "blt-core-pos", "."], logger, { cwd: paths.sitesRoot });
|
|
46
56
|
logger.info("Merging expanded site env into build .env");
|
|
47
57
|
appendExpandedSiteEnv(envPlain, site.siteEnvBase, siteDir);
|
|
48
58
|
runCommand("docker", [
|
|
@@ -61,7 +71,7 @@ export async function deployPosApp(opts, logger) {
|
|
|
61
71
|
renderNginxTemplatesIfPresent(site, logger);
|
|
62
72
|
runCommand("bash", [
|
|
63
73
|
"-lc",
|
|
64
|
-
`source
|
|
74
|
+
`source ${JSON.stringify(paths.siteEnvHelper)} && blt_prepare_site_certs "$(pwd)"`,
|
|
65
75
|
], logger, { cwd: siteDir });
|
|
66
76
|
removeIfExists(appZip);
|
|
67
77
|
runCommand("zip", ["-9r", "app.zip", "app/"], logger, { cwd: siteDir });
|
|
@@ -69,10 +79,7 @@ export async function deployPosApp(opts, logger) {
|
|
|
69
79
|
writeExpandedSiteEnv(envPlain, site.siteEnvBase, siteDir);
|
|
70
80
|
runCommand("scp", [envPlain, `${site.target}:`], logger, { cwd: siteDir });
|
|
71
81
|
runCommand("scp", [appZip, `${site.target}:`], logger, { cwd: siteDir });
|
|
72
|
-
runCommand("ssh", [
|
|
73
|
-
site.target,
|
|
74
|
-
"rm -rf app.last && mv app app.last && unzip app.zip && cd app && docker compose restart",
|
|
75
|
-
], logger, { cwd: siteDir });
|
|
82
|
+
runCommand("ssh", [site.target, POS_REMOTE_DEPLOY_COMMAND], logger, { cwd: siteDir });
|
|
76
83
|
logger.info("POS deploy complete.");
|
|
77
84
|
}
|
|
78
85
|
//# sourceMappingURL=pos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pos.js","sourceRoot":"","sources":["../../../src/commands/app/pos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pos.js","sourceRoot":"","sources":["../../../src/commands/app/pos.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export type SiteEnvContext = {
|
|
|
10
10
|
agentPort: string;
|
|
11
11
|
siteEnvBase: string;
|
|
12
12
|
};
|
|
13
|
+
export declare function resolveSiteEnvHelper(siteDir: string): string;
|
|
13
14
|
export declare function loadSiteEnvContext(siteDir: string, logger: Logger): SiteEnvContext;
|
|
14
15
|
export declare function renderNginxTemplatesIfPresent(site: SiteEnvContext, logger: Logger): void;
|
|
15
16
|
//# sourceMappingURL=site-env.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-env.d.ts","sourceRoot":"","sources":["../../../src/commands/app/site-env.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"site-env.d.ts","sourceRoot":"","sources":["../../../src/commands/app/site-env.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC;AAYF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAmDlF;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAsBxF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { existsSync, readdirSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
+
import { findWorkspaceRoot } from "./paths";
|
|
3
4
|
import { readCommand, runCommand } from "./shell";
|
|
4
5
|
function parseSiteEnvOutput(output) {
|
|
5
6
|
const values = {};
|
|
@@ -11,8 +12,11 @@ function parseSiteEnvOutput(output) {
|
|
|
11
12
|
}
|
|
12
13
|
return values;
|
|
13
14
|
}
|
|
15
|
+
export function resolveSiteEnvHelper(siteDir) {
|
|
16
|
+
return join(findWorkspaceRoot(siteDir), "deploy", "sites", "_lib", "site-env.sh");
|
|
17
|
+
}
|
|
14
18
|
export function loadSiteEnvContext(siteDir, logger) {
|
|
15
|
-
const libPath =
|
|
19
|
+
const libPath = resolveSiteEnvHelper(siteDir);
|
|
16
20
|
if (!existsSync(libPath)) {
|
|
17
21
|
throw new Error(`Site env helper not found: ${libPath}`);
|
|
18
22
|
}
|
|
@@ -53,7 +57,7 @@ export function renderNginxTemplatesIfPresent(site, logger) {
|
|
|
53
57
|
if (!hasTemplates) {
|
|
54
58
|
return;
|
|
55
59
|
}
|
|
56
|
-
const libPath =
|
|
60
|
+
const libPath = resolveSiteEnvHelper(site.siteDir);
|
|
57
61
|
logger.info(`Rendering nginx templates in ${templatesDir}`);
|
|
58
62
|
runCommand("bash", [
|
|
59
63
|
"-lc",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-env.js","sourceRoot":"","sources":["../../../src/commands/app/site-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAclD,SAAS,kBAAkB,CAAC,MAAc;IACzC,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,IAAI,CAAC;YAAE,SAAS;QACtB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"site-env.js","sourceRoot":"","sources":["../../../src/commands/app/site-env.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codemarc/blt",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.8",
|
|
4
4
|
"description": "blt cli",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/blt",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"dev": "bunx --bun tsc --watch",
|
|
21
21
|
"start": "bun run src/blt.ts",
|
|
22
22
|
"prepublishOnly": "bun run build",
|
|
23
|
-
"test": "bun test src/lib/yaml-converter.test.ts src/commands/data/apply.test.ts src/commands/app/env-check.test.ts src/commands/env/get.test.ts src/commands/db/dump.test.ts src/commands/db/env-url.test.ts src/commands/db/patch.test.ts src/commands/db/supabase-schema.test.ts src/commands/notify/google-chat.test.ts src/commands/wai.registration.test.ts src/commands/wai/multi-agent.test.ts",
|
|
23
|
+
"test": "bun test src/lib/yaml-converter.test.ts src/commands/data/apply.test.ts src/commands/app/env-check.test.ts src/commands/app/paths.test.ts src/commands/app/pos.test.ts src/commands/app/site-env.test.ts src/commands/env/get.test.ts src/commands/db/dump.test.ts src/commands/db/env-url.test.ts src/commands/db/patch.test.ts src/commands/db/supabase-schema.test.ts src/commands/notify/google-chat.test.ts src/commands/wai.registration.test.ts src/commands/wai/multi-agent.test.ts",
|
|
24
24
|
"graphify": "bash .trailz/graphify/graph.sh",
|
|
25
25
|
"graphify:update": "bash .trailz/graphify/graph.sh update",
|
|
26
26
|
"graphify:init": "bash .trailz/graphify/graph.sh init",
|