From df304c97a7789a98122fd18540de8b9faa2a63c5 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Thu, 9 Mar 2023 17:36:46 -0500 Subject: [PATCH 1/4] fix: add node field to package json exports map --- tools/generators/migrate-converged-pkg/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/generators/migrate-converged-pkg/index.ts b/tools/generators/migrate-converged-pkg/index.ts index d973720cc33ae..7e338f0084512 100644 --- a/tools/generators/migrate-converged-pkg/index.ts +++ b/tools/generators/migrate-converged-pkg/index.ts @@ -611,6 +611,7 @@ function setupUnstableApi(tree: Tree, options: NormalizedSchemaWithTsConfigs) { Object.assign(stableJson.exports, { './unstable': { types: unstableJson.typings?.replace(/\.\.\//g, ''), + node: './lib-commonjs/unstable/index.js', ...(packageJson.module ? { import: './lib/unstable/index.js' } : null), require: './lib-commonjs/unstable/index.js', }, @@ -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), }, From ae95952ca55654c46ab90c65e6c08045d966cc78 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Thu, 9 Mar 2023 17:36:56 -0500 Subject: [PATCH 2/4] test: update tests --- tools/generators/migrate-converged-pkg/index.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/generators/migrate-converged-pkg/index.spec.ts b/tools/generators/migrate-converged-pkg/index.spec.ts index 674ebe0610e34..04ec69b5699f6 100644 --- a/tools/generators/migrate-converged-pkg/index.spec.ts +++ b/tools/generators/migrate-converged-pkg/index.spec.ts @@ -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", }, @@ -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", } From e171193ab6935cfc817db5022124e60dd7a020d8 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Thu, 9 Mar 2023 17:37:26 -0500 Subject: [PATCH 3/4] chore: update PackageJson typings to include node in exports --- tools/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/types.ts b/tools/types.ts index 300e6b04a9e8b..397c9971825fc 100644 --- a/tools/types.ts +++ b/tools/types.ts @@ -32,7 +32,7 @@ export interface PackageJson { dependencies?: Record; devDependencies?: Record; peerDependencies?: Record; - exports?: Record>; + exports?: Record>; } export interface PackageJsonWithBeachball extends PackageJson { From 5b9d3d577ec62d2824296255571f08c613ad8ca4 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Thu, 9 Mar 2023 17:47:34 -0500 Subject: [PATCH 4/4] nit: refactor --- tools/generators/migrate-converged-pkg/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/generators/migrate-converged-pkg/index.ts b/tools/generators/migrate-converged-pkg/index.ts index 7e338f0084512..24555509acb66 100644 --- a/tools/generators/migrate-converged-pkg/index.ts +++ b/tools/generators/migrate-converged-pkg/index.ts @@ -611,7 +611,7 @@ function setupUnstableApi(tree: Tree, options: NormalizedSchemaWithTsConfigs) { Object.assign(stableJson.exports, { './unstable': { types: unstableJson.typings?.replace(/\.\.\//g, ''), - node: './lib-commonjs/unstable/index.js', + ...(packageJson.main ? { node: './lib-commonjs/unstable/index.js' } : null), ...(packageJson.module ? { import: './lib/unstable/index.js' } : null), require: './lib-commonjs/unstable/index.js', },