@gluhar/cli 6.0.0-next.0 → 6.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "6.0.0-next.0",
+    "version": "6.0.0-next.1",
     "description": "Gluhar cli commands and scripts",
     "repository": {
         "type": "git",
@@ -50,6 +50,5 @@
         "tsc-alias": "^1.8.10",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.5.4"
-    },
-    "gitHead": "8773cd99c43cbe6a7dc415e50af8b13a7b8d4daf"
+    }
 }

package/src/commands/release/ReleaseOptions.d.ts

@@ -1,7 +1,6 @@
 export interface ReleaseOptions {
     pre: boolean | string;
     dev: boolean;
-    directory: string;
     yes: boolean;
     version: boolean;
     publish: boolean;

package/src/commands/release/ReleaseOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReleaseOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/ReleaseOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B"}
+{"version":3,"file":"ReleaseOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/ReleaseOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B"}

package/src/commands/release/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAIpC,wBA6CmB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAIpC,wBAwCmB"}

package/src/commands/release/index.js

@@ -12,8 +12,7 @@ exports.default = new commander_1.Command()
     .option("-y, --yes", "When run with this flag, we will skip all confirmation prompts. NOTE does not currently work.", false)
     .option("--pre [id]", "Prerelease identifier. Use this when releasing a prerelease version.", false)
     .option("-d, --dev", "Release a dev version. This is a shorthand for a prerelease with a 'dev' identifier.", false)
-    .option("--publish", "Also publish from this machine with lerna (asks for an npm OTP). Only needed for packages that aren't on npm yet, since trusted publishing can't be set up before a first publish.", false)
-    .option("--dir, --directory <path>", "Subdirectory to publish with --publish. Must apply to ALL packages, and MUST contain a package.json file.", "dist")
+    .option("--publish", "Also publish from this machine with scripts/publish.mjs (npm asks for 2FA in the browser). Only needed for packages that aren't on npm yet, since trusted publishing can't be set up before a first publish.", false)
     .option("--no-version", "Disable versioning and changelog gen.")
     .option("--git-tag [tag]", [
     "Create and push git tag(s). Optionally provide a template.",

package/src/commands/release/publish.d.ts

@@ -1,3 +1,6 @@
-import type { ReleaseOptions } from "./ReleaseOptions";
-export declare const publish: (options: ReleaseOptions) => void;
+/**
+ * Publishes from this machine with the same script CI runs. Plain `npm publish` handles
+ * passkey 2FA in the browser, which lerna's OTP prompt can't. Run from the monorepo root.
+ */
+export declare const publish: () => void;
 //# sourceMappingURL=publish.d.ts.map

package/src/commands/release/publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/publish.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,SAa9C,CAAC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/publish.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,eAAO,MAAM,OAAO,YAInB,CAAC"}

package/src/commands/release/publish.js

@@ -1,20 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publish = void 0;
-const lerna_1 = require("../../scripts/lerna");
 const cmd_1 = require("../../scripts/cmd");
 const log_1 = require("./log");
-const getPreid_1 = require("../version/getPreid");
-const publish = (options) => {
-    const { yes, pre, dev, directory } = options;
-    const distTag = dev ? "dev" : (0, getPreid_1.getPreid)(pre) ?? "latest";
-    log_1.log.info("Dist tag:", distTag);
-    log_1.log.info("Directory:", directory);
-    const result = lerna_1.lerna.publish({
-        distTag,
-        contents: directory,
-        yes,
-    });
-    (0, cmd_1.exitOnFailure)(result, "lerna publish");
+/**
+ * Publishes from this machine with the same script CI runs. Plain `npm publish` handles
+ * passkey 2FA in the browser, which lerna's OTP prompt can't. Run from the monorepo root.
+ */
+const publish = () => {
+    log_1.log.info("Building and publishing from this machine (npm will ask for 2FA).");
+    (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)("npm run build"), "npm run build");
+    (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)("node scripts/publish.mjs"), "scripts/publish.mjs");
 };
 exports.publish = publish;

package/src/commands/release/release.js

@@ -19,7 +19,7 @@ const release = async (options) => {
             commit: "chore: Releasing gluhar packages.",
         });
     if (options.publish)
-        (0, publish_1.publish)(options);
+        (0, publish_1.publish)();
     await (0, tag_1.tag)(options);
     if (!options.publish) {
         if (options.gitTag)

package/src/scripts/cmd/exitOnFailure.d.ts

@@ -2,7 +2,7 @@ import type { SpawnSyncReturns } from 'child_process';
 /**
  * Exits the process when a spawned command failed, so later steps don't run on a broken state.
  * @param result The return value of `executeBash` / `executeCmd`.
- * @param label What failed, for the error message: 'lerna publish'.
+ * @param label What failed, for the error message: 'lerna version'.
  */
 export declare const exitOnFailure: (result: SpawnSyncReturns<Buffer>, label: string) => void;
 //# sourceMappingURL=exitOnFailure.d.ts.map

package/src/scripts/cmd/exitOnFailure.js

@@ -5,7 +5,7 @@ const log_1 = require("./log");
 /**
  * Exits the process when a spawned command failed, so later steps don't run on a broken state.
  * @param result The return value of `executeBash` / `executeCmd`.
- * @param label What failed, for the error message: 'lerna publish'.
+ * @param label What failed, for the error message: 'lerna version'.
  */
 const exitOnFailure = (result, label) => {
     if (result.error) {

package/src/scripts/lerna/index.d.ts

@@ -3,7 +3,6 @@ import { filterByDependency } from './filterByDependency';
 import type { Args } from '../cmd/types';
 export declare const lerna: {
     version: (args?: Args) => import("child_process").SpawnSyncReturns<Buffer>;
-    publish: (args?: Args) => import("child_process").SpawnSyncReturns<Buffer>;
     list: (args?: Args) => import("child_process").SpawnSyncReturns<Buffer>;
     changed: () => import("./types").LernaPackage[];
     getConfig: () => import("./types").LernaConfig | null;

package/src/scripts/lerna/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/scripts/lerna/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,KAAK;qBACC,IAAI;qBACJ,IAAI;kBACP,IAAI;;;;;;CAMnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/scripts/lerna/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,KAAK;qBACC,IAAI;kBACP,IAAI;;;;;;CAMnB,CAAC"}

package/src/scripts/lerna/index.js

@@ -9,7 +9,6 @@ const filterByDependency_1 = require("./filterByDependency");
 const getDetails_1 = require("./getDetails");
 exports.lerna = {
     version: (args) => (0, cmd_1.executeBash)('lerna/version', args),
-    publish: (args) => (0, cmd_1.executeBash)('lerna/publish', args),
     list: (args) => (0, cmd_1.executeBash)('lerna/list', args),
     changed: changed_1.changed,
     getConfig: getConfig_1.getConfig,

package/src/commands/danka/DankaOptions.d.ts

@@ -1,4 +0,0 @@
-export interface DankaOptions {
-    danka: boolean;
-}
-//# sourceMappingURL=DankaOptions.d.ts.map

package/src/commands/danka/DankaOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DankaOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/danka/DankaOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,OAAO,CAAC;CAChB"}

package/src/commands/danka/DankaOptions.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/commands/danka/danka.d.ts

@@ -1,3 +0,0 @@
-import { DankaOptions } from "./DankaOptions";
-export declare const danka: (options: DankaOptions) => void;
-//# sourceMappingURL=danka.d.ts.map

package/src/commands/danka/danka.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"danka.d.ts","sourceRoot":"","sources":["../../../../src/commands/danka/danka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,KAAK,YAAa,YAAY,SAE1C,CAAC"}

package/src/commands/danka/danka.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.danka = void 0;
-const log_1 = require("./log");
-const danka = (options) => {
-    log_1.log.info("danka", options);
-};
-exports.danka = danka;

package/src/commands/danka/index.d.ts

@@ -1,4 +0,0 @@
-import { Command } from "commander";
-declare const _default: Command;
-export default _default;
-//# sourceMappingURL=index.d.ts.map

package/src/commands/danka/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/danka/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAIiB"}

package/src/commands/danka/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const danka_1 = require("./danka");
-exports.default = new commander_1.Command()
-    .name("danka")
-    .description("Description of command.")
-    .option("-b, --danka", "A boolean option.")
-    .action(danka_1.danka);

package/src/commands/danka/log.d.ts

@@ -1,2 +0,0 @@
-export declare const log: import("../../utils").Logger;
-//# sourceMappingURL=log.d.ts.map

package/src/commands/danka/log.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../src/commands/danka/log.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,4BAAkB,CAAC"}

package/src/commands/danka/log.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = void 0;
-const utils_1 = require("../../utils");
-exports.log = (0, utils_1.logger)("danka");

package/src/commands/kiss/KissOptions.d.ts

@@ -1,4 +0,0 @@
-export interface KissOptions {
-    kiss: boolean;
-}
-//# sourceMappingURL=KissOptions.d.ts.map

package/src/commands/kiss/KissOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"KissOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/kiss/KissOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAC;CACf"}

package/src/commands/kiss/KissOptions.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/commands/kiss/index.d.ts

@@ -1,4 +0,0 @@
-import { Command } from "commander";
-declare const _default: Command;
-export default _default;
-//# sourceMappingURL=index.d.ts.map

package/src/commands/kiss/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/kiss/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAIgB"}

package/src/commands/kiss/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const kiss_1 = require("./kiss");
-exports.default = new commander_1.Command()
-    .name("kiss")
-    .description("Description of command.")
-    .option("-b, --kiss", "A boolean option.")
-    .action(kiss_1.kiss);

package/src/commands/kiss/kiss.d.ts

@@ -1,3 +0,0 @@
-import { KissOptions } from "./KissOptions";
-export declare const kiss: (options: KissOptions) => void;
-//# sourceMappingURL=kiss.d.ts.map

package/src/commands/kiss/kiss.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"kiss.d.ts","sourceRoot":"","sources":["../../../../src/commands/kiss/kiss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,eAAO,MAAM,IAAI,YAAa,WAAW,SAExC,CAAC"}

package/src/commands/kiss/kiss.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.kiss = void 0;
-const log_1 = require("./log");
-const kiss = (options) => {
-    log_1.log.info("kiss", options);
-};
-exports.kiss = kiss;

package/src/commands/kiss/log.d.ts

@@ -1,2 +0,0 @@
-export declare const log: import("../../utils").Logger;
-//# sourceMappingURL=log.d.ts.map

package/src/commands/kiss/log.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../src/commands/kiss/log.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,4BAAiB,CAAC"}

package/src/commands/kiss/log.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = void 0;
-const utils_1 = require("../../utils");
-exports.log = (0, utils_1.logger)("kiss");

package/src/scripts/lerna/publish.sh

@@ -1 +0,0 @@
-npx lerna publish from-package "$@"