wip: all tests pass!

packages/playground/nested-deps/vite.config.js

@@ -8,7 +8,7 @@ module.exports = {
       'test-package-b',
       'test-package-c',
       'test-package-c/side',
-      'test-package-d    > test-package-d-nested'
+      'test-package-d > test-package-d-nested'
     ],
     exclude: ['test-package-d']
   }

packages/playground/optimize-deps/nested-exclude/package.json

@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "main": "index.js",
   "dependencies": {
-    "nested-include": "file:./nested-include"
+    "nested-include": "link:./nested-include"
   }
 }

packages/playground/optimize-deps/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "axios": "^0.21.1",
     "clipboard": "^2.0.6",
-    "dep-cjs-compiled-from-cjs": "file:./dep-cjs-compiled-from-cjs",
-    "dep-cjs-compiled-from-esm": "file:./dep-cjs-compiled-from-esm",
+    "dep-cjs-compiled-from-cjs": "link:./dep-cjs-compiled-from-cjs",
+    "dep-cjs-compiled-from-esm": "link:./dep-cjs-compiled-from-esm",
     "dep-esbuild-plugin-transform": "link:./dep-esbuild-plugin-transform",
     "dep-linked": "link:./dep-linked",
     "dep-linked-include": "link:./dep-linked-include",

packages/playground/optimize-deps/vite.config.js

@@ -11,9 +11,11 @@ module.exports = {
   optimizeDeps: {
     include: [
       'dep-linked-include',
+      'nested-exclude > nested-include',
       // required since it isn't in node_modules and is ignored by the optimizer otherwise
       'dep-esbuild-plugin-transform',
-      'nested-exclude>nested-include'
+      'dep-cjs-compiled-from-cjs',
+      'dep-cjs-compiled-from-esm'
     ],
     exclude: ['nested-exclude'],
     esbuildOptions: {
@@ -36,7 +38,17 @@ module.exports = {
 
   build: {
     // to make tests faster
-    minify: false
+    minify: false,
+    // force CommonJS handling on nested-exclude > nested-include since it's
+    // linked and not in node_modules
+    commonjsOptions: {
+      include: [
+        /node_modules/,
+        /nested-include/,
+        /dep-cjs-compiled-from-cjs/,
+        /dep-cjs-compiled-from-esm/
+      ]
+    }
   },
 
   plugins: [

packages/playground/preserve-symlinks/__tests__/serve.js

@@ -3,21 +3,16 @@
 // the default e2e test serve behavior
 
 const path = require('path')
-const http = require('http')
-const sirv = require('sirv')
-const fs = require('fs')
-
-const port = (exports.port = 9527)
+const fs = require('fs-extra')
 
 /**
  * @param {string} root
- * @param {boolean} isBuildTest
  */
-exports.serve = async function serve(root, isBuildTest) {
-  const testDist = path.resolve(__dirname, '../moduleA/dist')
+exports.preServe = async (root) => {
+  const testDist = path.resolve(root, './moduleA/dist')
 
   if (fs.existsSync(testDist)) {
-    emptyDir(testDist)
+    await fs.emptyDir(testDist)
   } else {
     fs.mkdirSync(testDist, { recursive: true })
   }
@@ -26,83 +21,4 @@ exports.serve = async function serve(root, isBuildTest) {
     path.resolve(testDist, '../src/index.js'),
     path.resolve(testDist, 'symlinks-moduleA.esm.js')
   )
-
-  if (!isBuildTest) {
-    const { createServer } = require('vite')
-    process.env.VITE_INLINE = 'inline-serve'
-    let viteServer = await (
-      await createServer({
-        root: root,
-        logLevel: 'silent',
-        server: {
-          watch: {
-            usePolling: true,
-            interval: 100
-          },
-          host: true,
-          fs: {
-            strict: !isBuildTest
-          }
-        },
-        build: {
-          target: 'esnext'
-        }
-      })
-    ).listen()
-    // use resolved port/base from server
-    const base = viteServer.config.base === '/' ? '' : viteServer.config.base
-    const url =
-      (global.viteTestUrl = `http://localhost:${viteServer.config.server.port}${base}`)
-    await page.goto(url)
-
-    return viteServer
-  } else {
-    const { build } = require('vite')
-    await build({
-      root,
-      logLevel: 'silent',
-      configFile: path.resolve(__dirname, '../vite.config.js')
-    })
-
-    // start static file server
-    const serve = sirv(path.resolve(root, 'dist'))
-    const httpServer = http.createServer((req, res) => {
-      if (req.url === '/ping') {
-        res.statusCode = 200
-        res.end('pong')
-      } else {
-        serve(req, res)
-      }
-    })
-
-    return new Promise((resolve, reject) => {
-      try {
-        const server = httpServer.listen(port, async () => {
-          await page.goto(`http://localhost:${port}`)
-          resolve({
-            // for test teardown
-            async close() {
-              await new Promise((resolve) => {
-                server.close(resolve)
-              })
-            }
-          })
-        })
-      } catch (e) {
-        reject(e)
-      }
-    })
-  }
-}
-
-function emptyDir(dir) {
-  for (const file of fs.readdirSync(dir)) {
-    const abs = path.resolve(dir, file)
-    if (fs.lstatSync(abs).isDirectory()) {
-      emptyDir(abs)
-      fs.rmdirSync(abs)
-    } else {
-      fs.unlinkSync(abs)
-    }
-  }
 }

packages/playground/preserve-symlinks/moduleA/package.json

@@ -2,16 +2,5 @@
   "name": "@symlinks/moduleA",
   "version": "0.0.0",
   "module": "dist/symlinks-moduleA.esm.js",
-  "main": "dist/symlinks-moduleA.cjs.js",
-  "preconstruct": {
-    "entrypoints": [
-      "index.js"
-    ]
-  },
-  "scripts": {
-    "dev": "preconstruct dev"
-  },
-  "devDependencies": {
-    "@preconstruct/cli": "^2.0.6"
-  }
+  "main": "dist/symlinks-moduleA.cjs.js"
 }

pnpm-workspace.yaml

@@ -1,3 +1,5 @@
 packages:
   - 'packages/*'
   - 'packages/playground/*'
+  - 'packages/playground/nested-deps/test-package-d'
+  - 'packages/playground/optimize-deps/nested-exclude'

scripts/jestPerTestSetup.ts

@@ -62,19 +62,7 @@ beforeAll(async () => {
     // start a vite server in that directory.
     if (testName) {
       const playgroundRoot = resolve(__dirname, '../packages/playground')
-      const srcDir = resolve(playgroundRoot, testName)
       tempDir = resolve(__dirname, '../packages/temp/', testName)
-      // await fs.copy(srcDir, tempDir, {
-      //   dereference: false,
-      //   filter(file) {
-      //     file = slash(file)
-      //     return (
-      //       !file.includes('__tests__') &&
-      //       // !file.includes('node_modules') &&
-      //       !file.match(/dist(\/|$)/)
-      //     )
-      //   }
-      // })
 
       // when `root` dir is present, use it as vite's root
       let testCustomRoot = resolve(tempDir, 'root')
@@ -83,9 +71,14 @@ beforeAll(async () => {
       const testCustomServe = resolve(dirname(testPath), 'serve.js')
       if (fs.existsSync(testCustomServe)) {
         // test has custom server configuration.
-        const { serve } = require(testCustomServe)
-        server = await serve(rootDir, isBuildTest)
-        return
+        const { serve, preServe } = require(testCustomServe)
+        if (preServe) {
+          await preServe(rootDir, isBuildTest)
+        }
+        if (serve) {
+          server = await serve(rootDir, isBuildTest)
+          return
+        }
       }
 
       const options: UserConfig = {