@fireproof/core-cli 0.23.14 → 0.23.15-dev-windows-1
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/build-cmd.d.ts +1 -0
- package/build-cmd.js +41 -1
- package/build-cmd.js.map +1 -1
- package/build-cmd.test.js +35 -1
- package/build-cmd.test.js.map +1 -1
- package/dependabot-cmd.d.ts +16 -0
- package/dependabot-cmd.js +102 -0
- package/dependabot-cmd.js.map +1 -0
- package/main.js +6 -2
- package/main.js.map +1 -1
- package/package.json +10 -11
- package/run.js +44 -0
- package/test-container-cmd.d.ts +82 -0
- package/test-container-cmd.js +332 -0
- package/test-container-cmd.js.map +1 -0
- package/tsc-cmd.js +4 -8
- package/tsc-cmd.js.map +1 -1
- package/tsconfig.json +1 -1
- package/write-env.js +1 -1
- package/write-env.js.map +1 -1
- package/run.sh +0 -22
package/build-cmd.d.ts
CHANGED
|
@@ -31,6 +31,7 @@ export declare function patchPackageJson(packageJsonPath: string, version: Versi
|
|
|
31
31
|
patchedPackageJson: PackageJson;
|
|
32
32
|
originalPackageJson: PackageJson;
|
|
33
33
|
}>;
|
|
34
|
+
export declare function sanitizeNpmrc(srcNpmRc: string): string;
|
|
34
35
|
interface JsrConfig {
|
|
35
36
|
name: string;
|
|
36
37
|
version: string;
|
package/build-cmd.js
CHANGED
|
@@ -4,6 +4,7 @@ import path from "node:path";
|
|
|
4
4
|
import { findUp } from "find-up";
|
|
5
5
|
import { cd, $ } from "zx";
|
|
6
6
|
import { SemVer } from "semver";
|
|
7
|
+
import { exception2Result } from "@adviser/cement";
|
|
7
8
|
const reVersionAlphaStart = /^[a-z](\d+\.\d+\.\d+.*)$/;
|
|
8
9
|
const reScopedVersion = /^[^@]+@(.*)$/;
|
|
9
10
|
const reEndVersion = /.*\/([^/]+)$/;
|
|
@@ -111,6 +112,44 @@ async function updateTsconfig(srcTsConfig, dstTsConfig) {
|
|
|
111
112
|
console.log("tsconfig", tsconfig);
|
|
112
113
|
await fs.writeJSONSync(dstTsConfig, tsconfig, { spaces: 2 });
|
|
113
114
|
}
|
|
115
|
+
export function sanitizeNpmrc(srcNpmRc) {
|
|
116
|
+
return srcNpmRc
|
|
117
|
+
.split("\n")
|
|
118
|
+
.map((line) => line.trim())
|
|
119
|
+
.map((line) => {
|
|
120
|
+
const [lhsUnsplitted, rhs] = line.split(/=(.*)$/);
|
|
121
|
+
let lhs = lhsUnsplitted.trim();
|
|
122
|
+
let lhsArg = "";
|
|
123
|
+
if (/:[^0-9]+[^:]*$/.test(lhs)) {
|
|
124
|
+
const olhs = lhs;
|
|
125
|
+
lhs = lhs.replace(/:[^0-9]+[^:]*$/, "");
|
|
126
|
+
lhsArg = olhs.slice(lhs.length);
|
|
127
|
+
if (lhs.startsWith("//")) {
|
|
128
|
+
lhs = "http:" + lhs;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
const rLhsAsURI = exception2Result(() => new URL(lhs));
|
|
132
|
+
if (rLhsAsURI.isOk()) {
|
|
133
|
+
const url = rLhsAsURI.Ok();
|
|
134
|
+
const urlStr = url.toString();
|
|
135
|
+
const rLhs = urlStr.replace(/^[^:]+:/, "").replace(/\/*$/, "/");
|
|
136
|
+
return `${rLhs}${lhsArg}=${rhs}`;
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
lhs = lhs + lhsArg;
|
|
140
|
+
}
|
|
141
|
+
const rRhsAsURI = exception2Result(() => new URL(rhs));
|
|
142
|
+
if (rRhsAsURI.isOk()) {
|
|
143
|
+
const url = rRhsAsURI.Ok();
|
|
144
|
+
const rRhs = url.toString().replace(/\/*$/, "/");
|
|
145
|
+
return `${lhs}=${rRhs}`;
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
return line;
|
|
149
|
+
}
|
|
150
|
+
})
|
|
151
|
+
.join("\n");
|
|
152
|
+
}
|
|
114
153
|
function toDenoExports(exports) {
|
|
115
154
|
return Object.entries(exports ?? {}).reduce((acc, [k, v]) => {
|
|
116
155
|
if (typeof v === "string") {
|
|
@@ -403,7 +442,8 @@ export function buildCmd(sthis) {
|
|
|
403
442
|
}
|
|
404
443
|
if (fs.existsSync(args.npmrc)) {
|
|
405
444
|
console.log(`Using npmrc: ${args.npmrc}, destination: ${args.dstDir}`);
|
|
406
|
-
await fs.
|
|
445
|
+
const niceNpmrc = sanitizeNpmrc(await fs.readFile(args.npmrc, "utf-8"));
|
|
446
|
+
await fs.writeFile(".npmrc", niceNpmrc);
|
|
407
447
|
}
|
|
408
448
|
const tags = args.pubTags;
|
|
409
449
|
try {
|
package/build-cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,mBAAmB,GAAG,0BAA0B,CAAC;AAEvD,MAAM,eAAe,GAAG,cAAc,CAAC;AACvC,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,SAAS,aAAa,CAAC,OAAO,GAAG,wBAAwB,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG;IAC3E,IAAI,QAAQ,GAAG,OAAO,CAAC;IACvB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEhC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAE,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IACrG,IAAI,CAAC;QACH,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC9B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAUD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,cAAuB,EACvB,EAAE,GAAG,EAAE,IAAI,KAAoB;IAC7B,GAAG,EAAE;QACH,UAAU,EAAE,EAAE,CAAC,UAAU;QAEzB,QAAQ,EAAE,EAAE,CAAC,QAAe;KAC7B;IACD,IAAI,EAAE,OAAO,CAAC,GAA6B;CAC5C;IAED,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,cAAc,IAAI,GAAG,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;QACnE,IAAI,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAClC,OAAO,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,CAAA,4BAA4B,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpE,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAA,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,aAAa,CAAC,0BAA0B,OAAO,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,OAAO,OAAO;IAClB,QAAQ,CAAS;IACjB,cAAc,CAAS;IAEvB,YAAY,OAAe,EAAE,aAAqB;QAChD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClD,CAAC;CACF;AAED,SAAS,SAAS,CAAC,GAA2B,EAAE,OAAe;IAC7D,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,eAAuB,EACvB,OAAgB,EAChB,WAAoB,EACpB,OAEI,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;IAK7B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,kBAAkB,CAAC,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,WAAW,GAAG,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,kBAAkB,CAAC,IAAI,GAAG,IAAI,WAAW,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACzE,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC7C,OAAO,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7C,kBAAkB,CAAC,YAAY,GAAG,SAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACtG,kBAAkB,CAAC,eAAe,GAAG,SAAS,CAAC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAE5G,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,WAAmB,EAAE,WAAmB;IACpE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,eAAe,GAAG;QACzB,GAAG,QAAQ,CAAC,eAAe;QAC3B,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEjE,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClC,MAAM,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;AAM/D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB;IAK5C,OAAO,QAAQ;SACZ,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,GAAG,CAAC;YACjB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,OAAO,GAAG,GAAG,CAAC;YACtB,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAChE,OAAO,GAAG,IAAI,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;QACrB,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACjD,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,OAAwD;IAC7E,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;QACrF,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjD,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;oBACf,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;wBAChC,OAAO,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACb,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,GAAG,EAAE,YAAY,EAA4B,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAA4B,EAAE,OAAe;IAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,OAAO,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAC7C,OAAO,GAAG,CAAC;QACb,CAAC;QACD,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA4B,CAC7B,CAAC;AACJ,CAAC;AAoBD,SAAS,SAAS,CAAC,CAAc;IAC/B,OAAO,CACL,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,MAAM,CAAC,CAAC,CAC/H,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EAAyE,EACzE,OAAe;IAEf,IAAI,SAAS,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAc;QACzB,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI;QAChC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO;QACtC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO;QACtC,cAAc,EAAE,MAAM;QACtB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;QAC5B,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,IAAI,EAAE,CAAC,aAAa,CAAC;gBACrB,OAAO,EAAE,CAAC,mBAAmB,CAAC;aAC/B;SACF;QACD,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC;QACtD,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC;QACjE,OAAO,EAAE;YACP,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC;SACzD;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAGD,MAAM,UAAU,QAAQ,CAAC,KAAgB;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,mBAAmB;QAChC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,cAAc,EAAE,IAAI,CAAC;gBACnB,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,4FAA4F;aAC1G,CAAC;YACF,SAAS,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,kBAAkB;gBACtC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,0EAA0E;aACxF,CAAC;YACF,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,mFAAmF;aACjG,CAAC;YACF,MAAM,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;gBACxB,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,MAAM,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ;gBAC5B,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;aACb,CAAC;YACF,aAAa,EAAE,WAAW,CAAC;gBACzB,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,kBAAkB,CAAC;gBACvF,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;aACX,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,2DAA2D;aACzE,CAAC;YACF,OAAO,EAAE,IAAI,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,mDAAmD;aACjE,CAAC;YACF,MAAM,EAAE,IAAI,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,oCAAoC;aAClD,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;aACvB,CAAC;YACF,KAAK,EAAE,MAAM,CAAC;gBACZ,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,8EAA8E;aAC5F,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;gBAChC,WAAW,EAAE,uEAAuE;aACrF,CAAC;YACF,UAAU,EAAE,MAAM,CAAC;gBACjB,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW;gBAC/B,WAAW,EAAE,wEAAwE;aACtF,CAAC;YACF,QAAQ,EAAE,MAAM,CAAC;gBACf,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,oFAAoF;aAClG,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;gBACzB,WAAW,EAAE,iCAAiC;aAC/C,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,kCAAkC;aAChD,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;gBACpB,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,gCAAgC;aAC9C,CAAC;YACF,OAAO,EAAE,WAAW,CAAC;gBACnB,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnB,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,0BAA0B,EAAE,IAAI;gBAChC,WAAW,EAAE,iEAAiE;aAC/E,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAC5E,CAAC;YACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE9D,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;gBAC/D,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpD,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACvD,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;gBAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,OAAO;YACT,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAC5E,CAAC;YAID,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC;YAED,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;gBAClC,MAAM,EAAE,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;oBACpC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChC,OAAO,KAAK,CAAC;oBACf,CAAC;oBAID,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAC1D,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAElC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;YACvG,CAAC;YACD,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;YACjB,EAAE,CAAC,SAAS,CAAC,CAAC;YAEd,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACtF,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAGlF,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;gBACrB,MAAM,EAAE,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;oBACpC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,CAAC,CAAA,gBAAgB,CAAC;YAC1B,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;gBAC5D,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBACzE,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAChD,MAAM,CAAC,CAAA,wCAAwC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAClF,CAAC;YACH,CAAC;YAGD,EAAE,CAAC,QAAQ,CAAC,CAAC;YACb,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;oBACxD,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACrB,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;oBACzF,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;oBACzF,MAAM,CAAC,CAAA,oBAAoB,IAAI,CAAC,WAAW,UAAU,CAAC;gBACxD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnB,IAAI,CAAC,QAAQ,GAAG,6BAA6B,CAAC;gBAChD,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC;gBAC9E,CAAC;gBACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,KAAK,kBAAkB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;oBACvE,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;oBACxE,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAI1C,CAAC;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;wBAC9E,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnB,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBAED,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1D,MAAM,CAAC,CAAA,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;YAErG,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/build-cmd.test.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Version, buildJsrConf, getVersion, patchPackageJson } from "./build-cmd.js";
|
|
1
|
+
import { Version, buildJsrConf, getVersion, patchPackageJson, sanitizeNpmrc } from "./build-cmd.js";
|
|
2
2
|
import { expect, it } from "vitest";
|
|
3
3
|
const mock = {
|
|
4
4
|
readJSON: async () => {
|
|
@@ -153,4 +153,38 @@ it("getVersion ref with scope and no v", async () => {
|
|
|
153
153
|
it("getVersion ref without", async () => {
|
|
154
154
|
expect(await getVersion(undefined, { xenv: { GITHUB_REF: "a/ref/0.0.9-smoke" } })).toContain("0.0.9-smoke");
|
|
155
155
|
});
|
|
156
|
+
it("sanitizeNpmrc with // lhs", async () => {
|
|
157
|
+
const npmrc = [
|
|
158
|
+
"; .npmrc",
|
|
159
|
+
"enable-pre-post-scripts=true",
|
|
160
|
+
"registry=http://localhost:4873",
|
|
161
|
+
"@fireproof:registry=http://localhost:4873",
|
|
162
|
+
'//localhost:4873:_authToken="Zjk5MjVhZTg4ZTlkNzQ3MW"',
|
|
163
|
+
].join("\n");
|
|
164
|
+
const niceNpmrc = sanitizeNpmrc(npmrc);
|
|
165
|
+
expect(niceNpmrc).toBe([
|
|
166
|
+
"; .npmrc",
|
|
167
|
+
"enable-pre-post-scripts=true",
|
|
168
|
+
"registry=http://localhost:4873/",
|
|
169
|
+
"@fireproof:registry=http://localhost:4873/",
|
|
170
|
+
'//localhost:4873/:_authToken="Zjk5MjVhZTg4ZTlkNzQ3MW"',
|
|
171
|
+
].join("\n"));
|
|
172
|
+
});
|
|
173
|
+
it("sanitizeNpmrc with http lhs", async () => {
|
|
174
|
+
const npmrc = [
|
|
175
|
+
"; .npmrc",
|
|
176
|
+
"enable-pre-post-scripts=true",
|
|
177
|
+
"registry=http://localhost:4873",
|
|
178
|
+
"@fireproof:registry=http://localhost:4873",
|
|
179
|
+
'http://localhost:4873/meno:_authToken="Zjk5MjVhZTg4ZTlkNzQ3MW"',
|
|
180
|
+
].join("\n");
|
|
181
|
+
const niceNpmrc = sanitizeNpmrc(npmrc);
|
|
182
|
+
expect(niceNpmrc).toBe([
|
|
183
|
+
"; .npmrc",
|
|
184
|
+
"enable-pre-post-scripts=true",
|
|
185
|
+
"registry=http://localhost:4873/",
|
|
186
|
+
"@fireproof:registry=http://localhost:4873/",
|
|
187
|
+
'//localhost:4873/meno/:_authToken="Zjk5MjVhZTg4ZTlkNzQ3MW"',
|
|
188
|
+
].join("\n"));
|
|
189
|
+
});
|
|
156
190
|
//# sourceMappingURL=build-cmd.test.js.map
|
package/build-cmd.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-cmd.test.js","sourceRoot":"","sources":["../jsr/build-cmd.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"build-cmd.test.js","sourceRoot":"","sources":["../jsr/build-cmd.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { SuperThis } from "@fireproof/core-types-base";
|
|
2
|
+
export declare function dependabotCmd(sthis: SuperThis): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
|
+
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
|
+
rebase: boolean;
|
|
5
|
+
apply: boolean;
|
|
6
|
+
prNumber: string;
|
|
7
|
+
list: boolean;
|
|
8
|
+
}>>;
|
|
9
|
+
} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
10
|
+
rebase: boolean;
|
|
11
|
+
apply: boolean;
|
|
12
|
+
prNumber: string;
|
|
13
|
+
list: boolean;
|
|
14
|
+
}, Promise<void>> & {
|
|
15
|
+
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
16
|
+
} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { command, flag, option, string } from "cmd-ts";
|
|
2
|
+
import { $ } from "zx";
|
|
3
|
+
async function fetchDependabotPRs() {
|
|
4
|
+
try {
|
|
5
|
+
const result = await $ `gh pr list --author app/dependabot --json number,title,author,url,headRefName --limit 100`;
|
|
6
|
+
const prs = JSON.parse(result.stdout);
|
|
7
|
+
return prs;
|
|
8
|
+
}
|
|
9
|
+
catch (error) {
|
|
10
|
+
console.error("Failed to fetch Dependabot PRs:", error);
|
|
11
|
+
throw error;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
async function applyPR(pr, rebase) {
|
|
15
|
+
try {
|
|
16
|
+
console.log(`\nProcessing PR #${pr.number}: ${pr.title}`);
|
|
17
|
+
if (rebase) {
|
|
18
|
+
await $ `gh pr merge ${pr.number} --auto --rebase`;
|
|
19
|
+
console.log(`✓ Rebased and merged PR #${pr.number}`);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
await $ `gh pr checkout ${pr.number}`;
|
|
23
|
+
console.log(`✓ Checked out PR #${pr.number}`);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
console.error(`✗ Failed to process PR #${pr.number}:`, error);
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
export function dependabotCmd(sthis) {
|
|
32
|
+
const cmd = command({
|
|
33
|
+
name: "dependabot",
|
|
34
|
+
description: "Fetch and apply Dependabot PRs",
|
|
35
|
+
version: "1.0.0",
|
|
36
|
+
args: {
|
|
37
|
+
rebase: flag({
|
|
38
|
+
long: "rebase",
|
|
39
|
+
short: "r",
|
|
40
|
+
description: "Automatically rebase and merge the PRs",
|
|
41
|
+
}),
|
|
42
|
+
apply: flag({
|
|
43
|
+
long: "apply",
|
|
44
|
+
short: "a",
|
|
45
|
+
description: "Apply (checkout) all Dependabot PRs",
|
|
46
|
+
}),
|
|
47
|
+
prNumber: option({
|
|
48
|
+
long: "pr",
|
|
49
|
+
short: "p",
|
|
50
|
+
type: string,
|
|
51
|
+
defaultValue: () => "",
|
|
52
|
+
description: "Apply a specific PR number",
|
|
53
|
+
}),
|
|
54
|
+
list: flag({
|
|
55
|
+
long: "list",
|
|
56
|
+
short: "l",
|
|
57
|
+
description: "List all Dependabot PRs (default action)",
|
|
58
|
+
}),
|
|
59
|
+
},
|
|
60
|
+
handler: async (args) => {
|
|
61
|
+
console.log("Fetching Dependabot PRs...");
|
|
62
|
+
const prs = await fetchDependabotPRs();
|
|
63
|
+
if (prs.length === 0) {
|
|
64
|
+
console.log("No Dependabot PRs found.");
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (args.list || (!args.apply && !args.rebase && !args.prNumber)) {
|
|
68
|
+
console.log(`\nFound ${prs.length} Dependabot PR(s):\n`);
|
|
69
|
+
prs.forEach((pr) => {
|
|
70
|
+
console.log(`#${pr.number}: ${pr.title}`);
|
|
71
|
+
console.log(` URL: ${pr.url}`);
|
|
72
|
+
console.log(` Branch: ${pr.headRefName}\n`);
|
|
73
|
+
});
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
if (args.prNumber) {
|
|
77
|
+
const prNum = parseInt(args.prNumber, 10);
|
|
78
|
+
const pr = prs.find((p) => p.number === prNum);
|
|
79
|
+
if (!pr) {
|
|
80
|
+
console.error(`PR #${prNum} not found or is not a Dependabot PR.`);
|
|
81
|
+
process.exit(1);
|
|
82
|
+
}
|
|
83
|
+
await applyPR(pr, args.rebase);
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
if (args.apply || args.rebase) {
|
|
87
|
+
console.log(`\nProcessing ${prs.length} Dependabot PR(s)...\n`);
|
|
88
|
+
for (const pr of prs) {
|
|
89
|
+
try {
|
|
90
|
+
await applyPR(pr, args.rebase);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
console.error(`Skipping PR #${pr.number} due to error.`);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
console.log("\nDone processing Dependabot PRs.");
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
return cmd;
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=dependabot-cmd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dependabot-cmd.js","sourceRoot":"","sources":["../jsr/dependabot-cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAWvB,KAAK,UAAU,kBAAkB;IAC/B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,CAAA,2FAA2F,CAAC;QAClH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAS,CAAC;QAC9C,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;QACxD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,EAAM,EAAE,MAAe;IAC5C,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAE1D,IAAI,MAAM,EAAE,CAAC;YAEX,MAAM,CAAC,CAAA,eAAe,EAAE,CAAC,MAAM,kBAAkB,CAAC;YAClD,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YAEN,MAAM,CAAC,CAAA,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,MAAM,GAAG,EAAE,KAAK,CAAC,CAAC;QAC9D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,KAAgB;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,gCAAgC;QAC7C,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,MAAM,EAAE,IAAI,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,wCAAwC;aACtD,CAAC;YACF,KAAK,EAAE,IAAI,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,qCAAqC;aACnD,CAAC;YACF,QAAQ,EAAE,MAAM,CAAC;gBACf,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,4BAA4B;aAC1C,CAAC;YACF,IAAI,EAAE,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,0CAA0C;aACxD,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,MAAM,GAAG,GAAG,MAAM,kBAAkB,EAAE,CAAC;YAEvC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;gBACxC,OAAO;YACT,CAAC;YAGD,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjE,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,MAAM,sBAAsB,CAAC,CAAC;gBACzD,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACjB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAGD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC1C,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC;gBAC/C,IAAI,CAAC,EAAE,EAAE,CAAC;oBACR,OAAO,CAAC,KAAK,CAAC,OAAO,KAAK,uCAAuC,CAAC,CAAC;oBACnE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBACD,MAAM,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/B,OAAO;YACT,CAAC;YAGD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;gBAChE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,IAAI,CAAC;wBACH,MAAM,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;oBACjC,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,MAAM,gBAAgB,CAAC,CAAC;oBAC3D,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/main.js
CHANGED
|
@@ -7,6 +7,8 @@ import { handleTsc, tscCmd } from "./tsc-cmd.js";
|
|
|
7
7
|
import { writeEnvCmd } from "./write-env.js";
|
|
8
8
|
import { keyCmd } from "./cloud-token-key-cmd.js";
|
|
9
9
|
import { preSignedUrlCmd } from "./pre-signed-url.js";
|
|
10
|
+
import { dependabotCmd } from "./dependabot-cmd.js";
|
|
11
|
+
import { testContainerCmd } from "./test-container-cmd.js";
|
|
10
12
|
(async () => {
|
|
11
13
|
dotenv.config(process.env.FP_ENV ?? ".env");
|
|
12
14
|
const sthis = ensureSuperThis();
|
|
@@ -14,8 +16,8 @@ import { preSignedUrlCmd } from "./pre-signed-url.js";
|
|
|
14
16
|
return handleTsc(process.argv.slice(3), sthis);
|
|
15
17
|
}
|
|
16
18
|
const cmd = subcommands({
|
|
17
|
-
name: "
|
|
18
|
-
description: "fireproof
|
|
19
|
+
name: "core-cli",
|
|
20
|
+
description: "fireproof/core-cli",
|
|
19
21
|
version: "1.0.0",
|
|
20
22
|
cmds: {
|
|
21
23
|
tsc: tscCmd(sthis),
|
|
@@ -25,6 +27,8 @@ import { preSignedUrlCmd } from "./pre-signed-url.js";
|
|
|
25
27
|
build: buildCmd(sthis),
|
|
26
28
|
setScripts: setScriptsCmd(sthis),
|
|
27
29
|
setDependencies: setDependenciesCmd(sthis),
|
|
30
|
+
dependabot: dependabotCmd(sthis),
|
|
31
|
+
testContainer: testContainerCmd(sthis),
|
|
28
32
|
},
|
|
29
33
|
});
|
|
30
34
|
await run(cmd, process.argv.slice(2));
|
package/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../jsr/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../jsr/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,CAAC,KAAK,IAAI,EAAE;IACV,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAGhC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC;QACtB,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,eAAe,CAAC,KAAK,CAAC;YACjC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;YAChC,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC;YAC1C,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;YAChC,aAAa,EAAE,gBAAgB,CAAC,KAAK,CAAC;SACvC;KACF,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAExC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fireproof/core-cli",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.15-dev-windows-1",
|
|
4
4
|
"description": "Live ledger for the web.",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"
|
|
7
|
-
"main": "./index.js",
|
|
8
|
-
"bin": "./run.sh",
|
|
6
|
+
"bin": "./run.js",
|
|
9
7
|
"keywords": [
|
|
10
8
|
"ledger",
|
|
11
9
|
"JSON",
|
|
@@ -33,28 +31,29 @@
|
|
|
33
31
|
"url": "https://github.com/fireproof-storage/fireproof/issues"
|
|
34
32
|
},
|
|
35
33
|
"dependencies": {
|
|
36
|
-
"@
|
|
37
|
-
"@
|
|
38
|
-
"@fireproof/core-
|
|
39
|
-
"@fireproof/
|
|
34
|
+
"@typescript/native-preview": "7.0.0-dev.20251009.1",
|
|
35
|
+
"@adviser/cement": "^0.4.43",
|
|
36
|
+
"@fireproof/core-runtime": "0.23.15-dev-windows-1",
|
|
37
|
+
"@fireproof/core-types-base": "0.23.15-dev-windows-1",
|
|
38
|
+
"@fireproof/vendor": "0.23.15-dev-windows-1",
|
|
40
39
|
"aws4fetch": "^1.0.20",
|
|
41
40
|
"cmd-ts": "^0.14.2",
|
|
42
41
|
"find-up": "^8.0.0",
|
|
43
42
|
"fs-extra": "^11.3.1",
|
|
44
43
|
"jose": "^6.1.0",
|
|
45
44
|
"multiformats": "^13.4.0",
|
|
46
|
-
"semver": "^7.7.
|
|
45
|
+
"semver": "^7.7.3",
|
|
47
46
|
"zx": "^8.8.4"
|
|
48
47
|
},
|
|
49
48
|
"devDependencies": {
|
|
50
|
-
"@fireproof/core-cli": "0.23.
|
|
49
|
+
"@fireproof/core-cli": "0.23.15-dev-windows-1",
|
|
51
50
|
"@types/fs-extra": "^11.0.4",
|
|
52
51
|
"@types/semver": "^7.7.1",
|
|
53
52
|
"tsx": "^4.20.4",
|
|
54
53
|
"vitest": "^3.2.4"
|
|
55
54
|
},
|
|
56
55
|
"scripts": {
|
|
57
|
-
"build": "./run.
|
|
56
|
+
"build": "node ./run.js tsc",
|
|
58
57
|
"test": "vitest --run"
|
|
59
58
|
}
|
|
60
59
|
}
|
package/run.js
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
import { spawn } from "child_process";
|
|
4
|
+
import * as path from "path";
|
|
5
|
+
import * as fs from "fs";
|
|
6
|
+
import * as process from "process";
|
|
7
|
+
|
|
8
|
+
function exec(cmd, args) {
|
|
9
|
+
// process.env.PATH = `${[
|
|
10
|
+
// `${runDirectory}`,
|
|
11
|
+
// path.join(runDirectory, "./node_modules/.bin")
|
|
12
|
+
// ].join(":")}:${process.env.PATH}`
|
|
13
|
+
const tsc = spawn(cmd, args, {
|
|
14
|
+
stdio: "inherit", // inherits stdin, stdout, and stderr
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
tsc.on("close", (code) => {
|
|
18
|
+
process.exit(code);
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
tsc.on("error", (error) => {
|
|
22
|
+
// eslint-disable-next-line no-console, no-undef
|
|
23
|
+
console.error(`Failed to start ${cmd}: ${error.message}`);
|
|
24
|
+
process.exit(1);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
// const idxTsc = process.argv.findIndex(i => i === 'tsc')
|
|
29
|
+
const idxRunIdx = process.argv.findIndex((i) => i.endsWith("run.js"));
|
|
30
|
+
const runDirectory = path.dirname(process.argv[idxRunIdx]);
|
|
31
|
+
const mainJs = path.join(runDirectory, "main.js");
|
|
32
|
+
//const mainWithDistJs = path.join(runDirectory, "dist", "npm", "main.js");
|
|
33
|
+
//const mainJs = fs.existsSync(mainPublishedJs) ? mainPublishedJs : fs.existsSync(mainWithDistJs) ? mainWithDistJs : undefined;
|
|
34
|
+
if (fs.existsSync(mainJs)) {
|
|
35
|
+
// make windows happy file://
|
|
36
|
+
const addFile = `file://${mainJs}`;
|
|
37
|
+
// eslint-disable-next-line no-console, no-undef
|
|
38
|
+
import(addFile).catch((e) => console.error(e));
|
|
39
|
+
} else {
|
|
40
|
+
const restArgv = process.argv.slice(idxRunIdx + 1) ?? [];
|
|
41
|
+
// console.log(">>>>>", restArgv)
|
|
42
|
+
exec("tsx", [path.join(runDirectory, "main.ts"), ...restArgv], runDirectory);
|
|
43
|
+
}
|
|
44
|
+
// }
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { SuperThis } from "@fireproof/core-types-base";
|
|
2
|
+
export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
|
+
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
|
+
command: "publish";
|
|
5
|
+
args: {
|
|
6
|
+
repoUrl: string;
|
|
7
|
+
token: string;
|
|
8
|
+
actor: string;
|
|
9
|
+
tag: string;
|
|
10
|
+
dockerfile: string;
|
|
11
|
+
context: string;
|
|
12
|
+
};
|
|
13
|
+
} | {
|
|
14
|
+
command: "build";
|
|
15
|
+
args: {};
|
|
16
|
+
} | {
|
|
17
|
+
command: "template";
|
|
18
|
+
args: {
|
|
19
|
+
baseImage: string;
|
|
20
|
+
tag: string;
|
|
21
|
+
tagSuffix: string;
|
|
22
|
+
packageName: string;
|
|
23
|
+
output: string;
|
|
24
|
+
publish: boolean;
|
|
25
|
+
repoUrl: string;
|
|
26
|
+
token: string;
|
|
27
|
+
actor: string;
|
|
28
|
+
imageName: string;
|
|
29
|
+
imageTag: string;
|
|
30
|
+
context: string;
|
|
31
|
+
};
|
|
32
|
+
}>>;
|
|
33
|
+
} & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
34
|
+
command: "publish";
|
|
35
|
+
args: {
|
|
36
|
+
repoUrl: string;
|
|
37
|
+
token: string;
|
|
38
|
+
actor: string;
|
|
39
|
+
tag: string;
|
|
40
|
+
dockerfile: string;
|
|
41
|
+
context: string;
|
|
42
|
+
};
|
|
43
|
+
} | {
|
|
44
|
+
command: "build";
|
|
45
|
+
args: {};
|
|
46
|
+
} | {
|
|
47
|
+
command: "template";
|
|
48
|
+
args: {
|
|
49
|
+
baseImage: string;
|
|
50
|
+
tag: string;
|
|
51
|
+
tagSuffix: string;
|
|
52
|
+
packageName: string;
|
|
53
|
+
output: string;
|
|
54
|
+
publish: boolean;
|
|
55
|
+
repoUrl: string;
|
|
56
|
+
token: string;
|
|
57
|
+
actor: string;
|
|
58
|
+
imageName: string;
|
|
59
|
+
imageTag: string;
|
|
60
|
+
context: string;
|
|
61
|
+
};
|
|
62
|
+
}, {
|
|
63
|
+
command: "publish";
|
|
64
|
+
value: Promise<void>;
|
|
65
|
+
} | {
|
|
66
|
+
command: "build";
|
|
67
|
+
value: Promise<void>;
|
|
68
|
+
} | {
|
|
69
|
+
command: "template";
|
|
70
|
+
value: Promise<void>;
|
|
71
|
+
}> & {
|
|
72
|
+
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
73
|
+
command: "publish";
|
|
74
|
+
value: Promise<void>;
|
|
75
|
+
} | {
|
|
76
|
+
command: "build";
|
|
77
|
+
value: Promise<void>;
|
|
78
|
+
} | {
|
|
79
|
+
command: "template";
|
|
80
|
+
value: Promise<void>;
|
|
81
|
+
}>>;
|
|
82
|
+
};
|
|
@@ -0,0 +1,332 @@
|
|
|
1
|
+
import { command, subcommands, option, string, flag } from "cmd-ts";
|
|
2
|
+
import { $ } from "zx";
|
|
3
|
+
import fs from "fs-extra";
|
|
4
|
+
function buildCmd(_sthis) {
|
|
5
|
+
const cmd = command({
|
|
6
|
+
name: "build",
|
|
7
|
+
description: "Build test container with Docker and Playwright",
|
|
8
|
+
version: "1.0.0",
|
|
9
|
+
args: {},
|
|
10
|
+
handler: async () => {
|
|
11
|
+
$.verbose = true;
|
|
12
|
+
console.log("Installing required packages...");
|
|
13
|
+
await $ `apt-get update`;
|
|
14
|
+
await $ `apt-get install -y ca-certificates curl gnupg lsb-release jq rsync`;
|
|
15
|
+
console.log("Adding Docker's official GPG key...");
|
|
16
|
+
await $ `install -m 0755 -d /etc/apt/keyrings`;
|
|
17
|
+
await $ `curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg`;
|
|
18
|
+
await $ `chmod a+r /etc/apt/keyrings/docker.gpg`;
|
|
19
|
+
console.log("Setting up Docker repository...");
|
|
20
|
+
await $ `bash -c 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo \\"$VERSION_CODENAME\\") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null'`;
|
|
21
|
+
console.log("Installing Docker Compose plugin...");
|
|
22
|
+
await $ `apt-get update`;
|
|
23
|
+
await $ `apt-get install -y docker-ce-cli docker-compose-plugin`;
|
|
24
|
+
console.log("Verifying Docker installation...");
|
|
25
|
+
await $ `docker ps`;
|
|
26
|
+
await $ `docker compose version`;
|
|
27
|
+
console.log("Checking Playwright version...");
|
|
28
|
+
await $ `pnpm exec playwright --version`;
|
|
29
|
+
console.log("Configuring git safe directory...");
|
|
30
|
+
await $ `git config --global --add safe.directory ${process.cwd()}`;
|
|
31
|
+
console.log("Test container build completed successfully!");
|
|
32
|
+
},
|
|
33
|
+
});
|
|
34
|
+
return cmd;
|
|
35
|
+
}
|
|
36
|
+
async function getPackageVersion(packageName) {
|
|
37
|
+
try {
|
|
38
|
+
const result = await $ `pnpm why ${packageName} --json`;
|
|
39
|
+
const data = JSON.parse(result.stdout);
|
|
40
|
+
if (Array.isArray(data) && data.length > 0) {
|
|
41
|
+
const firstEntry = data[0];
|
|
42
|
+
if (firstEntry.devDependencies && firstEntry.devDependencies[packageName]) {
|
|
43
|
+
return firstEntry.devDependencies[packageName].version;
|
|
44
|
+
}
|
|
45
|
+
if (firstEntry.dependencies && firstEntry.dependencies[packageName]) {
|
|
46
|
+
return firstEntry.dependencies[packageName].version;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
console.warn(`Failed to get ${packageName} version:`, e);
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function templateCmd(_sthis) {
|
|
57
|
+
const cmd = command({
|
|
58
|
+
name: "template",
|
|
59
|
+
description: "Generate Dockerfile template for test container",
|
|
60
|
+
version: "1.0.0",
|
|
61
|
+
args: {
|
|
62
|
+
baseImage: option({
|
|
63
|
+
long: "base-image",
|
|
64
|
+
short: "b",
|
|
65
|
+
type: string,
|
|
66
|
+
description: "Base Playwright image (without tag)",
|
|
67
|
+
defaultValue: () => "mcr.microsoft.com/playwright",
|
|
68
|
+
defaultValueIsSerializable: true,
|
|
69
|
+
}),
|
|
70
|
+
tag: option({
|
|
71
|
+
long: "tag",
|
|
72
|
+
short: "t",
|
|
73
|
+
type: string,
|
|
74
|
+
description: "Tag for the base Playwright image (leave empty to auto-detect from pnpm)",
|
|
75
|
+
defaultValue: () => "",
|
|
76
|
+
defaultValueIsSerializable: true,
|
|
77
|
+
}),
|
|
78
|
+
tagSuffix: option({
|
|
79
|
+
long: "tag-suffix",
|
|
80
|
+
short: "s",
|
|
81
|
+
type: string,
|
|
82
|
+
description: "Suffix to append to the tag",
|
|
83
|
+
defaultValue: () => "noble",
|
|
84
|
+
defaultValueIsSerializable: true,
|
|
85
|
+
}),
|
|
86
|
+
packageName: option({
|
|
87
|
+
long: "package-name",
|
|
88
|
+
short: "p",
|
|
89
|
+
type: string,
|
|
90
|
+
description: "Package name to query for version",
|
|
91
|
+
defaultValue: () => "playwright",
|
|
92
|
+
defaultValueIsSerializable: true,
|
|
93
|
+
}),
|
|
94
|
+
output: option({
|
|
95
|
+
long: "output",
|
|
96
|
+
short: "o",
|
|
97
|
+
type: string,
|
|
98
|
+
description: "Output path for Dockerfile",
|
|
99
|
+
defaultValue: () => "./Dockerfile",
|
|
100
|
+
defaultValueIsSerializable: true,
|
|
101
|
+
}),
|
|
102
|
+
publish: flag({
|
|
103
|
+
long: "publish",
|
|
104
|
+
description: "Build and publish the image to ghcr.io after generating template",
|
|
105
|
+
}),
|
|
106
|
+
repoUrl: option({
|
|
107
|
+
long: "repo-url",
|
|
108
|
+
short: "r",
|
|
109
|
+
type: string,
|
|
110
|
+
description: "Full repository URL including registry (e.g., ghcr.io/owner/repo) - required if --publish is used",
|
|
111
|
+
defaultValue: () => (process.env.GITHUB_REPOSITORY ? `ghcr.io/${process.env.GITHUB_REPOSITORY}` : ""),
|
|
112
|
+
defaultValueIsSerializable: true,
|
|
113
|
+
}),
|
|
114
|
+
token: option({
|
|
115
|
+
long: "token",
|
|
116
|
+
short: "k",
|
|
117
|
+
type: string,
|
|
118
|
+
description: "GitHub token for authentication - required if --publish is used",
|
|
119
|
+
defaultValue: () => process.env.GITHUB_TOKEN || "",
|
|
120
|
+
defaultValueIsSerializable: true,
|
|
121
|
+
}),
|
|
122
|
+
actor: option({
|
|
123
|
+
long: "actor",
|
|
124
|
+
short: "a",
|
|
125
|
+
type: string,
|
|
126
|
+
description: "GitHub actor (username) - required if --publish is used",
|
|
127
|
+
defaultValue: () => process.env.GITHUB_ACTOR || "",
|
|
128
|
+
defaultValueIsSerializable: true,
|
|
129
|
+
}),
|
|
130
|
+
imageName: option({
|
|
131
|
+
long: "image-name",
|
|
132
|
+
short: "n",
|
|
133
|
+
type: string,
|
|
134
|
+
description: "Docker image name (e.g., 'test-container' or 'my-app')",
|
|
135
|
+
defaultValue: () => "test-container",
|
|
136
|
+
defaultValueIsSerializable: true,
|
|
137
|
+
}),
|
|
138
|
+
imageTag: option({
|
|
139
|
+
long: "image-tag",
|
|
140
|
+
short: "i",
|
|
141
|
+
type: string,
|
|
142
|
+
description: "Docker image tag for publishing",
|
|
143
|
+
defaultValue: () => "latest",
|
|
144
|
+
defaultValueIsSerializable: true,
|
|
145
|
+
}),
|
|
146
|
+
context: option({
|
|
147
|
+
long: "context",
|
|
148
|
+
short: "c",
|
|
149
|
+
type: string,
|
|
150
|
+
description: "Build context directory",
|
|
151
|
+
defaultValue: () => ".",
|
|
152
|
+
defaultValueIsSerializable: true,
|
|
153
|
+
}),
|
|
154
|
+
},
|
|
155
|
+
handler: async (args) => {
|
|
156
|
+
$.verbose = true;
|
|
157
|
+
let version = args.tag;
|
|
158
|
+
let detectedVersion;
|
|
159
|
+
if (!version) {
|
|
160
|
+
detectedVersion = await getPackageVersion(args.packageName);
|
|
161
|
+
if (!detectedVersion) {
|
|
162
|
+
throw new Error(`Could not detect version for package ${args.packageName}. Please specify --tag explicitly.`);
|
|
163
|
+
}
|
|
164
|
+
version = `v${detectedVersion}`;
|
|
165
|
+
console.log(`Detected ${args.packageName} version: ${detectedVersion}`);
|
|
166
|
+
}
|
|
167
|
+
const fullTag = args.tagSuffix ? `${version}-${args.tagSuffix}` : version;
|
|
168
|
+
const fullImageName = `${args.baseImage}:${fullTag}`;
|
|
169
|
+
const dockerfile = `FROM ${fullImageName}
|
|
170
|
+
|
|
171
|
+
# Install required packages
|
|
172
|
+
RUN apt-get update && \\
|
|
173
|
+
apt-get install -y ca-certificates curl gnupg lsb-release jq rsync && \\
|
|
174
|
+
rm -rf /var/lib/apt/lists/*
|
|
175
|
+
|
|
176
|
+
# Add Docker's official GPG key
|
|
177
|
+
RUN install -m 0755 -d /etc/apt/keyrings && \\
|
|
178
|
+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \\
|
|
179
|
+
chmod a+r /etc/apt/keyrings/docker.gpg
|
|
180
|
+
|
|
181
|
+
# Set up Docker repository
|
|
182
|
+
RUN echo \\
|
|
183
|
+
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \\
|
|
184
|
+
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \\
|
|
185
|
+
tee /etc/apt/sources.list.d/docker.list > /dev/null
|
|
186
|
+
|
|
187
|
+
# Install Docker Compose plugin
|
|
188
|
+
RUN apt-get update && \\
|
|
189
|
+
apt-get install -y docker-ce-cli docker-compose-plugin && \\
|
|
190
|
+
rm -rf /var/lib/apt/lists/*
|
|
191
|
+
|
|
192
|
+
# Install pnpm
|
|
193
|
+
RUN npm install -g pnpm
|
|
194
|
+
|
|
195
|
+
# Set working directory
|
|
196
|
+
WORKDIR /workspace
|
|
197
|
+
|
|
198
|
+
# Default command
|
|
199
|
+
CMD ["/bin/bash"]
|
|
200
|
+
`;
|
|
201
|
+
await fs.writeFile(args.output, dockerfile);
|
|
202
|
+
console.log(`Dockerfile generated at: ${args.output}`);
|
|
203
|
+
console.log(`Base image: ${fullImageName}`);
|
|
204
|
+
if (args.publish) {
|
|
205
|
+
if (!args.repoUrl) {
|
|
206
|
+
throw new Error("Repository URL is required for publishing. Provide via --repo-url or GITHUB_REPOSITORY environment variable.");
|
|
207
|
+
}
|
|
208
|
+
if (!args.token) {
|
|
209
|
+
throw new Error("GitHub token is required for publishing. Provide via --token or GITHUB_TOKEN environment variable.");
|
|
210
|
+
}
|
|
211
|
+
if (!args.actor) {
|
|
212
|
+
throw new Error("GitHub actor is required for publishing. Provide via --actor or GITHUB_ACTOR environment variable.");
|
|
213
|
+
}
|
|
214
|
+
const fullImagePath = `${args.repoUrl.toLowerCase()}/${args.actor}/${args.imageName}`;
|
|
215
|
+
const publishTag = detectedVersion ? detectedVersion : args.imageTag;
|
|
216
|
+
const publishImageTag = `${fullImagePath}:${publishTag}`;
|
|
217
|
+
console.log(`Checking if image already exists: ${publishImageTag}`);
|
|
218
|
+
console.log("Logging in to GitHub Container Registry...");
|
|
219
|
+
await $ `echo ${args.token} | docker login ghcr.io -u ${args.actor} --password-stdin`;
|
|
220
|
+
try {
|
|
221
|
+
await $ `docker manifest inspect ${publishImageTag}`;
|
|
222
|
+
console.log(`Image ${publishImageTag} already exists. Skipping build and push.`);
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
catch (e) {
|
|
226
|
+
console.log(`Image ${publishImageTag} does not exist. Proceeding with build and push.`);
|
|
227
|
+
}
|
|
228
|
+
console.log(`Building and publishing Docker image: ${publishImageTag}`);
|
|
229
|
+
console.log(`Using Dockerfile: ${args.output}`);
|
|
230
|
+
console.log(`Build context: ${args.context}`);
|
|
231
|
+
console.log("Building and pushing Docker image with buildx...");
|
|
232
|
+
await $ `docker buildx build --push -t ${publishImageTag} -f ${args.output} ${args.context}`;
|
|
233
|
+
console.log(`Successfully published ${publishImageTag}`);
|
|
234
|
+
}
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
return cmd;
|
|
238
|
+
}
|
|
239
|
+
function publishCmd(_sthis) {
|
|
240
|
+
const cmd = command({
|
|
241
|
+
name: "publish",
|
|
242
|
+
description: "Build and publish test container to GitHub Container Registry (ghcr.io)",
|
|
243
|
+
version: "1.0.0",
|
|
244
|
+
args: {
|
|
245
|
+
repoUrl: option({
|
|
246
|
+
long: "repo-url",
|
|
247
|
+
short: "r",
|
|
248
|
+
type: string,
|
|
249
|
+
description: "GitHub repository URL (e.g., owner/repo)",
|
|
250
|
+
defaultValue: () => process.env.GITHUB_REPOSITORY || "",
|
|
251
|
+
defaultValueIsSerializable: true,
|
|
252
|
+
}),
|
|
253
|
+
token: option({
|
|
254
|
+
long: "token",
|
|
255
|
+
short: "t",
|
|
256
|
+
type: string,
|
|
257
|
+
description: "GitHub token for authentication",
|
|
258
|
+
defaultValue: () => process.env.GITHUB_TOKEN || "",
|
|
259
|
+
defaultValueIsSerializable: true,
|
|
260
|
+
}),
|
|
261
|
+
actor: option({
|
|
262
|
+
long: "actor",
|
|
263
|
+
short: "a",
|
|
264
|
+
type: string,
|
|
265
|
+
description: "GitHub actor (username)",
|
|
266
|
+
defaultValue: () => process.env.GITHUB_ACTOR || "",
|
|
267
|
+
defaultValueIsSerializable: true,
|
|
268
|
+
}),
|
|
269
|
+
tag: option({
|
|
270
|
+
long: "tag",
|
|
271
|
+
short: "g",
|
|
272
|
+
type: string,
|
|
273
|
+
description: "Docker image tag",
|
|
274
|
+
defaultValue: () => "latest",
|
|
275
|
+
defaultValueIsSerializable: true,
|
|
276
|
+
}),
|
|
277
|
+
dockerfile: option({
|
|
278
|
+
long: "dockerfile",
|
|
279
|
+
short: "f",
|
|
280
|
+
type: string,
|
|
281
|
+
description: "Path to Dockerfile",
|
|
282
|
+
defaultValue: () => "./Dockerfile",
|
|
283
|
+
defaultValueIsSerializable: true,
|
|
284
|
+
}),
|
|
285
|
+
context: option({
|
|
286
|
+
long: "context",
|
|
287
|
+
short: "c",
|
|
288
|
+
type: string,
|
|
289
|
+
description: "Build context directory",
|
|
290
|
+
defaultValue: () => ".",
|
|
291
|
+
defaultValueIsSerializable: true,
|
|
292
|
+
}),
|
|
293
|
+
},
|
|
294
|
+
handler: async (args) => {
|
|
295
|
+
$.verbose = true;
|
|
296
|
+
if (!args.repoUrl) {
|
|
297
|
+
throw new Error("Repository URL is required. Provide via --repo-url or GITHUB_REPOSITORY environment variable.");
|
|
298
|
+
}
|
|
299
|
+
if (!args.token) {
|
|
300
|
+
throw new Error("GitHub token is required. Provide via --token or GITHUB_TOKEN environment variable.");
|
|
301
|
+
}
|
|
302
|
+
if (!args.actor) {
|
|
303
|
+
throw new Error("GitHub actor is required. Provide via --actor or GITHUB_ACTOR environment variable.");
|
|
304
|
+
}
|
|
305
|
+
const imageName = `ghcr.io/${args.repoUrl.toLowerCase()}`;
|
|
306
|
+
const imageTag = `${imageName}:${args.tag}`;
|
|
307
|
+
console.log(`Building Docker image: ${imageTag}`);
|
|
308
|
+
console.log(`Using Dockerfile: ${args.dockerfile}`);
|
|
309
|
+
console.log(`Build context: ${args.context}`);
|
|
310
|
+
console.log("Logging in to GitHub Container Registry...");
|
|
311
|
+
await $ `echo ${args.token} | docker login ghcr.io -u ${args.actor} --password-stdin`;
|
|
312
|
+
console.log("Building and pushing Docker image with buildx...");
|
|
313
|
+
await $ `docker buildx build --push -t ${imageTag} -f ${args.dockerfile} ${args.context}`;
|
|
314
|
+
console.log(`Successfully published ${imageTag}`);
|
|
315
|
+
},
|
|
316
|
+
});
|
|
317
|
+
return cmd;
|
|
318
|
+
}
|
|
319
|
+
export function testContainerCmd(sthis) {
|
|
320
|
+
const cmd = subcommands({
|
|
321
|
+
name: "testContainer",
|
|
322
|
+
description: "Test container management for Playwright and Docker",
|
|
323
|
+
version: "1.0.0",
|
|
324
|
+
cmds: {
|
|
325
|
+
template: templateCmd(sthis),
|
|
326
|
+
build: buildCmd(sthis),
|
|
327
|
+
publish: publishCmd(sthis),
|
|
328
|
+
},
|
|
329
|
+
});
|
|
330
|
+
return cmd;
|
|
331
|
+
}
|
|
332
|
+
//# sourceMappingURL=test-container-cmd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-container-cmd.js","sourceRoot":"","sources":["../jsr/test-container-cmd.ts"],"names":[],"mappings":"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"}
|
package/tsc-cmd.js
CHANGED
|
@@ -1,20 +1,16 @@
|
|
|
1
1
|
import { command, flag } from "cmd-ts";
|
|
2
|
-
import { findUp } from "find-up";
|
|
3
2
|
import { $ } from "zx";
|
|
4
3
|
export async function handleTsc(args, sthis) {
|
|
5
|
-
const
|
|
6
|
-
if (!top) {
|
|
7
|
-
throw new Error("Could not find tsconfig.dist.json in the project root.");
|
|
8
|
-
}
|
|
9
|
-
const tsc = sthis.env.get("FP_TSC") ?? "tsc";
|
|
4
|
+
const tsc = sthis.env.get("FP_TSC") ?? "tsgo";
|
|
10
5
|
const cmd = [tsc, ...args];
|
|
6
|
+
console.log(`Using typescript: ${cmd}`);
|
|
11
7
|
$.verbose = false;
|
|
12
8
|
const p = $({ stdio: ["inherit", "inherit", "inherit"] }) `${cmd}`;
|
|
13
9
|
await p;
|
|
14
10
|
}
|
|
15
11
|
export function tscCmd(sthis) {
|
|
16
12
|
const cmd = command({
|
|
17
|
-
name: "
|
|
13
|
+
name: "tsc or tsgo",
|
|
18
14
|
description: "tsc evolution tsgo",
|
|
19
15
|
args: {
|
|
20
16
|
help: flag({
|
|
@@ -25,7 +21,7 @@ export function tscCmd(sthis) {
|
|
|
25
21
|
}),
|
|
26
22
|
},
|
|
27
23
|
handler: async (args) => {
|
|
28
|
-
handleTsc(args, sthis);
|
|
24
|
+
return handleTsc(args, sthis);
|
|
29
25
|
},
|
|
30
26
|
});
|
|
31
27
|
return cmd;
|
package/tsc-cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc-cmd.js","sourceRoot":"","sources":["../jsr/tsc-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"tsc-cmd.js","sourceRoot":"","sources":["../jsr/tsc-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAEvB,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAc,EAAE,KAAgB;IAK9D,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAE9C,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAG3B,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC;IAClB,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,CAAA,GAAG,GAAG,EAAE,CAAC;IAClE,MAAM,CAAC,CAAC;AAGV,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAgB;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,oBAAoB;QACjC,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;gBACzB,WAAW,EAAE,YAAY;aAC1B,CAAC;SACH;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,OAAO,SAAS,CAAC,IAA2B,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/tsconfig.json
CHANGED
package/write-env.js
CHANGED
|
@@ -67,7 +67,7 @@ export function writeEnvCmd(sthis) {
|
|
|
67
67
|
if (args.fromEnv.length === 0) {
|
|
68
68
|
vals = {
|
|
69
69
|
[rt.sts.envKeyDefaults.PUBLIC]: param.REQUIRED,
|
|
70
|
-
STORAGE_URL: "http://127.0.0.1:9000/testbucket",
|
|
70
|
+
STORAGE_URL: sthis.env.get("STORAGE_URL") ?? "http://127.0.0.1:9000/testbucket",
|
|
71
71
|
FP_STORAGE_URL: param.OPTIONAL,
|
|
72
72
|
};
|
|
73
73
|
if (!args.excludeSecrets) {
|
package/write-env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-env.js","sourceRoot":"","sources":["../jsr/write-env.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"write-env.js","sourceRoot":"","sources":["../jsr/write-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrF,OAAO,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAAgB,EAChB,QAAgB,EAChB,QAA4B,EAC5B,GAAW,EACX,IAA4B,EAC5B,cAAuB,EACvB,IAAa;IAEb,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACrB,QAAQ,GAAG,aAAa,CAAC;IAC3B,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,aAAa,GAAG,EAAE,CAAC,CAAC;IAClG,IACE,cAAc;QACd,CAAC,MAAM,EAAE;aACN,IAAI,CAAC,KAAK,CAAC;aACX,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EACtB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAc,CAAC;IACnB,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;SAAM,CAAC;QAEN,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IACD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,IAAI,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAgB;IAC1C,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,gBAAgB;QAC7B,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,YAAY,EAAE,MAAM,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,iBAAiB;gBACrC,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,GAAG,EAAE,MAAM,CAAC;gBACV,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM;gBAC1B,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,cAAc,EAAE,IAAI,CAAC;gBACnB,IAAI,EAAE,gBAAgB;aACvB,CAAC;YACF,cAAc,EAAE,IAAI,CAAC;gBACnB,IAAI,EAAE,gBAAgB;aACvB,CAAC;YACF,OAAO,EAAE,WAAW,CAAC;gBACnB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;aACpB,CAAC;YACF,GAAG,EAAE,MAAM,CAAC;gBACV,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;aACvB,CAAC;YACF,IAAI,EAAE,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM;aACb,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,GAAmC,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,IAAI,GAAG;oBACL,CAAC,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ;oBAC9C,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,kCAAkC;oBAC/E,cAAc,EAAE,KAAK,CAAC,QAAQ;iBAC/B,CAAC;gBAEF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;oBACzB,IAAI,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC;oBACrC,IAAI,CAAC,mBAAmB,CAAC,GAAG,YAAY,CAAC;gBAC3C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC9B,IAAI,EAAE;qBACN,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;oBACjB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC5B,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;wBACpB,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC;oBAC1B,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBACb,CAAC;oBACD,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,IAAI,CAAC,CAAC;YACb,CAAC;YAED,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1H,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAExD,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
package/run.sh
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
#!/bin/bash
|
|
2
|
-
#echo "run.sh $0,$1,$FP_TSC $PATH"
|
|
3
|
-
if [ "$1" = "tsc" ]
|
|
4
|
-
then
|
|
5
|
-
if [ -z "$FP_TSC" ]
|
|
6
|
-
then
|
|
7
|
-
FP_TSC=tsgo
|
|
8
|
-
fi
|
|
9
|
-
echo "Using typescript: $FP_TSC"
|
|
10
|
-
#echo $PWD
|
|
11
|
-
#which $FP_TSC
|
|
12
|
-
shift
|
|
13
|
-
#echo $(which $FP_TSC) $@
|
|
14
|
-
exec $(which $FP_TSC) $@
|
|
15
|
-
fi
|
|
16
|
-
dirName=$(dirname $0)
|
|
17
|
-
if [ -f $dirName/main.js ]
|
|
18
|
-
then
|
|
19
|
-
exec node $dirName/main.js $@
|
|
20
|
-
else
|
|
21
|
-
exec pnpm exec tsx $dirName/main.ts $@
|
|
22
|
-
fi
|