@goldstack/utils-yarn 0.3.27 → 0.3.28

package/dist/src/utilsYarn.d.ts

@@ -1,4 +1,15 @@
 export declare const hasYarn: () => boolean;
 export declare const assertYarn: () => void;
-export declare const yarn: (dir: string, args: string) => void;
+/**
+ * Ensure that templates can be built in a CI environment, see
+ * https://github.com/goldstack/goldstack/issues/41#issuecomment-1007857278
+ *
+ * @param projectDir
+ * @param globalDir
+ */
+export declare const configureForTemplateBuild: (projectDir: string, globalDir: string) => void;
+export interface YarnRunOptions {
+    preferDocker?: boolean;
+}
+export declare const yarn: (dir: string, args: string, options?: YarnRunOptions | undefined) => void;
 //# sourceMappingURL=utilsYarn.d.ts.map

package/dist/src/utilsYarn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilsYarn.d.ts","sourceRoot":"","sources":["../../src/utilsYarn.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,OAAO,QAAO,OAM1B,CAAC;AAEF,eAAO,MAAM,UAAU,QAAO,IAI7B,CAAC;AAqBF,eAAO,MAAM,IAAI,QAAS,MAAM,QAAQ,MAAM,KAAG,IAQhD,CAAC"}
+{"version":3,"file":"utilsYarn.d.ts","sourceRoot":"","sources":["../../src/utilsYarn.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,OAAO,QAAO,OAM1B,CAAC;AAEF,eAAO,MAAM,UAAU,QAAO,IAI7B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,eACxB,MAAM,aACP,MAAM,KAChB,IAOF,CAAC;AAuBF,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,IAAI,QACV,MAAM,QACL,MAAM,2CAEX,IAYF,CAAC"}

package/dist/src/utilsYarn.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yarn = exports.assertYarn = exports.hasYarn = void 0;
+exports.yarn = exports.configureForTemplateBuild = exports.assertYarn = exports.hasYarn = void 0;
 const utils_sh_1 = require("@goldstack/utils-sh");
 const utils_docker_1 = require("@goldstack/utils-docker");
 const path_1 = __importDefault(require("path"));
@@ -22,12 +22,30 @@ const assertYarn = () => {
     }
 };
 exports.assertYarn = assertYarn;
+/**
+ * Ensure that templates can be built in a CI environment, see
+ * https://github.com/goldstack/goldstack/issues/41#issuecomment-1007857278
+ *
+ * @param projectDir
+ * @param globalDir
+ */
+const configureForTemplateBuild = (projectDir, globalDir) => {
+    console.log('Perform Yarn config overwrite for template building:');
+    (0, exports.yarn)(projectDir, `config set globalFolder ${globalDir}`);
+    (0, exports.yarn)(projectDir, 'config set checksumBehavior update');
+    (0, exports.yarn)(projectDir, 'config set enableImmutableInstalls false');
+    (0, exports.yarn)(projectDir, 'config set enableImmutableCache false');
+    (0, exports.yarn)(projectDir, 'config');
+};
+exports.configureForTemplateBuild = configureForTemplateBuild;
 const execWithDocker = (dir, args) => {
+    (0, utils_docker_1.assertDocker)();
     (0, utils_sh_1.exec)('docker run --rm ' +
         `-v "${path_1.default.resolve(dir)}":/app ` +
+        '--workdir /app ' +
         (0, utils_docker_1.renderHostEnvironmentVariables)() +
         ' ' +
-        `${(0, utils_docker_1.imageGoldstackBuild)()} ` +
+        `${(0, utils_docker_1.imageNodeYarn)()} ` +
         `yarn ${args}`);
 };
 const execWithCli = (dir, args) => {
@@ -37,13 +55,16 @@ const execWithCli = (dir, args) => {
     (0, utils_sh_1.exec)(`yarn ${args}`);
     (0, utils_sh_1.cd)(currentWorkDir);
 };
-const yarn = (dir, args) => {
-    // always prefer to run with docker
-    if ((0, utils_docker_1.hasDocker)()) {
-        execWithDocker(dir, args);
+const yarn = (dir, args, options) => {
+    // always prefer to run with cli
+    if ((0, exports.hasYarn)() && !(options === null || options === void 0 ? void 0 : options.preferDocker)) {
+        execWithCli(dir, args);
         return;
     }
-    execWithCli(dir, args);
+    if (!(0, utils_docker_1.hasDocker)()) {
+        throw new Error('Either yarn needs to be installed locally or Docker be avaialbe. Please install either yarn or Docker.');
+    }
+    execWithDocker(dir, args);
 };
 exports.yarn = yarn;
 //# sourceMappingURL=utilsYarn.js.map

package/dist/src/utilsYarn.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilsYarn.js","sourceRoot":"","sources":["../../src/utilsYarn.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAmE;AACnE,0DAIiC;AACjC,gDAAwB;AAEjB,MAAM,OAAO,GAAG,GAAY,EAAE;IACnC,IAAI,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AANW,QAAA,OAAO,WAMlB;AAEK,MAAM,UAAU,GAAG,GAAS,EAAE;IACnC,IAAI,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAJW,QAAA,UAAU,cAIrB;AAEF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,IAAY,EAAQ,EAAE;IACzD,IAAA,eAAI,EACF,kBAAkB;QAChB,OAAO,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS;QACjC,IAAA,6CAA8B,GAAE;QAChC,GAAG;QACH,GAAG,IAAA,kCAAmB,GAAE,GAAG;QAC3B,QAAQ,IAAI,EAAE,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,IAAY,EAAQ,EAAE;IACtD,IAAA,kBAAU,GAAE,CAAC;IACb,MAAM,cAAc,GAAG,IAAA,cAAG,GAAE,CAAC;IAC7B,IAAA,aAAE,EAAC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,IAAA,eAAI,EAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACrB,IAAA,aAAE,EAAC,cAAc,CAAC,CAAC;AACrB,CAAC,CAAC;AAEK,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,IAAY,EAAQ,EAAE;IACtD,mCAAmC;IACnC,IAAI,IAAA,wBAAS,GAAE,EAAE;QACf,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1B,OAAO;KACR;IAED,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC;AARW,QAAA,IAAI,QAQf"}
+{"version":3,"file":"utilsYarn.js","sourceRoot":"","sources":["../../src/utilsYarn.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAmE;AACnE,0DAKiC;AACjC,gDAAwB;AAEjB,MAAM,OAAO,GAAG,GAAY,EAAE;IACnC,IAAI,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AANW,QAAA,OAAO,WAMlB;AAEK,MAAM,UAAU,GAAG,GAAS,EAAE;IACnC,IAAI,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAJW,QAAA,UAAU,cAIrB;AAEF;;;;;;GAMG;AACI,MAAM,yBAAyB,GAAG,CACvC,UAAkB,EAClB,SAAiB,EACX,EAAE;IACR,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;IACpE,IAAA,YAAI,EAAC,UAAU,EAAE,2BAA2B,SAAS,EAAE,CAAC,CAAC;IACzD,IAAA,YAAI,EAAC,UAAU,EAAE,oCAAoC,CAAC,CAAC;IACvD,IAAA,YAAI,EAAC,UAAU,EAAE,0CAA0C,CAAC,CAAC;IAC7D,IAAA,YAAI,EAAC,UAAU,EAAE,uCAAuC,CAAC,CAAC;IAC1D,IAAA,YAAI,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAC;AAVW,QAAA,yBAAyB,6BAUpC;AAEF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,IAAY,EAAQ,EAAE;IACzD,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,eAAI,EACF,kBAAkB;QAChB,OAAO,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS;QACjC,iBAAiB;QACjB,IAAA,6CAA8B,GAAE;QAChC,GAAG;QACH,GAAG,IAAA,4BAAa,GAAE,GAAG;QACrB,QAAQ,IAAI,EAAE,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,IAAY,EAAQ,EAAE;IACtD,IAAA,kBAAU,GAAE,CAAC;IACb,MAAM,cAAc,GAAG,IAAA,cAAG,GAAE,CAAC;IAC7B,IAAA,aAAE,EAAC,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACtB,IAAA,eAAI,EAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACrB,IAAA,aAAE,EAAC,cAAc,CAAC,CAAC;AACrB,CAAC,CAAC;AAMK,MAAM,IAAI,GAAG,CAClB,GAAW,EACX,IAAY,EACZ,OAAwB,EAClB,EAAE;IACR,gCAAgC;IAChC,IAAI,IAAA,eAAO,GAAE,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,EAAE;QACvC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvB,OAAO;KACR;IACD,IAAI,CAAC,IAAA,wBAAS,GAAE,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;KACH;IACD,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAhBW,QAAA,IAAI,QAgBf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goldstack/utils-yarn",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "description": "Easily run yarn commands from within JavaScript code",
   "keywords": [
     "goldstack",
@@ -35,7 +35,7 @@
     "version:apply:force": "yarn version $@ && yarn version apply"
   },
   "dependencies": {
-    "@goldstack/utils-docker": "0.3.26",
+    "@goldstack/utils-docker": "0.3.27",
     "@goldstack/utils-sh": "0.4.22"
   },
   "devDependencies": {