skuba 14.0.0-rfc-pnpm-config-skuba-20260106230402 → 14.0.0-rfc-pnpm-config-skuba-20260107001655
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/lib/cli/init/index.js +2 -8
- package/lib/cli/init/index.js.map +2 -2
- package/lib/cli/init/installPnpmPlugin.d.ts +2 -0
- package/lib/cli/init/installPnpmPlugin.js +34 -0
- package/lib/cli/init/installPnpmPlugin.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.js +4 -11
- package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.js.map +2 -2
- package/package.json +5 -5
- package/template/greeter/package.json +2 -2
- package/template/lambda-sqs-worker-cdk/package.json +2 -2
package/lib/cli/init/index.js
CHANGED
|
@@ -47,6 +47,7 @@ var import_prettier = require("../adapter/prettier.js");
|
|
|
47
47
|
var import_patchRenovateConfig = require("../lint/internalLints/patchRenovateConfig.js");
|
|
48
48
|
var import_getConfig = require("./getConfig.js");
|
|
49
49
|
var import_git = require("./git.js");
|
|
50
|
+
var import_installPnpmPlugin = require("./installPnpmPlugin.js");
|
|
50
51
|
var import_writePackageJson = require("./writePackageJson.js");
|
|
51
52
|
var Git = __toESM(require("@skuba-lib/api/git"));
|
|
52
53
|
const init = async (args = process.argv.slice(2)) => {
|
|
@@ -110,7 +111,6 @@ const init = async (args = process.argv.slice(2)) => {
|
|
|
110
111
|
if (!manifest) {
|
|
111
112
|
throw new Error("Repository doesn't contain a package.json file.");
|
|
112
113
|
}
|
|
113
|
-
const pnpmPluginSkubaVersion = skubaManifest.devDependencies?.["pnpm-plugin-skuba"] || "latest";
|
|
114
114
|
if (packageManager === "pnpm") {
|
|
115
115
|
if (process.env.SKUBA_INTEGRATION_TEST === "true") {
|
|
116
116
|
await import_fs_extra.default.promises.symlink(
|
|
@@ -118,13 +118,7 @@ const init = async (args = process.argv.slice(2)) => {
|
|
|
118
118
|
import_path.default.join(destinationDir, ".pnpmfile.cjs")
|
|
119
119
|
);
|
|
120
120
|
} else {
|
|
121
|
-
await
|
|
122
|
-
packageManager,
|
|
123
|
-
"add",
|
|
124
|
-
"--config",
|
|
125
|
-
`pnpm-plugin-skuba@${pnpmPluginSkubaVersion}`,
|
|
126
|
-
"--workspace"
|
|
127
|
-
);
|
|
121
|
+
await (0, import_installPnpmPlugin.installPnpmPlugin)(skubaManifest);
|
|
128
122
|
}
|
|
129
123
|
}
|
|
130
124
|
await (0, import_patchRenovateConfig.tryPatchRenovateConfig)({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/cli/init/index.ts"],
|
|
4
|
-
"sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { hasDebugFlag } from '../../utils/args.js';\nimport { copyFiles, createEjsRenderer } from '../../utils/copy.js';\nimport { createInclusionFilter } from '../../utils/dir.js';\nimport { createExec, ensureCommands } from '../../utils/exec.js';\nimport { createLogger, log } from '../../utils/logging.js';\nimport { showLogoAndVersionInfo } from '../../utils/logo.js';\nimport { getConsumerManifest, getSkubaManifest } from '../../utils/manifest.js';\nimport { detectPackageManager } from '../../utils/packageManager.js';\nimport {\n BASE_TEMPLATE_DIR,\n ensureTemplateConfigDeletion,\n} from '../../utils/template.js';\nimport { runPrettier } from '../adapter/prettier.js';\nimport { tryPatchRenovateConfig } from '../lint/internalLints/patchRenovateConfig.js';\n\nimport { getConfig } from './getConfig.js';\nimport { initialiseRepo } from './git.js';\nimport type { Input } from './types.js';\nimport { writePackageJson } from './writePackageJson.js';\n\nimport * as Git from '@skuba-lib/api/git';\n\nexport const init = async (args = process.argv.slice(2)) => {\n const opts: Input = {\n debug: hasDebugFlag(args),\n };\n\n const skubaVersionInfo = await showLogoAndVersionInfo();\n\n const {\n destinationDir,\n entryPoint,\n packageManager,\n templateComplete,\n templateData,\n templateName,\n type,\n } = await getConfig();\n\n await ensureCommands(packageManager);\n\n const include = await createInclusionFilter([\n path.join(destinationDir, '.gitignore'),\n path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n ]);\n\n const processors = [createEjsRenderer(templateData)];\n\n await copyFiles({\n sourceRoot: BASE_TEMPLATE_DIR,\n destinationRoot: destinationDir,\n include,\n // prefer template-specific files\n overwrite: false,\n processors,\n // base template has files like _eslint.config.js\n stripUnderscorePrefix: true,\n });\n\n await copyFiles({\n sourceRoot: destinationDir,\n destinationRoot: destinationDir,\n include,\n processors,\n });\n\n await Promise.all([\n templateComplete\n ? ensureTemplateConfigDeletion(destinationDir)\n : Promise.resolve(),\n\n writePackageJson({\n cwd: destinationDir,\n entryPoint,\n template: templateName,\n type,\n version: skubaVersionInfo.local,\n }),\n ]);\n\n const exec = createExec({\n cwd: destinationDir,\n stdio: 'pipe',\n streamStdio: packageManager,\n });\n\n log.newline();\n await initialiseRepo(destinationDir, templateData);\n\n const [manifest, packageManagerConfig, skubaManifest] = await Promise.all([\n getConsumerManifest(destinationDir),\n detectPackageManager(destinationDir),\n getSkubaManifest(),\n ]);\n\n if (!manifest) {\n throw new Error(\"Repository doesn't contain a package.json file.\");\n }\n\n
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAEf,kBAA6B;AAC7B,kBAA6C;AAC7C,iBAAsC;AACtC,kBAA2C;AAC3C,qBAAkC;AAClC,kBAAuC;AACvC,sBAAsD;AACtD,4BAAqC;AACrC,sBAGO;AACP,sBAA4B;AAC5B,iCAAuC;AAEvC,uBAA0B;AAC1B,iBAA+B;
|
|
4
|
+
"sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { hasDebugFlag } from '../../utils/args.js';\nimport { copyFiles, createEjsRenderer } from '../../utils/copy.js';\nimport { createInclusionFilter } from '../../utils/dir.js';\nimport { createExec, ensureCommands } from '../../utils/exec.js';\nimport { createLogger, log } from '../../utils/logging.js';\nimport { showLogoAndVersionInfo } from '../../utils/logo.js';\nimport { getConsumerManifest, getSkubaManifest } from '../../utils/manifest.js';\nimport { detectPackageManager } from '../../utils/packageManager.js';\nimport {\n BASE_TEMPLATE_DIR,\n ensureTemplateConfigDeletion,\n} from '../../utils/template.js';\nimport { runPrettier } from '../adapter/prettier.js';\nimport { tryPatchRenovateConfig } from '../lint/internalLints/patchRenovateConfig.js';\n\nimport { getConfig } from './getConfig.js';\nimport { initialiseRepo } from './git.js';\nimport { installPnpmPlugin } from './installPnpmPlugin.js';\nimport type { Input } from './types.js';\nimport { writePackageJson } from './writePackageJson.js';\n\nimport * as Git from '@skuba-lib/api/git';\n\nexport const init = async (args = process.argv.slice(2)) => {\n const opts: Input = {\n debug: hasDebugFlag(args),\n };\n\n const skubaVersionInfo = await showLogoAndVersionInfo();\n\n const {\n destinationDir,\n entryPoint,\n packageManager,\n templateComplete,\n templateData,\n templateName,\n type,\n } = await getConfig();\n\n await ensureCommands(packageManager);\n\n const include = await createInclusionFilter([\n path.join(destinationDir, '.gitignore'),\n path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n ]);\n\n const processors = [createEjsRenderer(templateData)];\n\n await copyFiles({\n sourceRoot: BASE_TEMPLATE_DIR,\n destinationRoot: destinationDir,\n include,\n // prefer template-specific files\n overwrite: false,\n processors,\n // base template has files like _eslint.config.js\n stripUnderscorePrefix: true,\n });\n\n await copyFiles({\n sourceRoot: destinationDir,\n destinationRoot: destinationDir,\n include,\n processors,\n });\n\n await Promise.all([\n templateComplete\n ? ensureTemplateConfigDeletion(destinationDir)\n : Promise.resolve(),\n\n writePackageJson({\n cwd: destinationDir,\n entryPoint,\n template: templateName,\n type,\n version: skubaVersionInfo.local,\n }),\n ]);\n\n const exec = createExec({\n cwd: destinationDir,\n stdio: 'pipe',\n streamStdio: packageManager,\n });\n\n log.newline();\n await initialiseRepo(destinationDir, templateData);\n\n const [manifest, packageManagerConfig, skubaManifest] = await Promise.all([\n getConsumerManifest(destinationDir),\n detectPackageManager(destinationDir),\n getSkubaManifest(),\n ]);\n\n if (!manifest) {\n throw new Error(\"Repository doesn't contain a package.json file.\");\n }\n\n if (packageManager === 'pnpm') {\n if (process.env.SKUBA_INTEGRATION_TEST === 'true') {\n await fs.promises.symlink(\n path.resolve('../skuba/packages/pnpm-plugin-skuba/pnpmfile.cjs'),\n path.join(destinationDir, '.pnpmfile.cjs'),\n );\n } else {\n await installPnpmPlugin(skubaManifest);\n }\n }\n\n // Patch in a baseline Renovate preset based on the configured Git owner.\n await tryPatchRenovateConfig({\n mode: 'format',\n dir: destinationDir,\n manifest,\n packageManager: packageManagerConfig,\n });\n\n const skubaSlug = `skuba@${skubaVersionInfo.local}`;\n\n let depsInstalled = false;\n try {\n // The `-D` shorthand is portable across our package managers.\n await exec(packageManager, 'add', '-D', skubaSlug);\n\n // Templating can initially leave certain files in an unformatted state;\n // consider a Markdown table with columns sized based on content length.\n await runPrettier(\n 'format',\n createLogger({ debug: opts.debug }),\n destinationDir,\n );\n\n depsInstalled = true;\n } catch (err) {\n log.warn(inspect(err));\n }\n\n await Git.commitAllChanges({\n dir: destinationDir,\n message: `Clone ${templateName}`,\n });\n\n const logGitHubRepoCreation = () => {\n log.plain(\n 'Next, create an empty',\n log.bold(`${templateData.orgName}/${templateData.repoName}`),\n 'repository:',\n );\n log.ok('https://github.com/new');\n };\n\n if (!depsInstalled) {\n log.newline();\n log.warn(log.bold('\u2717 Failed to install dependencies.'));\n\n log.newline();\n logGitHubRepoCreation();\n\n log.newline();\n log.plain('Then, resume initialisation:');\n log.ok('cd', destinationDir);\n // The `-D` shorthand is portable across our package managers.\n log.ok(packageManager, 'add', '-D', skubaSlug);\n log.ok(packageManager, 'run', 'format');\n log.ok('git add --all');\n log.ok('git commit --message', `'Pin ${skubaSlug}'`);\n log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n log.newline();\n process.exitCode = 1;\n return;\n }\n\n log.newline();\n log.ok(log.bold('\u2714 Project initialised!'));\n\n log.newline();\n logGitHubRepoCreation();\n\n log.newline();\n log.plain('Then, push your local changes:');\n log.ok('cd', destinationDir);\n log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n log.newline();\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["path", "fs"]
|
|
7
7
|
}
|
|
@@ -0,0 +1,34 @@
|
|
|
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 installPnpmPlugin_exports = {};
|
|
20
|
+
__export(installPnpmPlugin_exports, {
|
|
21
|
+
installPnpmPlugin: () => installPnpmPlugin
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(installPnpmPlugin_exports);
|
|
24
|
+
var import_exec = require("../../utils/exec.js");
|
|
25
|
+
const installPnpmPlugin = async (skubaManifest) => {
|
|
26
|
+
const version = skubaManifest.devDependencies?.["pnpm-plugin-skuba"] || "latest";
|
|
27
|
+
await (0, import_exec.exec)("pnpm", "add", "--config", `pnpm-plugin-skuba@${version}`);
|
|
28
|
+
await (0, import_exec.exec)("pnpm", "install", "--frozen-lockfile=false", "--offline");
|
|
29
|
+
};
|
|
30
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
31
|
+
0 && (module.exports = {
|
|
32
|
+
installPnpmPlugin
|
|
33
|
+
});
|
|
34
|
+
//# sourceMappingURL=installPnpmPlugin.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/cli/init/installPnpmPlugin.ts"],
|
|
4
|
+
"sourcesContent": ["import type { NormalizedPackageJson } from 'read-pkg-up';\n\nimport { exec } from '../../utils/exec.js';\n\nexport const installPnpmPlugin = async (\n skubaManifest: NormalizedPackageJson,\n): Promise<void> => {\n const version =\n skubaManifest.devDependencies?.['pnpm-plugin-skuba'] || 'latest';\n\n await exec('pnpm', 'add', '--config', `pnpm-plugin-skuba@${version}`);\n\n // Run install to ensure that the pnpmfileChecksum gets written\n await exec('pnpm', 'install', '--frozen-lockfile=false', '--offline');\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,kBAAqB;AAEd,MAAM,oBAAoB,OAC/B,kBACkB;AAClB,QAAM,UACJ,cAAc,kBAAkB,mBAAmB,KAAK;AAE1D,YAAM,kBAAK,QAAQ,OAAO,YAAY,qBAAqB,OAAO,EAAE;AAGpE,YAAM,kBAAK,QAAQ,WAAW,2BAA2B,WAAW;AACtE;",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
|
@@ -38,6 +38,7 @@ var import_semver = require("semver");
|
|
|
38
38
|
var import_exec = require("../../../../../../utils/exec.js");
|
|
39
39
|
var import_logging = require("../../../../../../utils/logging.js");
|
|
40
40
|
var import_manifest = require("../../../../../../utils/manifest.js");
|
|
41
|
+
var import_installPnpmPlugin = require("../../../../../init/installPnpmPlugin.js");
|
|
41
42
|
const migrateToPnpmConfig = async ({
|
|
42
43
|
mode
|
|
43
44
|
}) => {
|
|
@@ -83,14 +84,13 @@ ${endSection}`
|
|
|
83
84
|
if (packageJson?.packageJson.minimumReleaseAgeExcludeOverload && Array.isArray(packageJson.packageJson.minimumReleaseAgeExcludeOverload)) {
|
|
84
85
|
modifiedPnpmWorkspace += `
|
|
85
86
|
minimumReleaseAgeExclude:
|
|
86
|
-
${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => ` - ${item}`).join("\n")}
|
|
87
|
+
${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => ` - '${item}'`).join("\n")}
|
|
87
88
|
`;
|
|
88
89
|
delete packageJson.packageJson.minimumReleaseAgeExcludeOverload;
|
|
89
90
|
}
|
|
90
91
|
if (typeof packageJson?.packageJson.packageManager === "string") {
|
|
91
92
|
const version = packageJson.packageJson.packageManager.split("@")?.[1]?.split("+")?.[0];
|
|
92
|
-
|
|
93
|
-
if (typeof cleanVersion === "string" && (0, import_semver.lt)(new import_semver.SemVer(cleanVersion), new import_semver.SemVer("10.26.2"))) {
|
|
93
|
+
if (typeof version === "string" && (0, import_semver.lt)(new import_semver.SemVer(version), new import_semver.SemVer("10.26.2"))) {
|
|
94
94
|
packageJson.packageJson.packageManager = "pnpm@10.26.2";
|
|
95
95
|
}
|
|
96
96
|
}
|
|
@@ -111,14 +111,7 @@ ${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => ` - ${
|
|
|
111
111
|
import_fs_extra.default.promises.writeFile("pnpm-workspace.yaml", modifiedPnpmWorkspace, "utf8"),
|
|
112
112
|
stringifiedPackageJson && import_fs_extra.default.promises.writeFile(packageJson.path, stringifiedPackageJson, "utf8")
|
|
113
113
|
]);
|
|
114
|
-
|
|
115
|
-
await (0, import_exec.exec)(
|
|
116
|
-
"pnpm",
|
|
117
|
-
"add",
|
|
118
|
-
"--config",
|
|
119
|
-
`pnpm-plugin-skuba@${pnpmPluginSkubaVersion}`,
|
|
120
|
-
"--workspace"
|
|
121
|
-
);
|
|
114
|
+
await (0, import_installPnpmPlugin.installPnpmPlugin)(skubaPackageJson);
|
|
122
115
|
await (0, import_exec.exec)("pnpm", "install", "--offline");
|
|
123
116
|
return {
|
|
124
117
|
result: "apply"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.ts"],
|
|
4
|
-
"sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport { SemVer, lt } from 'semver';\n\nimport { exec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport {\n getConsumerManifest,\n getSkubaManifest,\n} from '../../../../../../utils/manifest.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nexport const migrateToPnpmConfig: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n let pnpmWorkSpaceFile: string;\n try {\n pnpmWorkSpaceFile = await fs.promises.readFile(\n 'pnpm-workspace.yaml',\n 'utf8',\n );\n } catch {\n return {\n result: 'skip',\n reason: 'no pnpm-workspace.yaml found',\n };\n }\n\n // Remove entire # managed by skuba comments block\n\n const startingIndexText = '# managed by skuba';\n const endOfSectionIndexText = '# end managed by skuba\\n';\n\n const startingIndex = pnpmWorkSpaceFile.indexOf(startingIndexText);\n const endOfSectionIndex = pnpmWorkSpaceFile.indexOf(endOfSectionIndexText);\n\n if (startingIndex === -1 || endOfSectionIndex === -1) {\n return {\n result: 'skip',\n reason: 'no managed by skuba comment block found',\n };\n }\n\n const endSection = pnpmWorkSpaceFile.slice(\n endOfSectionIndex + endOfSectionIndexText.length,\n );\n\n let modifiedPnpmWorkspace =\n pnpmWorkSpaceFile.slice(0, startingIndex) + endSection;\n\n // Check if consumers have extended the publicHoistPattern section\n // Only match if the first non-empty, non-comment line is a list item without a preceding key\n const brokenYamlPatternRegex = /^\\s*-\\s+[^#]/;\n const firstNonEmptyNonCommentLine = endSection\n .split('\\n')\n .find((line) => line.trim() && !line.trim().startsWith('#'));\n if (\n firstNonEmptyNonCommentLine &&\n brokenYamlPatternRegex.exec(firstNonEmptyNonCommentLine)\n ) {\n modifiedPnpmWorkspace = modifiedPnpmWorkspace.replace(\n endSection,\n `publicHoistPattern:\\n${endSection}`,\n );\n }\n\n // Migrate minimumReleaseAgeExcludeOverload\n const [packageJson, skubaPackageJson] = await Promise.all([\n getConsumerManifest(),\n getSkubaManifest(),\n ]);\n\n if (\n packageJson?.packageJson.minimumReleaseAgeExcludeOverload &&\n Array.isArray(packageJson.packageJson.minimumReleaseAgeExcludeOverload)\n ) {\n modifiedPnpmWorkspace += `\\nminimumReleaseAgeExclude:\\n${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => ` - ${item}`).join('\\n')}\\n`;\n delete packageJson.packageJson.minimumReleaseAgeExcludeOverload;\n }\n\n if (typeof packageJson?.packageJson.packageManager === 'string') {\n const version = packageJson.packageJson.packageManager\n .split('@')?.[1] // strip name\n ?.split('+')?.[0]; // strip sha\n\n
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AACf,oBAA2B;AAE3B,kBAAqB;AACrB,qBAAoB;AACpB,sBAGO;
|
|
4
|
+
"sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport { SemVer, lt } from 'semver';\n\nimport { exec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport {\n getConsumerManifest,\n getSkubaManifest,\n} from '../../../../../../utils/manifest.js';\nimport { installPnpmPlugin } from '../../../../../init/installPnpmPlugin.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nexport const migrateToPnpmConfig: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n let pnpmWorkSpaceFile: string;\n try {\n pnpmWorkSpaceFile = await fs.promises.readFile(\n 'pnpm-workspace.yaml',\n 'utf8',\n );\n } catch {\n return {\n result: 'skip',\n reason: 'no pnpm-workspace.yaml found',\n };\n }\n\n // Remove entire # managed by skuba comments block\n\n const startingIndexText = '# managed by skuba';\n const endOfSectionIndexText = '# end managed by skuba\\n';\n\n const startingIndex = pnpmWorkSpaceFile.indexOf(startingIndexText);\n const endOfSectionIndex = pnpmWorkSpaceFile.indexOf(endOfSectionIndexText);\n\n if (startingIndex === -1 || endOfSectionIndex === -1) {\n return {\n result: 'skip',\n reason: 'no managed by skuba comment block found',\n };\n }\n\n const endSection = pnpmWorkSpaceFile.slice(\n endOfSectionIndex + endOfSectionIndexText.length,\n );\n\n let modifiedPnpmWorkspace =\n pnpmWorkSpaceFile.slice(0, startingIndex) + endSection;\n\n // Check if consumers have extended the publicHoistPattern section\n // Only match if the first non-empty, non-comment line is a list item without a preceding key\n const brokenYamlPatternRegex = /^\\s*-\\s+[^#]/;\n const firstNonEmptyNonCommentLine = endSection\n .split('\\n')\n .find((line) => line.trim() && !line.trim().startsWith('#'));\n if (\n firstNonEmptyNonCommentLine &&\n brokenYamlPatternRegex.exec(firstNonEmptyNonCommentLine)\n ) {\n modifiedPnpmWorkspace = modifiedPnpmWorkspace.replace(\n endSection,\n `publicHoistPattern:\\n${endSection}`,\n );\n }\n\n // Migrate minimumReleaseAgeExcludeOverload\n const [packageJson, skubaPackageJson] = await Promise.all([\n getConsumerManifest(),\n getSkubaManifest(),\n ]);\n\n if (\n packageJson?.packageJson.minimumReleaseAgeExcludeOverload &&\n Array.isArray(packageJson.packageJson.minimumReleaseAgeExcludeOverload)\n ) {\n modifiedPnpmWorkspace += `\\nminimumReleaseAgeExclude:\\n${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => ` - '${item}'`).join('\\n')}\\n`;\n delete packageJson.packageJson.minimumReleaseAgeExcludeOverload;\n }\n\n if (typeof packageJson?.packageJson.packageManager === 'string') {\n const version = packageJson.packageJson.packageManager\n .split('@')?.[1] // strip name\n ?.split('+')?.[0]; // strip sha\n\n if (\n typeof version === 'string' &&\n lt(new SemVer(version), new SemVer('10.26.2'))\n ) {\n packageJson.packageJson.packageManager = 'pnpm@10.26.2';\n }\n }\n\n if (modifiedPnpmWorkspace === pnpmWorkSpaceFile) {\n return {\n result: 'skip',\n reason: 'no changes needed to pnpm-workspace.yaml',\n };\n }\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n const stringifiedPackageJson =\n packageJson && `${JSON.stringify(packageJson.packageJson, null, 2)}\\n`;\n\n await Promise.all([\n fs.promises.writeFile('pnpm-workspace.yaml', modifiedPnpmWorkspace, 'utf8'),\n stringifiedPackageJson &&\n fs.promises.writeFile(packageJson.path, stringifiedPackageJson, 'utf8'),\n ]);\n\n await installPnpmPlugin(skubaPackageJson);\n\n // Running install to ensure that our new pnpm config is applied\n // e.g. hoisting and enabling post build scripts\n await exec('pnpm', 'install', '--offline');\n\n return {\n result: 'apply',\n };\n};\n\nexport const tryMigrateToPnpmConfig: PatchFunction = async (config) => {\n try {\n return await migrateToPnpmConfig(config);\n } catch (err) {\n log.warn('Failed to migrate to pnpm-plugin-skuba');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["fs"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skuba",
|
|
3
|
-
"version": "14.0.0-rfc-pnpm-config-skuba-
|
|
3
|
+
"version": "14.0.0-rfc-pnpm-config-skuba-20260107001655",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "SEEK development toolkit for backend applications and packages",
|
|
6
6
|
"homepage": "https://github.com/seek-oss/skuba#readme",
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
"jest-watch-typeahead": "^3.0.1",
|
|
85
85
|
"lodash.mergewith": "^4.6.2",
|
|
86
86
|
"minimist": "^1.2.6",
|
|
87
|
-
"normalize-package-data": "^
|
|
87
|
+
"normalize-package-data": "^7.0.0",
|
|
88
88
|
"npm-registry-fetch": "^18.0.2",
|
|
89
89
|
"npm-run-path": "^4.0.1",
|
|
90
90
|
"npm-which": "^3.0.1",
|
|
@@ -102,8 +102,8 @@
|
|
|
102
102
|
"tsx": "^4.21.0",
|
|
103
103
|
"typescript": "~5.9.0",
|
|
104
104
|
"zod": "^4.0.0",
|
|
105
|
-
"@skuba-lib/api": "^2.0.0-rfc-pnpm-config-skuba-
|
|
106
|
-
"eslint-config-skuba": "8.0.0-rfc-pnpm-config-skuba-
|
|
105
|
+
"@skuba-lib/api": "^2.0.0-rfc-pnpm-config-skuba-20260107001655",
|
|
106
|
+
"eslint-config-skuba": "8.0.0-rfc-pnpm-config-skuba-20260107001655"
|
|
107
107
|
},
|
|
108
108
|
"devDependencies": {
|
|
109
109
|
"@changesets/cli": "2.29.8",
|
|
@@ -134,7 +134,7 @@
|
|
|
134
134
|
"semver": "7.7.3",
|
|
135
135
|
"supertest": "7.1.4",
|
|
136
136
|
"type-fest": "2.19.0",
|
|
137
|
-
"pnpm-plugin-skuba": "2.0.0-rfc-pnpm-config-skuba-
|
|
137
|
+
"pnpm-plugin-skuba": "2.0.0-rfc-pnpm-config-skuba-20260107001655"
|
|
138
138
|
},
|
|
139
139
|
"engines": {
|
|
140
140
|
"node": ">=22.14.0"
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
"test:watch": "skuba test --watch"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"skuba-dive": "4.0.0-rfc-pnpm-config-skuba-
|
|
22
|
+
"skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107001655"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@types/node": "^22.13.10",
|
|
26
|
-
"skuba": "14.0.0-rfc-pnpm-config-skuba-
|
|
26
|
+
"skuba": "14.0.0-rfc-pnpm-config-skuba-20260107001655"
|
|
27
27
|
},
|
|
28
28
|
"packageManager": "pnpm@10.27.0",
|
|
29
29
|
"engines": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@aws-sdk/client-sns": "^3.363.0",
|
|
25
25
|
"@seek/aws-codedeploy-hooks": "^2.0.0",
|
|
26
26
|
"@seek/logger": "^11.1.0",
|
|
27
|
-
"skuba-dive": "4.0.0-rfc-pnpm-config-skuba-
|
|
27
|
+
"skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107001655",
|
|
28
28
|
"zod": "^4.0.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"datadog-lambda-js": "^12.0.0",
|
|
43
43
|
"dd-trace": "^5.0.0",
|
|
44
44
|
"pino-pretty": "^13.0.0",
|
|
45
|
-
"skuba": "14.0.0-rfc-pnpm-config-skuba-
|
|
45
|
+
"skuba": "14.0.0-rfc-pnpm-config-skuba-20260107001655"
|
|
46
46
|
},
|
|
47
47
|
"packageManager": "pnpm@10.27.0",
|
|
48
48
|
"engines": {
|