@pnpm/plugin-commands-publishing 7.4.13 → 7.5.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.
Files changed (5) hide show
  1. package/lib/pack.js +28 -16
  2. package/lib/pack.js.map +1 -1
  3. package/lib/publish.js +24 -0
  4. package/lib/publish.js.map +1 -1
  5. package/package.json +15 -13
package/lib/pack.js CHANGED
@@ -87,7 +87,17 @@ async function handler(opts) {
87
87
  throw new error_1.PnpmError('PACKAGE_VERSION_NOT_FOUND', `Package version is not defined in the ${manifestFileName}.`);
88
88
  }
89
89
  const tarballName = `${manifest.name.replace('@', '').replace('/', '-')}-${manifest.version}.tgz`;
90
- const files = await (0, fs_packlist_1.packlist)(dir);
90
+ const publishManifest = await createPublishManifest({
91
+ projectDir: dir,
92
+ modulesDir: path_1.default.join(opts.dir, 'node_modules'),
93
+ manifest,
94
+ embedReadme: opts.embedReadme,
95
+ });
96
+ const files = await (0, fs_packlist_1.packlist)(dir, {
97
+ packageJsonCache: {
98
+ [path_1.default.join(dir, 'package.json')]: publishManifest,
99
+ },
100
+ });
91
101
  const filesMap = Object.fromEntries(files.map((file) => [`package/${file}`, path_1.default.join(dir, file)]));
92
102
  // cspell:disable-next-line
93
103
  if (opts.workspaceDir != null && dir !== opts.workspaceDir && !files.some((file) => /LICEN[CS]E(\..+)?/i.test(file))) {
@@ -103,10 +113,14 @@ async function handler(opts) {
103
113
  await packPkg({
104
114
  destFile: path_1.default.join(destDir, tarballName),
105
115
  filesMap,
106
- projectDir: dir,
107
- embedReadme: opts.embedReadme,
108
116
  modulesDir: path_1.default.join(opts.dir, 'node_modules'),
109
117
  packGzipLevel: opts.packGzipLevel,
118
+ manifest: publishManifest,
119
+ bins: [
120
+ ...(await (0, package_bins_1.getBinsFromPackageManifest)(publishManifest, dir)).map(({ path }) => path),
121
+ ...(manifest.publishConfig?.executableFiles ?? [])
122
+ .map((executableFile) => path_1.default.join(dir, executableFile)),
123
+ ],
110
124
  });
111
125
  if (!opts.ignoreScripts) {
112
126
  await _runScriptsIfPresent(['postpack'], entryManifest);
@@ -117,28 +131,21 @@ async function handler(opts) {
117
131
  return path_1.default.relative(opts.dir, path_1.default.join(dir, tarballName));
118
132
  }
119
133
  exports.handler = handler;
120
- async function readReadmeFile(filesMap) {
121
- const readmePath = Object.keys(filesMap).find(name => /^package\/readme\.md$/i.test(name));
122
- const readmeFile = readmePath ? await fs_1.default.promises.readFile(filesMap[readmePath], 'utf8') : undefined;
134
+ async function readReadmeFile(projectDir) {
135
+ const files = await fs_1.default.promises.readdir(projectDir);
136
+ const readmePath = files.find(name => /readme\.md$/i.test(name));
137
+ const readmeFile = readmePath ? await fs_1.default.promises.readFile(path_1.default.join(projectDir, readmePath), 'utf8') : undefined;
123
138
  return readmeFile;
124
139
  }
125
140
  async function packPkg(opts) {
126
- const { destFile, filesMap, projectDir, embedReadme, } = opts;
127
- const { manifest } = await (0, cli_utils_1.readProjectManifest)(projectDir);
128
- const bins = [
129
- ...(await (0, package_bins_1.getBinsFromPackageManifest)(manifest, projectDir)).map(({ path }) => path),
130
- ...(manifest.publishConfig?.executableFiles ?? [])
131
- .map((executableFile) => path_1.default.join(projectDir, executableFile)),
132
- ];
141
+ const { destFile, filesMap, bins, manifest, } = opts;
133
142
  const mtime = new Date('1985-10-26T08:15:00.000Z');
134
143
  const pack = tar_stream_1.default.pack();
135
144
  await Promise.all(Object.entries(filesMap).map(async ([name, source]) => {
136
145
  const isExecutable = bins.some((bin) => path_1.default.relative(bin, source) === '');
137
146
  const mode = isExecutable ? 0o755 : 0o644;
138
147
  if (/^package\/package\.(json|json5|yaml)/.test(name)) {
139
- const readmeFile = embedReadme ? await readReadmeFile(filesMap) : undefined;
140
- const publishManifest = await (0, exportable_manifest_1.createExportableManifest)(projectDir, manifest, { readmeFile, modulesDir: opts.modulesDir });
141
- pack.entry({ mode, mtime, name: 'package/package.json' }, JSON.stringify(publishManifest, null, 2));
148
+ pack.entry({ mode, mtime, name: 'package/package.json' }, JSON.stringify(manifest, null, 2));
142
149
  return;
143
150
  }
144
151
  pack.entry({ mode, mtime, name }, fs_1.default.readFileSync(source));
@@ -152,4 +159,9 @@ async function packPkg(opts) {
152
159
  }).on('error', reject);
153
160
  });
154
161
  }
162
+ async function createPublishManifest(opts) {
163
+ const { projectDir, embedReadme, modulesDir, manifest } = opts;
164
+ const readmeFile = embedReadme ? await readReadmeFile(projectDir) : undefined;
165
+ return (0, exportable_manifest_1.createExportableManifest)(projectDir, manifest, { readmeFile, modulesDir });
166
+ }
155
167
  //# sourceMappingURL=pack.js.map
package/lib/pack.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pack.js","sourceRoot":"","sources":["../src/pack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pack.js","sourceRoot":"","sources":["../src/pack.ts"],"names":[],"mappings":"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"}
package/lib/publish.js CHANGED
@@ -36,6 +36,7 @@ const error_1 = require("@pnpm/error");
36
36
  const lifecycle_1 = require("@pnpm/lifecycle");
37
37
  const run_npm_1 = require("@pnpm/run-npm");
38
38
  const git_utils_1 = require("@pnpm/git-utils");
39
+ const network_auth_header_1 = require("@pnpm/network.auth-header");
39
40
  const enquirer_1 = require("enquirer");
40
41
  const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
41
42
  const pick_1 = __importDefault(require("ramda/src/pick"));
@@ -234,6 +235,7 @@ Do you want to continue?`,
234
235
  await copyNpmrc({ dir, workspaceDir: opts.workspaceDir, packDestination });
235
236
  const { status } = (0, run_npm_1.runNpm)(opts.npmPath, ['publish', '--ignore-scripts', path_1.default.basename(tarballName), ...args], {
236
237
  cwd: packDestination,
238
+ env: getEnvWithTokens(opts),
237
239
  });
238
240
  await (0, rimraf_1.default)(packDestination);
239
241
  if (status != null && status !== 0) {
@@ -248,6 +250,28 @@ Do you want to continue?`,
248
250
  return { manifest };
249
251
  }
250
252
  exports.publish = publish;
253
+ /**
254
+ * The npm CLI doesn't support token helpers, so we transform the token helper settings
255
+ * to regular auth token settings that the npm CLI can understand.
256
+ */
257
+ function getEnvWithTokens(opts) {
258
+ const tokenHelpers = Object.entries(opts.rawConfig).filter(([key]) => key.endsWith(':tokenHelper'));
259
+ const tokenHelpersFromArgs = opts.argv.original
260
+ .filter(arg => arg.includes(':tokenHelper='))
261
+ .map(arg => arg.split('=', 2));
262
+ const env = {};
263
+ for (const [key, helperPath] of tokenHelpers.concat(tokenHelpersFromArgs)) {
264
+ const authHeader = (0, network_auth_header_1.loadToken)(helperPath, key);
265
+ const authType = authHeader.startsWith('Bearer')
266
+ ? '_authToken'
267
+ : '_auth';
268
+ const registry = key.replace(/:tokenHelper$/, '');
269
+ env[`NPM_CONFIG_${registry}:${authType}`] = authType === '_authToken'
270
+ ? authHeader.slice('Bearer '.length)
271
+ : authHeader.replace(/Basic /i, '');
272
+ }
273
+ return env;
274
+ }
251
275
  async function copyNpmrc({ dir, workspaceDir, packDestination }) {
252
276
  const localNpmrc = path_1.default.join(dir, '.npmrc');
253
277
  if ((0, fs_1.existsSync)(localNpmrc)) {
package/lib/publish.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/plugin-commands-publishing",
3
- "version": "7.4.13",
3
+ "version": "7.5.1",
4
4
  "description": "The pack and publish commands of pnpm",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -39,9 +39,10 @@
39
39
  "path-exists": "^4.0.0",
40
40
  "tar": "^6.2.0",
41
41
  "write-yaml-file": "^5.0.0",
42
- "@pnpm/filter-workspace-packages": "7.2.9",
43
- "@pnpm/prepare": "0.0.87",
44
- "@pnpm/plugin-commands-publishing": "7.4.13",
42
+ "@pnpm/filter-workspace-packages": "7.2.10",
43
+ "@pnpm/network.auth-header": "2.2.0",
44
+ "@pnpm/prepare": "0.0.88",
45
+ "@pnpm/plugin-commands-publishing": "7.5.1",
45
46
  "@pnpm/test-ipc-server": "0.0.0"
46
47
  },
47
48
  "dependencies": {
@@ -56,21 +57,22 @@
56
57
  "tar-stream": "^2.2.0",
57
58
  "tempy": "^1.0.1",
58
59
  "write-json-file": "^4.3.0",
59
- "@pnpm/cli-utils": "2.1.7",
60
- "@pnpm/client": "10.0.43",
61
- "@pnpm/config": "20.4.0",
60
+ "@pnpm/cli-utils": "2.1.8",
62
61
  "@pnpm/common-cli-options-help": "1.1.0",
62
+ "@pnpm/config": "20.4.1",
63
63
  "@pnpm/error": "5.0.2",
64
+ "@pnpm/client": "10.0.45",
64
65
  "@pnpm/exportable-manifest": "5.0.11",
65
- "@pnpm/fs.packlist": "1.0.2",
66
66
  "@pnpm/git-utils": "1.0.0",
67
- "@pnpm/lifecycle": "16.0.10",
68
- "@pnpm/package-bins": "8.0.6",
67
+ "@pnpm/fs.packlist": "1.0.3",
68
+ "@pnpm/lifecycle": "16.0.11",
69
+ "@pnpm/network.auth-header": "2.2.0",
69
70
  "@pnpm/pick-registry-for-package": "5.0.6",
71
+ "@pnpm/package-bins": "8.0.6",
70
72
  "@pnpm/resolver-base": "11.0.2",
71
- "@pnpm/types": "9.4.2",
72
- "@pnpm/run-npm": "6.0.0",
73
- "@pnpm/sort-packages": "5.0.9"
73
+ "@pnpm/run-npm": "6.1.0",
74
+ "@pnpm/sort-packages": "5.0.9",
75
+ "@pnpm/types": "9.4.2"
74
76
  },
75
77
  "peerDependencies": {
76
78
  "@pnpm/logger": "^5.0.0"