Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed next-types-plugin causing Typescript errors when "type": "module" is set #49027

Merged
merged 9 commits into from
May 1, 2023
Merged

Fixed next-types-plugin causing Typescript errors when "type": "module" is set #49027

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de88f16
Fix(next-types-plugin): always create a package.json with `"type": "m…
DuCanhGH May 1, 2023
37a4525
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
DuCanhGH May 1, 2023
7beee3a
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
shuding May 1, 2023
e4f7bfd
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
DuCanhGH May 1, 2023
b7d1825
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
kodiakhq[bot] May 1, 2023
1b299c9
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
kodiakhq[bot] May 1, 2023
fc2d9e9
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
shuding May 1, 2023
e5bc584
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
shuding May 1, 2023
e4d8e25
Merge branch 'canary' into ducanhgh-fix-next-types-plugin-with-esm
DuCanhGH May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions packages/next/src/build/webpack/plugins/next-types-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,13 @@ export class NextTypesPlugin {
appTypesBasePath,
relativePathToApp.replace(/\.(js|jsx|ts|tsx|mjs)$/, '.ts')
)
const relativeImportPath = path
.join(this.getRelativePathFromAppTypesDir(relativePathToApp))
.replace(/\.(js|jsx|ts|tsx|mjs)$/, '')
.replace(/\\/g, '/')
const assetPath = assetDirRelative + '/' + normalizePathSep(typePath)
const relativeImportPath = normalizePathSep(
path
.join(this.getRelativePathFromAppTypesDir(relativePathToApp))
.replace(/\.(js|jsx|ts|tsx|mjs)$/, '')
)

const assetPath = path.join(assetDirRelative, typePath)

if (IS_LAYOUT) {
const slots = await collectNamedSlots(mod.resource)
Expand Down Expand Up @@ -673,24 +675,26 @@ export class NextTypesPlugin {

await Promise.all(promises)

// Support `"moduleResolution": "Node16" | "NodeNext"` with `"type": "module"`

const packageJsonAssetPath = path.join(
assetDirRelative,
'types/package.json'
DuCanhGH marked this conversation as resolved.
Show resolved Hide resolved
)

assets[packageJsonAssetPath] = new sources.RawSource(
'{"type": "module"}'
) as unknown as webpack.sources.RawSource

if (this.typedRoutes) {
if (this.dev && !this.isEdgeServer) {
devPageFiles.forEach((file) => {
this.collectPage(file)
})
}

// Support tsconfig values for "moduleResolution": "Node16" or "NodeNext"
const packageJsonTypePath = path.join('types', 'package.json')
const packageJsonAssetPath =
assetDirRelative + '/' + normalizePathSep(packageJsonTypePath)
assets[packageJsonAssetPath] = new sources.RawSource(
'{"type": "module"}'
) as unknown as webpack.sources.RawSource
const linkAssetPath = path.join(assetDirRelative, 'types/link.d.ts')
DuCanhGH marked this conversation as resolved.
Show resolved Hide resolved

const linkTypePath = path.join('types', 'link.d.ts')
const linkAssetPath =
assetDirRelative + '/' + normalizePathSep(linkTypePath)
assets[linkAssetPath] = new sources.RawSource(
createRouteDefinitions()
) as unknown as webpack.sources.RawSource
Expand Down