@catladder/cli 3.45.0 → 3.46.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.
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createMeteorBuildJobs = void 0;
4
+ const BashExpression_1 = require("../../bash/BashExpression");
4
5
  const runner_1 = require("../../runner");
5
6
  const base_1 = require("../base");
6
7
  const docker_1 = require("../docker");
@@ -19,6 +20,28 @@ const getMeteorCache = (context) => [
19
20
  ],
20
21
  },
21
22
  ];
23
+ const getMeteorDockerInstallScripts = (context) => {
24
+ if (context.packageManagerInfo.isClassic) {
25
+ return new BashExpression_1.BashExpression(`
26
+ COPY $APP_DIR/package.json $APP_DIR/yarn.lock ./
27
+
28
+ RUN yarn --frozen-lockfile --production=true --ignore-scripts --ignore-engines
29
+ COPY $APP_DIR .
30
+ RUN yarn --frozen-lockfile --production=true --ignore-engines
31
+ `.trim());
32
+ }
33
+ // yarn >= 4 ships with built-in plugins, see https://github.com/yarnpkg/berry/pull/4253
34
+ const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
35
+ const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
36
+ ? "RUN yarn plugin import workspace-tools"
37
+ : "";
38
+ return new BashExpression_1.BashExpression(`
39
+ ENV YARN_ENABLE_INLINE_BUILDS=1
40
+ COPY $APP_DIR .
41
+ ${maybeAddWorkspaceToolsCommand}
42
+ RUN yarn workspaces focus --production
43
+ `.trim());
44
+ };
22
45
  const createMeteorBuildJobs = (context) => {
23
46
  const buildConfig = context.build.config;
24
47
  if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
@@ -43,7 +66,9 @@ const createMeteorBuildJobs = (context) => {
43
66
  dockerBuild: {
44
67
  script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
45
68
  variables: {
46
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
69
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts
70
+ ? getMeteorDockerInstallScripts(context)
71
+ : "",
47
72
  },
48
73
  },
49
74
  });
@@ -1 +1 @@
1
- {"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAQ9C,kCAAmD;AACnD,sCAAsE;AAEtE,oCAAyC;AACzC,mCAAuC;AACvC,iCAAwC;AAExC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAiB,EAAE,CAAC;IACnE;QACE,GAAG,EAAE,oBAAoB;QACzB,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,0CAA0C;YAC1C,4BAA4B;YAC5B,wBAAwB;YACxB,qCAAqC;SACtC;KACF;CACF,CAAC;AACK,MAAM,qBAAqB,GAAG,CACnC,OAAkC,EAClB,EAAE;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC7D,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,EAAE;oBACN,GAAG,WAAW;oBAEd,kNAAkN;oBAElN,sDAAsD;iBACvD;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
1
+ {"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAC3D,yCAA8C;AAQ9C,kCAAmD;AACnD,sCAAsE;AAEtE,oCAAyC;AACzC,mCAAuC;AACvC,iCAAwC;AAExC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAiB,EAAE,CAAC;IACnE;QACE,GAAG,EAAE,oBAAoB;QACzB,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,0CAA0C;YAC1C,4BAA4B;YAC5B,wBAAwB;YACxB,qCAAqC;SACtC;KACF;CACF,CAAC;AACF,MAAM,6BAA6B,GAAG,CACpC,OAAkC,EAClB,EAAE;IAClB,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;;;;;;OAMC,CAAC,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,IAAI,+BAAc,CACvB;;;EAGF,6BAA6B;;KAE1B,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,OAAkC,EAClB,EAAE;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC7D,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,EAAE;oBACN,GAAG,WAAW;oBAEd,kNAAkN;oBAElN,sDAAsD;iBACvD;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc;oBAChD,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC;oBACxC,CAAC,CAAC,EAAE;aACP;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC"}