[pull] main from pnpm:main

.changeset/five-teams-find.md

@@ -0,0 +1,6 @@
+---
+"@pnpm/plugin-commands-publishing": minor
+"pnpm": minor
+---
+
+Added support for `--dry-run` to the `pack` command [#10301](https://github.com/pnpm/pnpm/issues/10301).

.changeset/pink-parks-begin.md

@@ -0,0 +1,6 @@
+---
+"@pnpm/plugin-commands-deploy": patch
+"pnpm": patch
+---
+
+Remove the `injectWorkspacePackages` setting from the lockfile on the `deploy` command [#10294](https://github.com/pnpm/pnpm/pull/10294).

releasing/plugin-commands-deploy/src/createDeployFiles.ts

@@ -123,6 +123,10 @@ export function createDeployFiles ({
       overrides: undefined, // the effects of the overrides should already be part of the package snapshots
       packageExtensionsChecksum: undefined, // the effects of the package extensions should already be part of the package snapshots
       pnpmfileChecksum: undefined, // the effects of the pnpmfile should already be part of the package snapshots
+      settings: {
+        ...lockfile.settings,
+        injectWorkspacePackages: undefined, // the effects of injecting workspace packages should already be part of the lockfile
+      },
       importers: {
         ['.' as ProjectId]: targetSnapshot,
       },

releasing/plugin-commands-deploy/src/deploy.ts

@@ -265,6 +265,7 @@ async function deployFromSharedLockfile (
       modulesDir: undefined,
       confirmModulesPurge: false,
       frozenLockfile: true,
+      injectWorkspacePackages: undefined, // the effects of injecting workspace packages should already be part of the package snapshots
       overrides: undefined, // the effects of the overrides should already be part of the package snapshots
       hooks: {
         ...opts.hooks,

releasing/plugin-commands-deploy/test/deploy.test.ts

@@ -5,6 +5,7 @@ import { preparePackages } from '@pnpm/prepare'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
 import { jest } from '@jest/globals'
 import { DEFAULT_OPTS } from './utils/index.js'
+import { install } from '@pnpm/plugin-commands-installation'
 
 const original = await import('@pnpm/logger')
 const warn = jest.fn()
@@ -498,3 +499,51 @@ test('deploy works when workspace packages use catalog protocol', async () => {
   // Make sure the is-positive cataloged dependency was actually installed.
   expect(fs.existsSync('deploy/node_modules/.pnpm/project-3@file+project-3/node_modules/is-positive')).toBeTruthy()
 })
+
+test('deploy does not preserve the inject workspace packages settings in the lockfile', async () => {
+  preparePackages([
+    {
+      location: '.',
+      package: {
+        name: 'root',
+        version: '1.0.0',
+        private: true,
+      },
+    },
+    {
+      name: 'project',
+      version: '1.0.0',
+    },
+  ])
+
+  const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project' }])
+
+  await install.handler({
+    ...DEFAULT_OPTS,
+    allProjects,
+    dir: process.cwd(),
+    dev: true,
+    production: true,
+    lockfileOnly: true,
+    sharedWorkspaceLockfile: true,
+    lockfileDir: process.cwd(),
+    workspaceDir: process.cwd(),
+  })
+
+  await deploy.handler({
+    ...DEFAULT_OPTS,
+    allProjects,
+    dir: process.cwd(),
+    dev: false,
+    production: true,
+    recursive: true,
+    selectedProjectsGraph,
+    sharedWorkspaceLockfile: true,
+    lockfileDir: process.cwd(),
+    workspaceDir: process.cwd(),
+  }, ['dist'])
+
+  const project = assertProject(path.resolve('dist'))
+  const lockfile = project.readLockfile()
+  expect(lockfile.settings).not.toHaveProperty('injectWorkspacePackages')
+})

releasing/plugin-commands-publishing/src/pack.ts

@@ -38,6 +38,7 @@ export function cliOptionsTypes (): Record<string, unknown> {
     out: String,
     recursive: Boolean,
     ...pick([
+      'dry-run',
       'pack-destination',
       'pack-gzip-level',
       'json',
@@ -57,6 +58,10 @@ export function help (): string {
         title: 'Options',
 
         list: [
+          {
+            description: 'Does everything `pnpm pack` would do except actually writing the tarball to disk.',
+            name: '--dry-run',
+          },
           {
             description: 'Directory in which `pnpm pack` will save tarballs. The default is the current working directory.',
             name: '--pack-destination <dir>',
@@ -101,6 +106,7 @@ export type PackOptions = Pick<UniversalOptions, 'dir'> & Pick<Config, 'catalogs
   argv: {
     original: string[]
   }
+  dryRun?: boolean
   engineStrict?: boolean
   packDestination?: string
   out?: string
@@ -250,21 +256,23 @@ export async function api (opts: PackOptions): Promise<PackResult> {
   const destDir = packDestination
     ? (path.isAbsolute(packDestination) ? packDestination : path.join(dir, packDestination ?? '.'))
     : dir
-  await fs.promises.mkdir(destDir, { recursive: true })
-  await packPkg({
-    destFile: path.join(destDir, tarballName),
-    filesMap,
-    modulesDir: path.join(opts.dir, 'node_modules'),
-    packGzipLevel: opts.packGzipLevel,
-    manifest: publishManifest,
-    bins: [
-      ...(await getBinsFromPackageManifest(publishManifest as DependencyManifest, dir)).map(({ path }) => path),
-      ...(manifest.publishConfig?.executableFiles ?? [])
-        .map((executableFile) => path.join(dir, executableFile)),
-    ],
-  })
-  if (!opts.ignoreScripts) {
-    await _runScriptsIfPresent(['postpack'], entryManifest)
+  if (!opts.dryRun) {
+    await fs.promises.mkdir(destDir, { recursive: true })
+    await packPkg({
+      destFile: path.join(destDir, tarballName),
+      filesMap,
+      modulesDir: path.join(opts.dir, 'node_modules'),
+      packGzipLevel: opts.packGzipLevel,
+      manifest: publishManifest,
+      bins: [
+        ...(await getBinsFromPackageManifest(publishManifest as DependencyManifest, dir)).map(({ path }) => path),
+        ...(manifest.publishConfig?.executableFiles ?? [])
+          .map((executableFile) => path.join(dir, executableFile)),
+      ],
+    })
+    if (!opts.ignoreScripts) {
+      await _runScriptsIfPresent(['postpack'], entryManifest)
+    }
   }
   let packedTarballPath
   if (opts.dir !== destDir) {

releasing/plugin-commands-publishing/src/publish.ts

@@ -272,6 +272,7 @@ Do you want to continue?`,
     ...opts,
     dir,
     packDestination,
+    dryRun: false,
   })
   await copyNpmrc({ dir, workspaceDir: opts.workspaceDir, packDestination })
   const { status } = runNpm(opts.npmPath, ['publish', '--ignore-scripts', path.basename(tarballPath), ...args], {

releasing/plugin-commands-publishing/test/pack.ts

@@ -78,6 +78,24 @@ test('pack a package with scoped name', async () => {
   expect(fs.existsSync('pnpm-test-scope-0.0.0.tgz')).toBeTruthy()
 })
 
+test('pack: with dry-run', async () => {
+  prepare({
+    name: 'test-publish-package.json',
+    version: '0.0.0',
+  })
+
+  await pack.handler({
+    ...DEFAULT_OPTS,
+    argv: { original: [] },
+    dir: process.cwd(),
+    extraBinPaths: [],
+    dryRun: true,
+  })
+
+  expect(fs.existsSync('test-publish-package.json-0.0.0.tgz')).toBeFalsy()
+  expect(fs.existsSync('package.json')).toBeTruthy()
+})
+
 test('pack when there is bundledDependencies but without node-linker=hoisted', async () => {
   prepare({
     name: 'bundled-deps-without-node-linker-hoisted',