@catladder/cli 0.0.0-next-f7cb33fb → 0.0.0-next-41642e39

package/dist/bundles/catenv/index.js

@@ -5203,7 +5203,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
-const lodash_es_1 = __nccwpck_require__(50866);
 const path_1 = __nccwpck_require__(16928);
 const slugify_1 = __importDefault(__nccwpck_require__(21396));
 /**
@@ -5212,15 +5211,37 @@ const slugify_1 = __importDefault(__nccwpck_require__(21396));
  * exact-lockfile hit (github skips the ~0.6GB download on warm runs)
  */
 const NODE_MODULES_CACHE_ID = "node-modules";
-const getYarnCache = async (context, policy = "pull-push") => {
+/**
+ * the directory whose caches this job uses. Components that are part of
+ * a shared workspace use the workspace root's caches: the install
+ * operates on the whole workspace, and the workspace build job is the
+ * one that populates the slots. Historically these component jobs
+ * (verify, docker) read a separate key family that no job ever saved,
+ * so they always started cold. Standalone components and the workspace
+ * jobs themselves keep using their own build dir (unchanged keys).
+ */
+const getCacheBaseDir = async (context) => {
+    var _a;
     const packageManagerInfo = await context.packageManagerInfo;
     const componentIsInWorkspace = context.type === "component" &&
         "componentIsInWorkspace" in packageManagerInfo &&
         packageManagerInfo.componentIsInWorkspace;
+    if (!componentIsInWorkspace)
+        return context.build.dir;
+    // the workspace build's dir when the component references one,
+    // otherwise the repo root (packageManager.ts resolves workspace
+    // membership against the root)
+    return context.build.type === "fromWorkspace"
+        ? ((_a = context.build.workspaceBuildConfig.dir) !== null && _a !== void 0 ? _a : ".")
+        : ".";
+};
+const getYarnCache = async (context, policy = "pull-push") => {
+    const baseDir = await getCacheBaseDir(context);
     return [
         {
-            scope: componentIsInWorkspace ? "global" : "buildDir",
-            pathMode: componentIsInWorkspace ? "absolute" : "relative",
+            scope: "buildDir",
+            pathMode: "relative",
+            buildDir: baseDir,
             key: "yarn",
             policy,
             paths: [".yarn"],
@@ -5237,52 +5258,28 @@ const getYarnCache = async (context, policy = "pull-push") => {
 };
 exports.getYarnCache = getYarnCache;
 const getNodeModulesCache = async (context, policy = "pull-push") => {
-    var _a, _b;
     const packageManagerInfo = await context.packageManagerInfo;
-    const componentIsInWorkspace = context.type === "component" &&
-        "componentIsInWorkspace" in packageManagerInfo &&
-        packageManagerInfo.componentIsInWorkspace;
-    const { isClassic, workspaces } = packageManagerInfo;
+    const baseDir = await getCacheBaseDir(context);
+    const { isClassic } = packageManagerInfo;
     // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
     // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
     return [
         {
             scope: "global",
             pathMode: "absolute",
-            // if component is in a shared workspace, use workspace cache. use individual cache else
-            key: componentIsInWorkspace
-                ? "node-modules-workspace"
-                : (0, slugify_1.default)(context.build.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            key: (0, slugify_1.default)(baseDir) + "-node-modules",
             // content-key for immutable-cache backends (github); the lockfile
             // decides whether the cached content could have changed (absolute
-            // pathMode: resolve the standalone component's lockfile explicitly)
-            keyFiles: [
-                componentIsInWorkspace
-                    ? "yarn.lock"
-                    : (0, path_1.join)(context.build.dir, "yarn.lock"),
-            ],
+            // pathMode: resolve the lockfile explicitly)
+            keyFiles: [(0, path_1.join)(baseDir, "yarn.lock")],
             // referenced by the yarn cache: an exact hit here makes the yarn
             // zips unnecessary (see redundantOnExactHitOf on getYarnCache)
             cacheId: NODE_MODULES_CACHE_ID,
             policy,
             paths: [
-                ...(componentIsInWorkspace
-                    ? (0, lodash_es_1.uniq)([
-                        "node_modules",
-                        ...((_a = workspaces.map((w) => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []),
-                        ...(!isClassic
-                            ? [
-                                ".yarn/install-state.gz",
-                                ...((_b = workspaces.map((w) => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : []),
-                            ]
-                            : []),
-                    ])
-                    : [
-                        (0, path_1.join)(context.build.dir, "node_modules"),
-                        ...(!isClassic
-                            ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")]
-                            : []),
-                    ]),
+                (0, path_1.join)(baseDir, "node_modules"),
+                ...(!isClassic ? [(0, path_1.join)(baseDir, ".yarn/install-state.gz")] : []),
             ],
         },
     ];

package/dist/bundles/cli/index.js

@@ -11196,7 +11196,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
-const lodash_es_1 = __nccwpck_require__(50866);
 const path_1 = __nccwpck_require__(16928);
 const slugify_1 = __importDefault(__nccwpck_require__(21396));
 /**
@@ -11205,15 +11204,37 @@ const slugify_1 = __importDefault(__nccwpck_require__(21396));
  * exact-lockfile hit (github skips the ~0.6GB download on warm runs)
  */
 const NODE_MODULES_CACHE_ID = "node-modules";
-const getYarnCache = async (context, policy = "pull-push") => {
+/**
+ * the directory whose caches this job uses. Components that are part of
+ * a shared workspace use the workspace root's caches: the install
+ * operates on the whole workspace, and the workspace build job is the
+ * one that populates the slots. Historically these component jobs
+ * (verify, docker) read a separate key family that no job ever saved,
+ * so they always started cold. Standalone components and the workspace
+ * jobs themselves keep using their own build dir (unchanged keys).
+ */
+const getCacheBaseDir = async (context) => {
+    var _a;
     const packageManagerInfo = await context.packageManagerInfo;
     const componentIsInWorkspace = context.type === "component" &&
         "componentIsInWorkspace" in packageManagerInfo &&
         packageManagerInfo.componentIsInWorkspace;
+    if (!componentIsInWorkspace)
+        return context.build.dir;
+    // the workspace build's dir when the component references one,
+    // otherwise the repo root (packageManager.ts resolves workspace
+    // membership against the root)
+    return context.build.type === "fromWorkspace"
+        ? ((_a = context.build.workspaceBuildConfig.dir) !== null && _a !== void 0 ? _a : ".")
+        : ".";
+};
+const getYarnCache = async (context, policy = "pull-push") => {
+    const baseDir = await getCacheBaseDir(context);
     return [
         {
-            scope: componentIsInWorkspace ? "global" : "buildDir",
-            pathMode: componentIsInWorkspace ? "absolute" : "relative",
+            scope: "buildDir",
+            pathMode: "relative",
+            buildDir: baseDir,
             key: "yarn",
             policy,
             paths: [".yarn"],
@@ -11230,52 +11251,28 @@ const getYarnCache = async (context, policy = "pull-push") => {
 };
 exports.getYarnCache = getYarnCache;
 const getNodeModulesCache = async (context, policy = "pull-push") => {
-    var _a, _b;
     const packageManagerInfo = await context.packageManagerInfo;
-    const componentIsInWorkspace = context.type === "component" &&
-        "componentIsInWorkspace" in packageManagerInfo &&
-        packageManagerInfo.componentIsInWorkspace;
-    const { isClassic, workspaces } = packageManagerInfo;
+    const baseDir = await getCacheBaseDir(context);
+    const { isClassic } = packageManagerInfo;
     // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
     // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
     return [
         {
             scope: "global",
             pathMode: "absolute",
-            // if component is in a shared workspace, use workspace cache. use individual cache else
-            key: componentIsInWorkspace
-                ? "node-modules-workspace"
-                : (0, slugify_1.default)(context.build.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            key: (0, slugify_1.default)(baseDir) + "-node-modules",
             // content-key for immutable-cache backends (github); the lockfile
             // decides whether the cached content could have changed (absolute
-            // pathMode: resolve the standalone component's lockfile explicitly)
-            keyFiles: [
-                componentIsInWorkspace
-                    ? "yarn.lock"
-                    : (0, path_1.join)(context.build.dir, "yarn.lock"),
-            ],
+            // pathMode: resolve the lockfile explicitly)
+            keyFiles: [(0, path_1.join)(baseDir, "yarn.lock")],
             // referenced by the yarn cache: an exact hit here makes the yarn
             // zips unnecessary (see redundantOnExactHitOf on getYarnCache)
             cacheId: NODE_MODULES_CACHE_ID,
             policy,
             paths: [
-                ...(componentIsInWorkspace
-                    ? (0, lodash_es_1.uniq)([
-                        "node_modules",
-                        ...((_a = workspaces.map((w) => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []),
-                        ...(!isClassic
-                            ? [
-                                ".yarn/install-state.gz",
-                                ...((_b = workspaces.map((w) => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : []),
-                            ]
-                            : []),
-                    ])
-                    : [
-                        (0, path_1.join)(context.build.dir, "node_modules"),
-                        ...(!isClassic
-                            ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")]
-                            : []),
-                    ]),
+                (0, path_1.join)(baseDir, "node_modules"),
+                ...(!isClassic ? [(0, path_1.join)(baseDir, ".yarn/install-state.gz")] : []),
             ],
         },
     ];

package/dist/packages/pipeline/src/build/node/cache.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
-const lodash_es_1 = require("lodash-es");
 const path_1 = require("path");
 const slugify_1 = __importDefault(require("slugify"));
 /**
@@ -13,15 +12,37 @@ const slugify_1 = __importDefault(require("slugify"));
  * exact-lockfile hit (github skips the ~0.6GB download on warm runs)
  */
 const NODE_MODULES_CACHE_ID = "node-modules";
-const getYarnCache = async (context, policy = "pull-push") => {
+/**
+ * the directory whose caches this job uses. Components that are part of
+ * a shared workspace use the workspace root's caches: the install
+ * operates on the whole workspace, and the workspace build job is the
+ * one that populates the slots. Historically these component jobs
+ * (verify, docker) read a separate key family that no job ever saved,
+ * so they always started cold. Standalone components and the workspace
+ * jobs themselves keep using their own build dir (unchanged keys).
+ */
+const getCacheBaseDir = async (context) => {
+    var _a;
     const packageManagerInfo = await context.packageManagerInfo;
     const componentIsInWorkspace = context.type === "component" &&
         "componentIsInWorkspace" in packageManagerInfo &&
         packageManagerInfo.componentIsInWorkspace;
+    if (!componentIsInWorkspace)
+        return context.build.dir;
+    // the workspace build's dir when the component references one,
+    // otherwise the repo root (packageManager.ts resolves workspace
+    // membership against the root)
+    return context.build.type === "fromWorkspace"
+        ? ((_a = context.build.workspaceBuildConfig.dir) !== null && _a !== void 0 ? _a : ".")
+        : ".";
+};
+const getYarnCache = async (context, policy = "pull-push") => {
+    const baseDir = await getCacheBaseDir(context);
     return [
         {
-            scope: componentIsInWorkspace ? "global" : "buildDir",
-            pathMode: componentIsInWorkspace ? "absolute" : "relative",
+            scope: "buildDir",
+            pathMode: "relative",
+            buildDir: baseDir,
             key: "yarn",
             policy,
             paths: [".yarn"],
@@ -38,52 +59,28 @@ const getYarnCache = async (context, policy = "pull-push") => {
 };
 exports.getYarnCache = getYarnCache;
 const getNodeModulesCache = async (context, policy = "pull-push") => {
-    var _a, _b;
     const packageManagerInfo = await context.packageManagerInfo;
-    const componentIsInWorkspace = context.type === "component" &&
-        "componentIsInWorkspace" in packageManagerInfo &&
-        packageManagerInfo.componentIsInWorkspace;
-    const { isClassic, workspaces } = packageManagerInfo;
+    const baseDir = await getCacheBaseDir(context);
+    const { isClassic } = packageManagerInfo;
     // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
     // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
     return [
         {
             scope: "global",
             pathMode: "absolute",
-            // if component is in a shared workspace, use workspace cache. use individual cache else
-            key: componentIsInWorkspace
-                ? "node-modules-workspace"
-                : (0, slugify_1.default)(context.build.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+            key: (0, slugify_1.default)(baseDir) + "-node-modules",
             // content-key for immutable-cache backends (github); the lockfile
             // decides whether the cached content could have changed (absolute
-            // pathMode: resolve the standalone component's lockfile explicitly)
-            keyFiles: [
-                componentIsInWorkspace
-                    ? "yarn.lock"
-                    : (0, path_1.join)(context.build.dir, "yarn.lock"),
-            ],
+            // pathMode: resolve the lockfile explicitly)
+            keyFiles: [(0, path_1.join)(baseDir, "yarn.lock")],
             // referenced by the yarn cache: an exact hit here makes the yarn
             // zips unnecessary (see redundantOnExactHitOf on getYarnCache)
             cacheId: NODE_MODULES_CACHE_ID,
             policy,
             paths: [
-                ...(componentIsInWorkspace
-                    ? (0, lodash_es_1.uniq)([
-                        "node_modules",
-                        ...((_a = workspaces.map((w) => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []),
-                        ...(!isClassic
-                            ? [
-                                ".yarn/install-state.gz",
-                                ...((_b = workspaces.map((w) => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : []),
-                            ]
-                            : []),
-                    ])
-                    : [
-                        (0, path_1.join)(context.build.dir, "node_modules"),
-                        ...(!isClassic
-                            ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")]
-                            : []),
-                    ]),
+                (0, path_1.join)(baseDir, "node_modules"),
+                ...(!isClassic ? [(0, path_1.join)(baseDir, ".yarn/install-state.gz")] : []),
             ],
         },
     ];

package/dist/packages/pipeline/src/build/node/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}