Skip to content

fix(tools): update migrate-converged generator to add node field to package.json exports map #27152

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

Merged
TristanWatanabe merged 5 commits into from
Mar 15, 2023
Merged

fix(tools): update migrate-converged generator to add node field to package.json exports map #27152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df304c9
fix: add node field to package json exports map
TristanWatanabe Mar 9, 2023
ae95952
test: update tests
TristanWatanabe Mar 9, 2023
e171193
chore: update PackageJson typings to include node in exports
TristanWatanabe Mar 9, 2023
5b9d3d5
nit: refactor
TristanWatanabe Mar 9, 2023
a3c0cbb
Merge branch 'master' into add-node-field-to-export-map
TristanWatanabe Mar 9, 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
2 changes: 2 additions & 0 deletions tools/generators/migrate-converged-pkg/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,7 @@ describe('migrate-converged-pkg generator', () => {
Object {
".": Object {
"import": "./lib/index.js",
"node": "./lib-commonjs/index.js",
"require": "./lib-commonjs/index.js",
"types": "./dist/index.d.ts",
},
Expand Down Expand Up @@ -1300,6 +1301,7 @@ describe('migrate-converged-pkg generator', () => {
expect(pkgJson.exports['./unstable']).toMatchInlineSnapshot(`
Object {
"import": "./lib/unstable/index.js",
"node": "./lib-commonjs/unstable/index.js",
"require": "./lib-commonjs/unstable/index.js",
"types": "./dist/unstable.d.ts",
}
Expand Down
2 changes: 2 additions & 0 deletions tools/generators/migrate-converged-pkg/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ function setupUnstableApi(tree: Tree, options: NormalizedSchemaWithTsConfigs) {
Object.assign(stableJson.exports, {
'./unstable': {
types: unstableJson.typings?.replace(/\.\.\//g, ''),
...(packageJson.main ? { node: './lib-commonjs/unstable/index.js' } : null),
...(packageJson.module ? { import: './lib/unstable/index.js' } : null),
require: './lib-commonjs/unstable/index.js',
},
Expand Down Expand Up @@ -660,6 +661,7 @@ function updatePackageJson(tree: Tree, options: NormalizedSchemaWithTsConfigs) {
json.exports = {
'.': {
types: json.typings,
...(json.main ? { node: normalizePackageEntryPointPaths(json.main) } : null),
...(json.module ? { import: normalizePackageEntryPointPaths(json.module) } : null),
...(json.main ? { require: normalizePackageEntryPointPaths(json.main) } : null),
},
Expand Down
2 changes: 1 addition & 1 deletion tools/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export interface PackageJson {
dependencies?: Record<string, string>;
devDependencies?: Record<string, string>;
peerDependencies?: Record<string, string>;
exports?: Record<string, string | Partial<{ types: string; import: string; require: string }>>;
exports?: Record<string, string | Partial<{ types: string; node: string; import: string; require: string }>>;
}

export interface PackageJsonWithBeachball extends PackageJson {
Expand Down