Unverified Commit 9d792e35 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Cover org package external in externals-transitive test (#86691)

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the PR.
- Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to understand the PR)
- When linking to a Slack thread, you might want to share details of the conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent 2cd70dfe
import lodash from 'lodash' import lodash from 'lodash'
import pkg from 'lodash/package.json' import lodashPkg from 'lodash/package.json'
import globalPkg from '@storybook/global/package.json'
export default [lodash.VERSION, pkg.version] export default [lodash.VERSION, lodashPkg.version, globalPkg.version]
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"name": "dep-b", "name": "dep-b",
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"@storybook/global": "5.0.0",
"lodash": "4.17.21" "lodash": "4.17.21"
} }
} }
...@@ -12,13 +12,14 @@ describe('externals-transitive', () => { ...@@ -12,13 +12,14 @@ describe('externals-transitive', () => {
it('uses the right version of transitive externals', async () => { it('uses the right version of transitive externals', async () => {
const $ = await next.render$('/') const $ = await next.render$('/')
const body = $('body > p').text().trim() const body = $('body > p').text().trim()
expect(body).toEqual(`depA: 3.10.1, depB: 4.17.21, 4.17.21`) expect(body).toEqual(`depA: 3.10.1, depB: 4.17.21, 4.17.21, 5.0.0`)
if (!isNextDeploy) { if (!isNextDeploy) {
const files = glob.sync('**/*.js', { const files = glob.sync('**/*.js', {
cwd: path.join(next.testDir, next.distDir, 'server'), cwd: path.join(next.testDir, next.distDir, 'server'),
}) })
let isLodashBundled = false let isLodashBundled = false
let isStorybookGlobalBundled = false
for (const file of files) { for (const file of files) {
const content = await next.readFile( const content = await next.readFile(
path.join(next.distDir, 'server', file) path.join(next.distDir, 'server', file)
...@@ -27,22 +28,35 @@ describe('externals-transitive', () => { ...@@ -27,22 +28,35 @@ describe('externals-transitive', () => {
isLodashBundled || isLodashBundled ||
// Code // Code
content.includes('__lodash_hash_undefined__') || content.includes('__lodash_hash_undefined__') ||
// Package.json // package.json
content.includes('Lodash modular utilities.') content.includes('Lodash modular utilities.')
isStorybookGlobalBundled =
isStorybookGlobalBundled ||
// package.json
content.includes('Require global variables')
} }
if (isTurbopack) { if (isTurbopack) {
// Assert that lodash wasn't bundled. Turbopack creates symlinks to be able to access // Assert that the libraries weren't bundled. Turbopack creates symlinks to be able to
// transitive dependencies at runtime. // access transitive dependencies at runtime.
expect(isLodashBundled).toBe(false) expect(isLodashBundled).toBe(false)
expect(isStorybookGlobalBundled).toBe(false)
let symlinks = ( let lodashSymlinks = (
await fs.readdir( await fs.readdir(
path.join(next.testDir, next.distDir, 'node_modules') path.join(next.testDir, next.distDir, 'node_modules')
) )
).filter((file) => file.startsWith('lodash-')) ).filter((file) => file.startsWith('lodash-'))
// There are two symlinks created, one for each lodash version
expect(lodashSymlinks.length).toBe(2)
expect(symlinks.length).toBeGreaterThanOrEqual(2) let storybookGlobalSymlinks = (
await fs.readdir(
path.join(next.testDir, next.distDir, 'node_modules', '@storybook')
)
).filter((file) => file.startsWith('global-'))
expect(storybookGlobalSymlinks.length).toBe(1)
if (isNextStart) { if (isNextStart) {
// Lists the two symlinks in the NFT // Lists the two symlinks in the NFT
...@@ -50,9 +64,14 @@ describe('externals-transitive', () => { ...@@ -50,9 +64,14 @@ describe('externals-transitive', () => {
'.next/server/app/page.js.nft.json' '.next/server/app/page.js.nft.json'
)) as { files: string[] } )) as { files: string[] }
for (let symlink of symlinks) { for (let symlink of lodashSymlinks) {
expect(trace.files).toContain(`../../node_modules/${symlink}`) expect(trace.files).toContain(`../../node_modules/${symlink}`)
} }
for (let symlink of storybookGlobalSymlinks) {
expect(trace.files).toContain(
`../../node_modules/@storybook/${symlink}`
)
}
} }
} else { } else {
// Webpack ends up bundling lodash in dep-a // Webpack ends up bundling lodash in dep-a
......
module.exports = { module.exports = {
serverExternalPackages: ['lodash'], serverExternalPackages: ['@storybook/global', 'lodash'],
experimental: { experimental: {
turbopackModuleIds: 'named', turbopackModuleIds: 'named',
turbopackMinify: false, turbopackMinify: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment