@catladder/cli 0.0.0-main-a5fa4316 → 0.0.0-main-b84a56aa

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.
Files changed (6) hide show
  1. package/dist/bundles/catenv/index.js +26 -2
  2. package/dist/bundles/cli/index.js +26 -2
  3. package/dist/pipeline/src/build/node/meteor.js +26 -2
  4. package/dist/pipeline/src/build/node/meteor.js.map +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/package.json +1 -1
package/dist/bundles/catenv/index.js CHANGED
@@ -2304,6 +2304,7 @@ exports.createMeteorJobs = createMeteorJobs;
2304
2304
 
2305
2305
  Object.defineProperty(exports, "__esModule", ({ value: true }));
2306
2306
  exports.createMeteorBuildJobs = void 0;
2307
+ const BashExpression_1 = __nccwpck_require__(5354);
2307
2308
  const runner_1 = __nccwpck_require__(2348);
2308
2309
  const base_1 = __nccwpck_require__(8121);
2309
2310
  const docker_1 = __nccwpck_require__(2764);
@@ -2322,6 +2323,28 @@ const getMeteorCache = (context) => [
2322
2323
  ],
2323
2324
  },
2324
2325
  ];
2326
+ const getMeteorDockerInstallScripts = (context) => {
2327
+ if (context.packageManagerInfo.isClassic) {
2328
+ return new BashExpression_1.BashExpression(`
2329
+ COPY $APP_DIR/package.json $APP_DIR/yarn.lock ./
2330
+
2331
+ RUN yarn --frozen-lockfile --production=true --ignore-scripts --ignore-engines
2332
+ COPY $APP_DIR .
2333
+ RUN yarn --frozen-lockfile --production=true --ignore-engines
2334
+ `.trim());
2335
+ }
2336
+ // yarn >= 4 ships with built-in plugins, see https://github.com/yarnpkg/berry/pull/4253
2337
+ const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
2338
+ const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
2339
+ ? "RUN yarn plugin import workspace-tools"
2340
+ : "";
2341
+ return new BashExpression_1.BashExpression(`
2342
+ ENV YARN_ENABLE_INLINE_BUILDS=1
2343
+ COPY $APP_DIR .
2344
+ ${maybeAddWorkspaceToolsCommand}
2345
+ RUN yarn workspaces focus --production
2346
+ `.trim());
2347
+ };
2325
2348
  const createMeteorBuildJobs = (context) => {
2326
2349
  const buildConfig = context.build.config;
2327
2350
  if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
@@ -2338,7 +2361,6 @@ const createMeteorBuildJobs = (context) => {
2338
2361
  },
2339
2362
  script: [
2340
2363
  ...yarnInstall,
2341
- "meteor add qualia:prod-shell --allow-superuser",
2342
2364
  'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory',
2343
2365
  "cp ./__build_info.json ./dist/bundle/programs/server",
2344
2366
  ],
@@ -2347,7 +2369,9 @@ const createMeteorBuildJobs = (context) => {
2347
2369
  dockerBuild: {
2348
2370
  script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
2349
2371
  variables: {
2350
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
2372
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts
2373
+ ? getMeteorDockerInstallScripts(context)
2374
+ : "",
2351
2375
  },
2352
2376
  },
2353
2377
  });
package/dist/bundles/cli/index.js CHANGED
@@ -5570,6 +5570,7 @@ exports.createMeteorJobs = createMeteorJobs;
5570
5570
 
5571
5571
  Object.defineProperty(exports, "__esModule", ({ value: true }));
5572
5572
  exports.createMeteorBuildJobs = void 0;
5573
+ const BashExpression_1 = __nccwpck_require__(25354);
5573
5574
  const runner_1 = __nccwpck_require__(92348);
5574
5575
  const base_1 = __nccwpck_require__(80502);
5575
5576
  const docker_1 = __nccwpck_require__(12764);
@@ -5588,6 +5589,28 @@ const getMeteorCache = (context) => [
5588
5589
  ],
5589
5590
  },
5590
5591
  ];
5592
+ const getMeteorDockerInstallScripts = (context) => {
5593
+ if (context.packageManagerInfo.isClassic) {
5594
+ return new BashExpression_1.BashExpression(`
5595
+ COPY $APP_DIR/package.json $APP_DIR/yarn.lock ./
5596
+
5597
+ RUN yarn --frozen-lockfile --production=true --ignore-scripts --ignore-engines
5598
+ COPY $APP_DIR .
5599
+ RUN yarn --frozen-lockfile --production=true --ignore-engines
5600
+ `.trim());
5601
+ }
5602
+ // yarn >= 4 ships with built-in plugins, see https://github.com/yarnpkg/berry/pull/4253
5603
+ const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
5604
+ const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
5605
+ ? "RUN yarn plugin import workspace-tools"
5606
+ : "";
5607
+ return new BashExpression_1.BashExpression(`
5608
+ ENV YARN_ENABLE_INLINE_BUILDS=1
5609
+ COPY $APP_DIR .
5610
+ ${maybeAddWorkspaceToolsCommand}
5611
+ RUN yarn workspaces focus --production
5612
+ `.trim());
5613
+ };
5591
5614
  const createMeteorBuildJobs = (context) => {
5592
5615
  const buildConfig = context.build.config;
5593
5616
  if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
@@ -5604,7 +5627,6 @@ const createMeteorBuildJobs = (context) => {
5604
5627
  },
5605
5628
  script: [
5606
5629
  ...yarnInstall,
5607
- "meteor add qualia:prod-shell --allow-superuser",
5608
5630
  'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory',
5609
5631
  "cp ./__build_info.json ./dist/bundle/programs/server",
5610
5632
  ],
@@ -5613,7 +5635,9 @@ const createMeteorBuildJobs = (context) => {
5613
5635
  dockerBuild: {
5614
5636
  script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
5615
5637
  variables: {
5616
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
5638
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts
5639
+ ? getMeteorDockerInstallScripts(context)
5640
+ : "",
5617
5641
  },
5618
5642
  },
5619
5643
  });
package/dist/pipeline/src/build/node/meteor.js CHANGED
@@ -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")) {
@@ -35,7 +58,6 @@ const createMeteorBuildJobs = (context) => {
35
58
  },
36
59
  script: [
37
60
  ...yarnInstall,
38
- "meteor add qualia:prod-shell --allow-superuser",
39
61
  'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory',
40
62
  "cp ./__build_info.json ./dist/bundle/programs/server",
41
63
  ],
@@ -44,7 +66,9 @@ const createMeteorBuildJobs = (context) => {
44
66
  dockerBuild: {
45
67
  script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
46
68
  variables: {
47
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
69
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts
70
+ ? getMeteorDockerInstallScripts(context)
71
+ : "",
48
72
  },
49
73
  },
50
74
  });
package/dist/pipeline/src/build/node/meteor.js.map CHANGED
@@ -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,gDAAgD;oBAEhD,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;AAtCW,QAAA,qBAAqB,yBAsChC"}
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"}