vercel · timneutkens · Jun 3, 2024 · Jun 3, 2024
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/package.json b/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@repo/internal-pkg",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./env": {
+      "types": "./dist/env.d.ts",
+      "import": "./dist/env.js",
+      "require": "./dist/env.cjs"
+    }
+  },
+  "scripts": {
+    "build": "bunchee",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "bunchee": "^5.1.5",
+    "typescript": "5.4.2"
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/src/env.ts b/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/src/env.ts
@@ -0,0 +1 @@
+export const env = 'test'
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/src/index.ts b/test/e2e/app-dir/self-importing-package-monorepo/internal-pkg/src/index.ts
@@ -0,0 +1,3 @@
+import { env } from './env'
+
+export default `${env} abc`
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/next-app/app/layout.tsx b/test/e2e/app-dir/self-importing-package-monorepo/next-app/app/layout.tsx
@@ -0,0 +1,18 @@
+import type { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'Create Next App',
+  description: 'Generated by create next app',
+}
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/next-app/app/page.tsx b/test/e2e/app-dir/self-importing-package-monorepo/next-app/app/page.tsx
@@ -0,0 +1,5 @@
+import value from '@repo/internal-pkg'
+
+export default function Home() {
+  return <h1>Hello world {value}</h1>
+}
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/next-app/package.json b/test/e2e/app-dir/self-importing-package-monorepo/next-app/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "next-app",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@repo/internal-pkg": "workspace:*",
+    "next": "15.0.0-canary.2",
+    "react": "19.0.0-rc-f994737d14-20240522",
+    "react-dom": "19.0.0-rc-f994737d14-20240522"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "typescript": "^5"
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/package.json b/test/e2e/app-dir/self-importing-package-monorepo/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "turbo-self-referencing",
+  "private": true,
+  "devDependencies": {
+    "@types/node": "^20"
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/pnpm-workspace.yaml b/test/e2e/app-dir/self-importing-package-monorepo/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - 'next-app'
+  - 'internal-pkg'
diff --git a/test/e2e/app-dir/self-importing-package-monorepo/self-importing-package-monorepo.test.ts b/test/e2e/app-dir/self-importing-package-monorepo/self-importing-package-monorepo.test.ts
@@ -0,0 +1,23 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('self-importing-package-monorepo', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+    buildCommand: 'pnpm run build',
+    startCommand: 'pnpm run start',
+    devCommand: 'pnpm run dev',
+    packageJson: {
+      scripts: {
+        build:
+          'pnpm install && pnpm --filter=internal-pkg run build && pnpm --filter=next-app run build',
+        dev: 'pnpm install && pnpm --filter=internal-pkg run build && pnpm --filter=next-app run dev',
+        start: 'pnpm --filter=next-app run start',
+      },
+    },
+  })
+
+  it('should work using cheerio', async () => {
+    const $ = await next.render$('/')
+    expect($('h1').text()).toBe('Hello world test abc')
+  })
+})
diff --git a/test/e2e/app-dir/self-importing-package/app/layout.js b/test/e2e/app-dir/self-importing-package/app/layout.js
@@ -0,0 +1,7 @@
+export default function Root({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/self-importing-package/app/page.js b/test/e2e/app-dir/self-importing-package/app/page.js
@@ -0,0 +1,6 @@
+import { myMessage } from 'my-package'
+import '@repo/internal-pkg'
+
+export default function Page() {
+  return <h1>{myMessage}</h1>
+}
diff --git a/test/e2e/app-dir/self-importing-package/internal-pkg.tar b/test/e2e/app-dir/self-importing-package/internal-pkg.tar
diff --git a/test/e2e/app-dir/self-importing-package/internal-pkg/package.json b/test/e2e/app-dir/self-importing-package/internal-pkg/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@repo/internal-pkg",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./env": {
+      "types": "./dist/env.d.ts",
+      "import": "./dist/env.js",
+      "require": "./dist/env.cjs"
+    }
+  },
+  "scripts": {
+    "build": "bunchee",
+    "dev": "bunchee -w --no-clean",
+    "clean": "rm -rf .turbo dist node_modules",
+    "lint": "eslint src",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "3.572.0",
+    "@aws-sdk/s3-presigned-post": "3.572.0",
+    "@aws-sdk/s3-request-presigner": "3.572.0",
+    "@t3-oss/env-core": "^0.9.2",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "bunchee": "^5.1.5",
+    "eslint": "^8.57.0",
+    "typescript": "5.4.2"
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package/internal-pkg/src/env.ts b/test/e2e/app-dir/self-importing-package/internal-pkg/src/env.ts
@@ -0,0 +1 @@
+export const env = 'test'
diff --git a/test/e2e/app-dir/self-importing-package/internal-pkg/src/index.ts b/test/e2e/app-dir/self-importing-package/internal-pkg/src/index.ts
@@ -0,0 +1,3 @@
+import { env } from './env'
+
+console.log({ env })
diff --git a/test/e2e/app-dir/self-importing-package/my-package.tar b/test/e2e/app-dir/self-importing-package/my-package.tar
diff --git a/test/e2e/app-dir/self-importing-package/my-package/env.js b/test/e2e/app-dir/self-importing-package/my-package/env.js
@@ -0,0 +1 @@
+export const message = 'THIS IS THE OTHER FILE'
diff --git a/test/e2e/app-dir/self-importing-package/my-package/index.js b/test/e2e/app-dir/self-importing-package/my-package/index.js
@@ -0,0 +1,3 @@
+import { message } from 'my-package/env'
+
+export const myMessage = message
diff --git a/test/e2e/app-dir/self-importing-package/my-package/package.json b/test/e2e/app-dir/self-importing-package/my-package/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "my-package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./index.js"
+    },
+    "./env": {
+      "import": "./env.js"
+    }
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package/next.config.js b/test/e2e/app-dir/self-importing-package/next.config.js
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig
diff --git a/test/e2e/app-dir/self-importing-package/package.json b/test/e2e/app-dir/self-importing-package/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "my-package": "file:./my-package.tar"
+  }
+}
diff --git a/test/e2e/app-dir/self-importing-package/self-importing-package.test.ts b/test/e2e/app-dir/self-importing-package/self-importing-package.test.ts
@@ -0,0 +1,17 @@
+import { nextTestSetup } from 'e2e-utils'
+import path from 'path'
+
+describe('self-importing-package', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+    dependencies: {
+      'my-package': `file:${path.join(__dirname, 'my-package.tar')}`,
+      '@repo/internal-pkg': `file:${path.join(__dirname, 'internal-pkg.tar')}`,
+    },
+  })
+
+  it('should work using cheerio', async () => {
+    const $ = await next.render$('/')
+    expect($('h1').text()).toBe('THIS IS THE OTHER FILE')
+  })
+})
diff --git a/test/lib/create-next-install.js b/test/lib/create-next-install.js
@@ -137,6 +137,7 @@ async function createNextInstall({
           {
             ...packageJson,
             dependencies: combinedDependencies,
+            overrides: combinedDependencies,
             private: true,
             // Add resolutions if provided.
             ...(resolutions ? { resolutions } : {}),

diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts
@@ -32,6 +32,7 @@ export interface NextInstanceOpts {
   installCommand?: InstallCommand
   buildCommand?: string
   startCommand?: string
+  devCommand?: string
   env?: Record<string, string>
   dirSuffix?: string
   turbo?: boolean
@@ -54,6 +55,7 @@ export class NextInstance {
   protected installCommand?: InstallCommand
   protected buildCommand?: string
   protected startCommand?: string
+  protected devCommand?: string
   protected dependencies?: PackageJson['dependencies'] = {}
   protected resolutions?: PackageJson['resolutions']
   protected events: { [eventName: string]: Set<any> } = {}
@@ -176,17 +178,19 @@ export class NextInstance {
         if (skipInstall || skipIsolatedNext) {
           const pkgScripts = (this.packageJson['scripts'] as {}) || {}
           await fs.mkdir(this.testDir, { recursive: true })
+          const dependencies = {
+            ...finalDependencies,
+            next:
+              process.env.NEXT_TEST_VERSION ||
+              require('next/package.json').version,
+          }
           await fs.writeFile(
             path.join(this.testDir, 'package.json'),
             JSON.stringify(
               {
                 ...this.packageJson,
-                dependencies: {
-                  ...finalDependencies,
-                  next:
-                    process.env.NEXT_TEST_VERSION ||
-                    require('next/package.json').version,
-                },
+                dependencies,
+                overrides: dependencies,
                 ...(this.resolutions ? { resolutions: this.resolutions } : {}),
                 scripts: {
                   // since we can't get the build id as a build artifact, make it

diff --git a/test/lib/next-modes/next-dev.ts b/test/lib/next-modes/next-dev.ts
@@ -36,7 +36,9 @@ export class NextDevInstance extends NextInstance {
       useDirArg && this.testDir,
     ].filter(Boolean) as string[]
 
-    if (this.startCommand) {
+    if (this.devCommand) {
+      startArgs = this.devCommand.split(' ')
+    } else if (this.startCommand) {
       startArgs = this.startCommand.split(' ')
     }