@cedarjs/cli-helpers 3.0.1-next.0 → 3.0.1-next.28

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.
package/dist/cjs/index.js CHANGED
@@ -17,24 +17,24 @@ var __copyProps = (to, from, except, desc) => {
17
17
  };
18
18
  var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
19
19
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
20
- var src_exports = {};
21
- __export(src_exports, {
20
+ var index_exports = {};
21
+ __export(index_exports, {
22
22
  loadDefaultEnvFiles: () => import_loadEnvFiles2.loadDefaultEnvFiles,
23
23
  loadEnvFiles: () => import_loadEnvFiles.loadEnvFiles,
24
24
  loadNodeEnvDerivedEnvFile: () => import_loadEnvFiles2.loadNodeEnvDerivedEnvFile,
25
25
  loadUserSpecifiedEnvFiles: () => import_loadEnvFiles2.loadUserSpecifiedEnvFiles
26
26
  });
27
- module.exports = __toCommonJS(src_exports);
28
- __reExport(src_exports, require("./lib/index.js"), module.exports);
29
- __reExport(src_exports, require("./lib/colors.js"), module.exports);
27
+ module.exports = __toCommonJS(index_exports);
28
+ __reExport(index_exports, require("./lib/index.js"), module.exports);
29
+ __reExport(index_exports, require("./lib/colors.js"), module.exports);
30
30
  var import_loadEnvFiles = require("./lib/loadEnvFiles.js");
31
31
  var import_loadEnvFiles2 = require("./lib/loadEnvFiles.js");
32
- __reExport(src_exports, require("./lib/paths.js"), module.exports);
33
- __reExport(src_exports, require("./lib/project.js"), module.exports);
34
- __reExport(src_exports, require("./lib/version.js"), module.exports);
35
- __reExport(src_exports, require("./auth/setupHelpers.js"), module.exports);
36
- __reExport(src_exports, require("./lib/installHelpers.js"), module.exports);
37
- __reExport(src_exports, require("./telemetry/index.js"), module.exports);
32
+ __reExport(index_exports, require("./lib/paths.js"), module.exports);
33
+ __reExport(index_exports, require("./lib/project.js"), module.exports);
34
+ __reExport(index_exports, require("./lib/version.js"), module.exports);
35
+ __reExport(index_exports, require("./auth/setupHelpers.js"), module.exports);
36
+ __reExport(index_exports, require("./lib/installHelpers.js"), module.exports);
37
+ __reExport(index_exports, require("./telemetry/index.js"), module.exports);
38
38
  // Annotate the CommonJS export names for ESM import in node:
39
39
  0 && (module.exports = {
40
40
  loadDefaultEnvFiles,
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAoB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
@@ -36,6 +36,7 @@ __export(lib_exports, {
36
36
  });
37
37
  module.exports = __toCommonJS(lib_exports);
38
38
  var import_node_fs = __toESM(require("node:fs"), 1);
39
+ var import_node_url = require("node:url");
39
40
  var import_path = __toESM(require("path"), 1);
40
41
  var babel = __toESM(require("@babel/core"), 1);
41
42
  var import_listr2 = require("listr2");
@@ -74,7 +75,7 @@ const getPrettierOptions = async () => {
74
75
  const cjsPath = import_path.default.join((0, import_paths.getPaths)().base, "prettier.config.cjs");
75
76
  const mjsPath = import_path.default.join((0, import_paths.getPaths)().base, "prettier.config.mjs");
76
77
  const prettierConfigPath = import_node_fs.default.existsSync(cjsPath) ? cjsPath : mjsPath;
77
- const { default: options } = await import(`file://${prettierConfigPath}`);
78
+ const { default: options } = await import((0, import_node_url.pathToFileURL)(prettierConfigPath).href);
78
79
  if (options.tailwindConfig?.startsWith(".")) {
79
80
  options.tailwindConfig = import_path.default.join(
80
81
  process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd(),
@@ -1 +1 @@
1
- {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CAQxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAK3B,CAAA"}
1
+ {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CASxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAM3B,CAAA"}
@@ -35,32 +35,38 @@ __export(installHelpers_exports, {
35
35
  });
36
36
  module.exports = __toCommonJS(installHelpers_exports);
37
37
  var import_execa = __toESM(require("execa"), 1);
38
+ var import_packageManager = require("@cedarjs/project-config/packageManager");
39
+ var import_packageManager2 = require("../packageManager/index.js");
38
40
  var import_paths = require("./paths.js");
39
41
  const addWebPackages = (webPackages) => ({
40
42
  title: "Adding required web packages...",
41
43
  task: async () => {
42
- await (0, import_execa.default)("yarn", ["add", ...webPackages], { cwd: (0, import_paths.getPaths)().web.base });
44
+ const pm = (0, import_packageManager.getPackageManager)();
45
+ await (0, import_execa.default)(pm, [(0, import_packageManager2.add)(), ...webPackages], { cwd: (0, import_paths.getPaths)().web.base });
43
46
  }
44
47
  });
45
48
  const addApiPackages = (apiPackages) => ({
46
49
  title: "Adding required api packages...",
47
50
  task: async () => {
48
- await (0, import_execa.default)("yarn", ["add", ...apiPackages], { cwd: (0, import_paths.getPaths)().api.base });
51
+ const pm = (0, import_packageManager.getPackageManager)();
52
+ await (0, import_execa.default)(pm, [(0, import_packageManager2.add)(), ...apiPackages], { cwd: (0, import_paths.getPaths)().api.base });
49
53
  }
50
54
  });
51
55
  const addRootPackages = (packages, devDependency = false) => {
52
- const addMode = devDependency ? ["add", "-D"] : ["add"];
56
+ const addMode = devDependency ? [(0, import_packageManager2.add)(), "-D"] : [(0, import_packageManager2.add)()];
53
57
  return {
54
58
  title: "Installing packages...",
55
59
  task: async () => {
56
- await (0, import_execa.default)("yarn", [...addMode, ...packages], { cwd: (0, import_paths.getPaths)().base });
60
+ const pm = (0, import_packageManager.getPackageManager)();
61
+ await (0, import_execa.default)(pm, [...addMode, ...packages], { cwd: (0, import_paths.getPaths)().base });
57
62
  }
58
63
  };
59
64
  };
60
65
  const installPackages = {
61
66
  title: "Installing packages...",
62
67
  task: async () => {
63
- await (0, import_execa.default)("yarn", ["install"], { cwd: (0, import_paths.getPaths)().base });
68
+ const pm = (0, import_packageManager.getPackageManager)();
69
+ await (0, import_execa.default)(pm, ["install"], { cwd: (0, import_paths.getPaths)().base });
64
70
  }
65
71
  };
66
72
  // Annotate the CommonJS export names for ESM import in node:
@@ -1 +1 @@
1
- {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAmDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
1
+ {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
@@ -71,7 +71,7 @@ const updateTomlConfig = (packageName) => {
71
71
  const configTomlPath = (0, import_project_config.getConfigPath)();
72
72
  const originalTomlContent = fs.readFileSync(configTomlPath, "utf-8");
73
73
  let tomlToAppend = {};
74
- const config = (0, import_project_config.getConfig)(configTomlPath);
74
+ const config = (0, import_project_config.getConfig)();
75
75
  const cliSection = config.experimental?.cli;
76
76
  if (!cliSection) {
77
77
  tomlToAppend = {
@@ -0,0 +1,13 @@
1
+ export declare function workspacePackageSpecifier(): string;
2
+ export declare function add(): "install" | "add";
3
+ export declare function install(): string;
4
+ export declare function dedupe(): "dedupe" | undefined;
5
+ export declare function dedupeIsSupported(): boolean;
6
+ export declare function installationErrorMessage(): string;
7
+ /**
8
+ * Gets a string suitable for displaying to the user when telling them to run a
9
+ * Cedar bin command, like `yarn cedar upgrade` or
10
+ * `yarn cedar generate page home /`.
11
+ */
12
+ export declare function prettyPrintCedarCommand(args: string[]): string;
13
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packageManager/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAED,wBAAgB,GAAG,sBAGlB;AAED,wBAAgB,OAAO,WAEtB;AAED,wBAAgB,MAAM,yBAMrB;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,wBAAwB,WAYvC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAM9D"}
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var packageManager_exports = {};
20
+ __export(packageManager_exports, {
21
+ add: () => add,
22
+ dedupe: () => dedupe,
23
+ dedupeIsSupported: () => dedupeIsSupported,
24
+ install: () => install,
25
+ installationErrorMessage: () => installationErrorMessage,
26
+ prettyPrintCedarCommand: () => prettyPrintCedarCommand,
27
+ workspacePackageSpecifier: () => workspacePackageSpecifier
28
+ });
29
+ module.exports = __toCommonJS(packageManager_exports);
30
+ var import_packageManager = require("@cedarjs/project-config/packageManager");
31
+ function workspacePackageSpecifier() {
32
+ if ((0, import_packageManager.getPackageManager)() === "npm") {
33
+ return "*";
34
+ }
35
+ return "workspace:*";
36
+ }
37
+ function add() {
38
+ const pm = (0, import_packageManager.getPackageManager)();
39
+ return pm === "npm" ? "install" : "add";
40
+ }
41
+ function install() {
42
+ return "install";
43
+ }
44
+ function dedupe() {
45
+ if ((0, import_packageManager.getPackageManager)() === "yarn") {
46
+ return "dedupe";
47
+ }
48
+ return void 0;
49
+ }
50
+ function dedupeIsSupported() {
51
+ return (0, import_packageManager.getPackageManager)() === "yarn";
52
+ }
53
+ function installationErrorMessage() {
54
+ if ((0, import_packageManager.getPackageManager)() === "yarn") {
55
+ return "Could not finish installation. Please run `yarn install` and then `yarn dedupe`, before continuing";
56
+ }
57
+ return `Could not finish installation. Please run \`${(0, import_packageManager.getPackageManager)()} ${install()}\` before continuing`;
58
+ }
59
+ function prettyPrintCedarCommand(args) {
60
+ const packageManager = (0, import_packageManager.getPackageManager)();
61
+ const packageManagerBin = packageManager === "npm" ? "npx" : packageManager;
62
+ return `${packageManagerBin} cedar ${args.join(" ")}`;
63
+ }
64
+ // Annotate the CommonJS export names for ESM import in node:
65
+ 0 && (module.exports = {
66
+ add,
67
+ dedupe,
68
+ dedupeIsSupported,
69
+ install,
70
+ installationErrorMessage,
71
+ prettyPrintCedarCommand,
72
+ workspacePackageSpecifier
73
+ });
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAoB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
package/dist/lib/index.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import fs from "node:fs";
2
+ import { pathToFileURL } from "node:url";
2
3
  import path from "path";
3
4
  import * as babel from "@babel/core";
4
5
  import { Listr } from "listr2";
@@ -37,7 +38,7 @@ const getPrettierOptions = async () => {
37
38
  const cjsPath = path.join(getPaths().base, "prettier.config.cjs");
38
39
  const mjsPath = path.join(getPaths().base, "prettier.config.mjs");
39
40
  const prettierConfigPath = fs.existsSync(cjsPath) ? cjsPath : mjsPath;
40
- const { default: options } = await import(`file://${prettierConfigPath}`);
41
+ const { default: options } = await import(pathToFileURL(prettierConfigPath).href);
41
42
  if (options.tailwindConfig?.startsWith(".")) {
42
43
  options.tailwindConfig = path.join(
43
44
  process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd(),
@@ -1 +1 @@
1
- {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CAQxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAK3B,CAAA"}
1
+ {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CASxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAM3B,CAAA"}
@@ -1,30 +1,36 @@
1
1
  import execa from "execa";
2
+ import { getPackageManager } from "@cedarjs/project-config/packageManager";
3
+ import { add } from "../packageManager/index.js";
2
4
  import { getPaths } from "./paths.js";
3
5
  const addWebPackages = (webPackages) => ({
4
6
  title: "Adding required web packages...",
5
7
  task: async () => {
6
- await execa("yarn", ["add", ...webPackages], { cwd: getPaths().web.base });
8
+ const pm = getPackageManager();
9
+ await execa(pm, [add(), ...webPackages], { cwd: getPaths().web.base });
7
10
  }
8
11
  });
9
12
  const addApiPackages = (apiPackages) => ({
10
13
  title: "Adding required api packages...",
11
14
  task: async () => {
12
- await execa("yarn", ["add", ...apiPackages], { cwd: getPaths().api.base });
15
+ const pm = getPackageManager();
16
+ await execa(pm, [add(), ...apiPackages], { cwd: getPaths().api.base });
13
17
  }
14
18
  });
15
19
  const addRootPackages = (packages, devDependency = false) => {
16
- const addMode = devDependency ? ["add", "-D"] : ["add"];
20
+ const addMode = devDependency ? [add(), "-D"] : [add()];
17
21
  return {
18
22
  title: "Installing packages...",
19
23
  task: async () => {
20
- await execa("yarn", [...addMode, ...packages], { cwd: getPaths().base });
24
+ const pm = getPackageManager();
25
+ await execa(pm, [...addMode, ...packages], { cwd: getPaths().base });
21
26
  }
22
27
  };
23
28
  };
24
29
  const installPackages = {
25
30
  title: "Installing packages...",
26
31
  task: async () => {
27
- await execa("yarn", ["install"], { cwd: getPaths().base });
32
+ const pm = getPackageManager();
33
+ await execa(pm, ["install"], { cwd: getPaths().base });
28
34
  }
29
35
  };
30
36
  export {
@@ -1 +1 @@
1
- {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAmDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
1
+ {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
@@ -34,7 +34,7 @@ const updateTomlConfig = (packageName) => {
34
34
  const configTomlPath = getConfigPath();
35
35
  const originalTomlContent = fs.readFileSync(configTomlPath, "utf-8");
36
36
  let tomlToAppend = {};
37
- const config = getConfig(configTomlPath);
37
+ const config = getConfig();
38
38
  const cliSection = config.experimental?.cli;
39
39
  if (!cliSection) {
40
40
  tomlToAppend = {
@@ -0,0 +1,13 @@
1
+ export declare function workspacePackageSpecifier(): string;
2
+ export declare function add(): "install" | "add";
3
+ export declare function install(): string;
4
+ export declare function dedupe(): "dedupe" | undefined;
5
+ export declare function dedupeIsSupported(): boolean;
6
+ export declare function installationErrorMessage(): string;
7
+ /**
8
+ * Gets a string suitable for displaying to the user when telling them to run a
9
+ * Cedar bin command, like `yarn cedar upgrade` or
10
+ * `yarn cedar generate page home /`.
11
+ */
12
+ export declare function prettyPrintCedarCommand(args: string[]): string;
13
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/packageManager/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAED,wBAAgB,GAAG,sBAGlB;AAED,wBAAgB,OAAO,WAEtB;AAED,wBAAgB,MAAM,yBAMrB;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,wBAAwB,WAYvC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAM9D"}
@@ -0,0 +1,43 @@
1
+ import { getPackageManager } from "@cedarjs/project-config/packageManager";
2
+ function workspacePackageSpecifier() {
3
+ if (getPackageManager() === "npm") {
4
+ return "*";
5
+ }
6
+ return "workspace:*";
7
+ }
8
+ function add() {
9
+ const pm = getPackageManager();
10
+ return pm === "npm" ? "install" : "add";
11
+ }
12
+ function install() {
13
+ return "install";
14
+ }
15
+ function dedupe() {
16
+ if (getPackageManager() === "yarn") {
17
+ return "dedupe";
18
+ }
19
+ return void 0;
20
+ }
21
+ function dedupeIsSupported() {
22
+ return getPackageManager() === "yarn";
23
+ }
24
+ function installationErrorMessage() {
25
+ if (getPackageManager() === "yarn") {
26
+ return "Could not finish installation. Please run `yarn install` and then `yarn dedupe`, before continuing";
27
+ }
28
+ return `Could not finish installation. Please run \`${getPackageManager()} ${install()}\` before continuing`;
29
+ }
30
+ function prettyPrintCedarCommand(args) {
31
+ const packageManager = getPackageManager();
32
+ const packageManagerBin = packageManager === "npm" ? "npx" : packageManager;
33
+ return `${packageManagerBin} cedar ${args.join(" ")}`;
34
+ }
35
+ export {
36
+ add,
37
+ dedupe,
38
+ dedupeIsSupported,
39
+ install,
40
+ installationErrorMessage,
41
+ prettyPrintCedarCommand,
42
+ workspacePackageSpecifier
43
+ };
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAoB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CAQxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAK3B,CAAA"}
1
+ {"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CASxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAM3B,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAmDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
1
+ {"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=index.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/packageManager/__tests__/index.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,13 @@
1
+ export declare function workspacePackageSpecifier(): string;
2
+ export declare function add(): "install" | "add";
3
+ export declare function install(): string;
4
+ export declare function dedupe(): "dedupe" | undefined;
5
+ export declare function dedupeIsSupported(): boolean;
6
+ export declare function installationErrorMessage(): string;
7
+ /**
8
+ * Gets a string suitable for displaying to the user when telling them to run a
9
+ * Cedar bin command, like `yarn cedar upgrade` or
10
+ * `yarn cedar generate page home /`.
11
+ */
12
+ export declare function prettyPrintCedarCommand(args: string[]): string;
13
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packageManager/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAED,wBAAgB,GAAG,sBAGlB;AAED,wBAAgB,OAAO,WAEtB;AAED,wBAAgB,MAAM,yBAMrB;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,wBAAwB,WAYvC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAM9D"}