Fix/pnpm and e2e green

.circleci/config.yml

@@ -379,6 +379,42 @@ jobs:
           command: 'DEBUG=start-server-and-test yarn start-server-and-test "yarn develop 2>&1 | tee log.txt" :8000 "! cat log.txt | grep -E ''ERROR #|Require stack:''"'
           working_directory: /tmp/e2e-tests/gatsby-pnp
 
+  e2e_tests_pnpm:
+    executor:
+      name: node
+      image: "18.12.0"
+    steps:
+      - checkout
+      - run: ./scripts/assert-changed-files.sh "packages/*|.circleci/*"
+      - <<: *attach_to_bootstrap
+      - run:
+          command: mkdir -p /tmp/e2e-tests/
+          working_directory: ~/project
+      - run:
+          command: cp -r ./starters/default /tmp/e2e-tests/gatsby-pnpm
+          working_directory: ~/project
+      - run:
+          command: rm package-lock.json
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run: # Install pnpm
+          command: npm install -g pnpm
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run: # Install start-server-and-test
+          command: npm install -g start-server-and-test@^1.11.0
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run: # Set project dir
+          command: node ~/project/packages/gatsby-dev-cli/dist/index.js --set-path-to-repo ~/project
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run: # Copy over packages
+          command: node ~/project/packages/gatsby-dev-cli/dist/index.js --force-install --scan-once --package-manager pnpm
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run:
+          command: pnpm build
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+      - run:
+          command: 'DEBUG=start-server-and-test pnpm start-server-and-test "pnpm develop 2>&1 | tee log.txt" :8000 "! cat log.txt | grep -E ''ERROR #|Require stack:''"'
+          working_directory: /tmp/e2e-tests/gatsby-pnpm
+
   e2e_tests_development_runtime_with_react_18:
     <<: *e2e-executor
     steps:
@@ -604,6 +640,8 @@ workflows:
             - bootstrap
       - e2e_tests_pnp:
           <<: *e2e-test-workflow
+      - e2e_tests_pnpm:
+          <<: *e2e-test-workflow
       - e2e_tests_path-prefix:
           <<: *e2e-test-workflow
       - e2e_tests_visual-regression:

packages/gatsby-dev-cli/src/index.js

@@ -44,7 +44,13 @@ You typically only need to configure this once.`
   .alias(`h`, `help`)
   .nargs(`v`, 0)
   .alias(`v`, `version`)
-  .describe(`v`, `Print the currently installed version of Gatsby Dev CLI`).argv
+  .describe(`v`, `Print the currently installed version of Gatsby Dev CLI`)
+  .choices(`package-manager`, [`yarn`, `pnpm`])
+  .default(`package-manager`, `yarn`)
+  .describe(
+    `package-manager`,
+    `Package manager to use for installing dependencies.`
+  ).argv
 
 if (argv.version) {
   console.log(getVersionInfo())
@@ -154,4 +160,5 @@ watch(gatsbyLocation, argv.packages, {
   monoRepoPackages,
   packageNameToPath,
   externalRegistry: argv.externalRegistry,
+  packageManager: argv.packageManager,
 })

packages/gatsby-dev-cli/src/local-npm-registry/index.js

@@ -50,6 +50,7 @@ exports.publishPackagesLocallyAndInstall = async ({
   yarnWorkspaceRoot,
   externalRegistry,
   root,
+  packageManager,
 }) => {
   await startServer()
 
@@ -75,5 +76,6 @@ exports.publishPackagesLocallyAndInstall = async ({
     yarnWorkspaceRoot,
     newlyPublishedPackageVersions,
     externalRegistry,
+    packageManager,
   })
 }

packages/gatsby-dev-cli/src/local-npm-registry/install-packages.js

@@ -9,6 +9,7 @@ const installPackages = async ({
   yarnWorkspaceRoot,
   newlyPublishedPackageVersions,
   externalRegistry,
+  packageManager,
 }) => {
   console.log(
     `Installing packages from local registry:\n${packagesToInstall
@@ -127,20 +128,32 @@ const installPackages = async ({
 
     installCmd = [`yarn`, yarnCommands]
   } else {
-    const yarnCommands = [
-      `add`,
-      ...packagesToInstall.map(packageName => {
-        const packageVersion = newlyPublishedPackageVersions[packageName]
-        return `${packageName}@${packageVersion}`
-      }),
-      `--exact`,
-    ]
+    const packageAndVersionsToInstall = packagesToInstall.map(packageName => {
+      const packageVersion = newlyPublishedPackageVersions[packageName]
+      return `${packageName}@${packageVersion}`
+    })
 
-    if (!externalRegistry) {
-      yarnCommands.push(`--registry=${registryUrl}`)
-    }
+    if (packageManager === `pnpm`) {
+      const pnpmCommands = [
+        `add`,
+        ...packageAndVersionsToInstall,
+        `--save-exact`,
+      ]
 
-    installCmd = [`yarn`, yarnCommands]
+      if (!externalRegistry) {
+        pnpmCommands.push(`--registry=${registryUrl}`)
+      }
+
+      installCmd = [`pnpm`, pnpmCommands]
+    } else {
+      const yarnCommands = [`add`, ...packageAndVersionsToInstall, `--exact`]
+
+      if (!externalRegistry) {
+        yarnCommands.push(`--registry=${registryUrl}`)
+      }
+
+      installCmd = [`yarn`, yarnCommands]
+    }
   }
 
   try {

packages/gatsby-dev-cli/src/local-npm-registry/verdaccio-config.js

@@ -10,7 +10,7 @@ const verdaccioConfig = {
     title: `gatsby-dev`,
   },
   self_path: `./`,
-  logs: [{ type: `stdout`, format: `pretty-timestamped`, level: `warn` }],
+  logs: { type: `stdout`, format: `pretty-timestamped`, level: `warn` },
   packages: {
     "**": {
       access: `$all`,

packages/gatsby-dev-cli/src/watch.js

@@ -38,6 +38,7 @@ async function watch(
     localPackages,
     packageNameToPath,
     externalRegistry,
+    packageManager,
   }
 ) {
   setDefaultSpawnStdio(quiet ? `ignore` : `inherit`)
@@ -158,6 +159,7 @@ async function watch(
           yarnWorkspaceRoot,
           externalRegistry,
           root,
+          packageManager,
         })
       } else {
         // run `yarn`
@@ -344,6 +346,7 @@ async function watch(
             ignorePackageJSONChanges,
             externalRegistry,
             root,
+            packageManager,
           })
           packagesToPublish.clear()
           isPublishing = false

packages/gatsby/src/utils/webpack/plugins/cache-folder-resolver.ts

@@ -1,4 +1,5 @@
 import Resolver from "enhanced-resolve/lib/Resolver"
+import mod from "module"
 
 interface IRequest {
   request?: string
@@ -8,17 +9,92 @@ interface IRequest {
 type ProcessWithPNP = NodeJS.ProcessVersions & { pnp?: string }
 
 /**
- * To support PNP we have to make sure dependencies resolved from the .cache folder should be resolved from the gatsby package directory
+ * To support Yarn PNP and pnpm we have to make sure dependencies resolved from
+ * the .cache folder should be resolved from the gatsby package directory
+ * If you see error like
+ *
+ * ModuleNotFoundError: Module not found: Error: Can't resolve 'prop-types'
+ * in '<site-directory>/.cache'
+ *
+ * it probably means this plugin is not enabled when it should be and there
+ * might be need to adjust conditions for setting `this.isEnabled` in the
+ * constructor.
+ *
+ * It's not enabled always because of legacy behavior and to limit potential
+ * regressions. Might be good idea to enable it always in the future
+ * OR remove the need for the plugin completely by not copying `cache-dir`
+ * contents to `.cache` folder and instead adjust setup to use those browser/node
+ * html renderer runtime files directly from gatsby package
  */
 export class CacheFolderResolver {
   private requestsFolder: string
+  private isEnabled = false
 
   constructor(requestsFolder: string) {
     this.requestsFolder = requestsFolder
+
+    if ((process.versions as ProcessWithPNP).pnp) {
+      // Yarn PnP
+      this.isEnabled = true
+    } else if (/node_modules[/\\]\.pnpm/.test(process.env.NODE_PATH ?? ``)) {
+      // pnpm when executing through `pnpm` CLI
+      this.isEnabled = true
+    } else {
+      // pnpm when executing through regular `gatsby` CLI / `./node_modules/.bin/gatsby`
+      // would not set NODE_PATH, but node_modules structure would not allow to resolve
+      // gatsby deps from the cache folder (unless user would install same deps too)
+      // so we are checking if we can resolve deps from the cache folder
+      // this check is not limited to pnpm and other package managers could hit this path too
+      const cacheDirReq = mod.createRequire(requestsFolder)
+
+      let isEverythingResolvableFromCacheDir = true
+      let isEverythingResolvableFromGatsbyPackage = true
+
+      // Hardcoded list of gatsby deps used in gatsby browser and ssr runtimes
+      // instead of checking if we use Yarn PnP (via `process.versions.pnp`),
+      // we check if we can resolve the external deps from the cache-dir folder
+      // to know if we need to enable this plugin so we also cover pnpm
+      // It might be good idea to always enable it overall, but to limit potential
+      // regressions we only enable it if we are sure we need it.
+      const modulesToCheck = [
+        `prop-types`,
+        `lodash/isEqual`,
+        `mitt`,
+        `shallow-compare`,
+        `@gatsbyjs/reach-router`,
+        `gatsby-react-router-scroll`,
+        `react-server-dom-webpack`,
+        `gatsby-link`,
+      ]
+      for (const cacheDirDep of modulesToCheck) {
+        try {
+          cacheDirReq.resolve(cacheDirDep)
+        } catch {
+          // something is not resolable from the cache folder, so we should not enable this plugin
+          isEverythingResolvableFromCacheDir = false
+        }
+
+        try {
+          require.resolve(cacheDirDep)
+        } catch {
+          // something is not resolable from the gatsby package
+          isEverythingResolvableFromGatsbyPackage = false
+        }
+      }
+
+      // we only enable this plugin if we are unable to resolve cache-dir deps from .cache folder
+      // and we can resolve them from gatsby package
+      if (
+        !isEverythingResolvableFromCacheDir &&
+        isEverythingResolvableFromGatsbyPackage
+      ) {
+        this.isEnabled = true
+      }
+    }
   }
 
   apply(resolver: Resolver): void {
-    if (!(process.versions as ProcessWithPNP).pnp) {
+    if (!this.isEnabled) {
       return
     }