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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "6.0.0-next.1",
+    "version": "6.0.0-next.3",
     "description": "Gluhar cli commands and scripts",
     "repository": {
         "type": "git",
@@ -8,8 +8,7 @@
         "directory": "packages/cli"
     },
     "exports": {
-        ".": "./src/index.ts",
-        "./*": "./src/*/index.ts"
+        ".": "./src/index.js"
     },
     "main": "./src/index.js",
     "bin": {

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,KAAK,GAAI,SAAS,YAAY,SAmB1C,CAAC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,KAAK,GAAI,SAAS,YAAY,SAmC1C,CAAC"}

package/src/commands/build/build.js

@@ -1,22 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
+const fs_1 = require("fs");
 const cmd_1 = require("../../scripts/cmd");
 const log_1 = require("./log");
 const build = (options) => {
     const { type } = options;
     // INFO Nuxt modules need a structure of [pkg.json, dist/] to function properly where as my release script needs all pkgs to be released from a dist folder
     if (type === "module") {
+        // The package's own builder, not whatever `nuxt-module-build` is first on PATH: the CLI runs
+        // through the root workspace, whose .bin holds @nuxtjs/device's module-builder 0.8.3 (Nuxt 3).
+        // Every 6.0.0-next.* up to .1 was built with it instead of the declared ^1. npm only nests ^1
+        // under each package while that conflict lasts; once it can hoist ^1, the root bin is right.
+        const local = "./node_modules/.bin/nuxt-module-build";
+        const builder = (0, fs_1.existsSync)(local) ? local : "nuxt-module-build";
+        // Every module's tsconfig extends ./.nuxt/tsconfig.json, which only `prepare` generates.
+        // Locally `dev:prepare` has always run; on a clean CI checkout it hasn't, the build
+        // fails, and an empty dist used to get published (6.0.0-next.1).
+        log_1.log.info("Prepare nuxt module types");
+        (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)(`${builder} prepare`), "nuxt-module-build prepare");
         log_1.log.info("Build nuxt module in dist");
-        (0, cmd_1.executeCmd)("nuxt-module-build build");
+        (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)(`${builder} build`), "nuxt-module-build build");
         log_1.log.info("Copy contents of dist on level down");
-        (0, cmd_1.executeCmd)('copyfiles "dist/**/*" dist');
+        (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)('copyfiles "dist/**/*" dist'), "copyfiles dist");
         // log.info("Delete the copied files");
         // executeCmd(
         //   "find ./dist -mindepth 1 ! -path './dist/dist*' -exec rm -rf {} +"
         // );
         log_1.log.info("Copy pkg.json and mds to dist as well");
-        (0, cmd_1.executeCmd)("copyfiles package.json README.md CHANGELOG.md dist");
+        (0, cmd_1.exitOnFailure)((0, cmd_1.executeCmd)("copyfiles package.json README.md CHANGELOG.md dist"), "copyfiles package.json");
     }
 };
 exports.build = build;

package/src/scripts/cmd/executeBash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeBash.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/executeBash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,OAAO,IAAI,EAAE,WAAW,OAAO,qDAQxE,CAAC"}
+{"version":3,"file":"executeBash.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/executeBash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,OAAO,IAAI,EAAE,WAAW,OAAO,qDASxE,CAAC"}

package/src/scripts/cmd/executeBash.js

@@ -11,7 +11,8 @@ const parseBashArgs_1 = require("./parseBashArgs");
  * @returns Executes the bash script file in the same stdio.
  */
 const executeBash = (path, args, absolute) => {
-    const bashArgs = (0, parseBashArgs_1.parseBashArgs)(path, args, absolute);
+    // An argv array, not a shell line: values must not be quoted
+    const bashArgs = (0, parseBashArgs_1.parseBashArgs)(path, args, absolute, false);
     // TODO make stdio configurable
     // TODO make an async option
     return (0, child_process_1.spawnSync)('bash', bashArgs, {

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

@@ -1,3 +1,8 @@
 import type { Args } from "./types";
-export declare const parseArgs: (args: Args) => string[];
+/**
+ * @param shell The result is joined into a shell command line, so values with spaces stay
+ * quoted. Pass `false` for an argv array (`spawnSync` without a shell), where quotes would
+ * end up in the value itself.
+ */
+export declare const parseArgs: (args: Args, shell?: boolean) => string[];
 //# sourceMappingURL=parseArgs.d.ts.map

package/src/scripts/cmd/parseArgs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseArgs.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/parseArgs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAA+B,MAAM,SAAS,CAAC;AAQjE,eAAO,MAAM,SAAS,GAAI,MAAM,IAAI,KAAG,MAAM,EAkC5C,CAAC"}
+{"version":3,"file":"parseArgs.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/parseArgs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAA+B,MAAM,SAAS,CAAC;AAQjE;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,IAAI,EAAE,eAAY,KAAG,MAAM,EAoC1D,CAAC"}

package/src/scripts/cmd/parseArgs.js

@@ -9,7 +9,12 @@ const hyphenize = (s) => humps_1.default.decamelize(s, { separator: "-" });
 const hasValue = (arg) => {
     return arg.value !== undefined;
 };
-const parseArgs = (args) => {
+/**
+ * @param shell The result is joined into a shell command line, so values with spaces stay
+ * quoted. Pass `false` for an argv array (`spawnSync` without a shell), where quotes would
+ * end up in the value itself.
+ */
+const parseArgs = (args, shell = true) => {
     return Object.entries(args)
         .map(([name, value]) => ({
         name,
@@ -26,7 +31,10 @@ const parseArgs = (args) => {
             result.push(`-${parsedName}`);
         }
         value.toString();
-        if (value !== true) {
+        if (value !== true && !shell) {
+            result.push(String(value));
+        }
+        else if (value !== true) {
             let v = parsedValue;
             if (v.length > 2 &&
                 v[0] === '"' &&

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

@@ -1,3 +1,3 @@
 import type { Args } from './types';
-export declare const parseBashArgs: (path: string, args?: Args, absolute?: boolean) => string[];
+export declare const parseBashArgs: (path: string, args?: Args, absolute?: boolean, shell?: boolean) => string[];
 //# sourceMappingURL=parseBashArgs.d.ts.map

package/src/scripts/cmd/parseBashArgs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseBashArgs.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/parseBashArgs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAGpC,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,OAAO,IAAI,EACX,WAAW,OAAO,aAanB,CAAC"}
+{"version":3,"file":"parseBashArgs.d.ts","sourceRoot":"","sources":["../../../../src/scripts/cmd/parseBashArgs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAGpC,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,OAAO,IAAI,EACX,WAAW,OAAO,EAClB,eAAY,aAab,CAAC"}

package/src/scripts/cmd/parseBashArgs.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBashArgs = void 0;
 const log_1 = require("./log");
 const parseArgs_1 = require("./parseArgs");
-const parseBashArgs = (path, args, absolute) => {
+const parseBashArgs = (path, args, absolute, shell = true) => {
     const filePath = path.endsWith('.sh') ? path : `${path}.sh`;
     const absolutePath = !absolute ? `${__dirname}/../${filePath}` : filePath;
     const flags = [absolutePath];
     if (args) {
-        flags.push(...(0, parseArgs_1.parseArgs)(args));
+        flags.push(...(0, parseArgs_1.parseArgs)(args, shell));
     }
     log_1.log.verbose('executeBash:', flags.join(' '));
     return flags;