Skip to content

Commit b0d0d93

Browse files
AbhiPrasadAbhiPrasad
committed
feat: Emit *.mjs files across all packages
1 parent 6d7c1c9 commit b0d0d93

File tree

30 files changed

+357
-66
lines changed

30 files changed

+357
-66
lines changed

‎dev-packages/rollup-utils/npmHelpers.mjs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,18 @@ export function makeBaseNPMConfig(options = {}) {
118118
}
119119

120120
export function makeNPMConfigVariants(baseConfig, options = {}) {
121-
const { emitMjs = true } = options;
121+
const { emitMjs = true, entryFileNameWithoutExtension = '[name]'} = options;
122122
const variantSpecificConfigs = [
123123
{ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } },
124124
{ output: { format: 'esm', dir: path.join(baseConfig.output.dir, 'esm') } },
125125
];
126126

127127
if (emitMjs) {
128-
variantSpecificConfigs[1].output.entryFileNames = '[name].mjs';
128+
variantSpecificConfigs[1].output.entryFileNames = `${entryFileNameWithoutExtension}.mjs`;
129+
}
130+
131+
if (entryFileNameWithoutExtension !== '[name]') {
132+
variantSpecificConfigs[0].output.entryFileNames = `${entryFileNameWithoutExtension}.js`;
129133
}
130134

131135
return variantSpecificConfigs.map(variant => deepMerge(baseConfig, variant));

‎packages/astro/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@
2424
"types-ts3.8"
2525
],
2626
"main": "build/cjs/index.client.js",
27-
"module": "build/esm/index.server.js",
28-
"browser": "build/esm/index.client.js",
27+
"module": "build/esm/index.server.mjs",
28+
"browser": "build/esm/index.client.mjs",
2929
"types": "build/types/index.types.d.ts",
3030
"exports": {
3131
".": {
32-
"node": "./build/esm/index.server.js",
33-
"browser": "./build/esm/index.client.js",
34-
"import": "./build/esm/index.client.js",
32+
"node": "./build/esm/index.server.mjs",
33+
"browser": "./build/esm/index.client.mjs",
34+
"import": "./build/esm/index.client.mjs",
3535
"require": "./build/cjs/index.server.js",
3636
"types": "./build/types/index.types.d.ts"
3737
},
3838
"./middleware": {
39-
"node": "./build/esm/integration/middleware/index.js",
40-
"import": "./build/esm/integration/middleware/index.js",
39+
"node": "./build/esm/integration/middleware/index.mjs",
40+
"import": "./build/esm/integration/middleware/index.mjs",
4141
"require": "./build/cjs/integration/middleware/index.js",
4242
"types": "./build/types/integration/middleware/index.types.d.ts"
4343
}

‎packages/browser/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/npm/cjs/index.js",
19-
"module": "build/npm/esm/index.js",
19+
"module": "build/npm/esm/index.mjs",
2020
"types": "build/npm/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/npm/types/index.d.ts",
26+
"default": "./build/npm/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/npm.types/index.d.ts",
30+
"default": "./build/npm/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/npm/types/index.d.ts": [

‎packages/bun/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/esm/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/npm/types/index.d.ts": [

‎packages/core/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/types/index.d.ts": [

‎packages/deno/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@
88
"license": "MIT",
99
"module": "build/index.mjs",
1010
"types": "build/index.d.ts",
11+
"exports": {
12+
"./package.json": "./package.json",
13+
".": {
14+
"import": {
15+
"types": "./build/index.d.ts",
16+
"default": "./build/index.mjs"
17+
}
18+
}
19+
},
1120
"publishConfig": {
1221
"access": "public"
1322
},

‎packages/feedback/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/npm/cjs/index.js",
19-
"module": "build/npm/esm/index.js",
19+
"module": "build/npm/esm/index.mjs",
2020
"types": "build/npm/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/npm/types/index.d.ts",
26+
"default": "./build/npm/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/npm/types/index.d.ts",
30+
"default": "./build/npm/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/npm/types/index.d.ts": [

‎packages/gatsby/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,21 @@
2424
"gatsby-node.d.ts"
2525
],
2626
"main": "build/cjs/index.js",
27-
"module": "build/esm/index.js",
27+
"module": "build/esm/index.mjs",
2828
"types": "build/types/index.d.ts",
29+
"exports": {
30+
"./package.json": "./package.json",
31+
".": {
32+
"import": {
33+
"types": "./build/types/index.d.ts",
34+
"default": "./build/esm/index.mjs"
35+
},
36+
"require": {
37+
"types": "./build/types/index.d.ts",
38+
"default": "./build/cjs/index.js"
39+
}
40+
}
41+
},
2942
"typesVersions": {
3043
"<4.9": {
3144
"build/types/index.d.ts": [

‎packages/integration-shims/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,21 @@
33
"version": "7.100.0",
44
"description": "Shims for integrations in Sentry SDK.",
55
"main": "build/cjs/index.js",
6-
"module": "build/esm/index.js",
6+
"module": "build/esm/index.mjs",
77
"types": "build/types/index.d.ts",
8+
"exports": {
9+
"./package.json": "./package.json",
10+
".": {
11+
"import": {
12+
"types": "./build/types/index.d.ts",
13+
"default": "./build/esm/index.mjs"
14+
},
15+
"require": {
16+
"types": "./build/types/index.d.ts",
17+
"default": "./build/cjs/index.js"
18+
}
19+
}
20+
},
821
"typesVersions": {
922
"<4.9": {
1023
"build/types/index.d.ts": [

‎packages/nextjs/package.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,20 @@
1010
"node": ">=14"
1111
},
1212
"main": "build/cjs/index.server.js",
13-
"module": "build/esm/index.server.js",
14-
"browser": "build/esm/index.client.js",
13+
"module": "build/esm/index.server.mjs",
14+
"browser": "build/esm/index.client.mjs",
1515
"types": "build/types/index.types.d.ts",
16+
"exports": {
17+
"./package.json": "./package.json",
18+
".": {
19+
"browser": {
20+
"import": "./build/esm/index.client.mjs",
21+
"require": "./build/cjs/index.client.js"
22+
},
23+
"node": "./build/cjs/index.server.js",
24+
"types": "./build/types/index.types.d.ts"
25+
}
26+
},
1627
"typesVersions": {
1728
"<4.9": {
1829
"build/npm/types/index.d.ts": [
@@ -56,7 +67,7 @@
5667
"scripts": {
5768
"build": "run-p build:transpile build:types",
5869
"build:dev": "yarn build",
59-
"build:transpile": "ts-node scripts/buildRollup.ts",
70+
"build:transpile": "rollup -c rollup.npm.config.mjs",
6071
"build:types": "run-s build:types:core build:types:downlevel",
6172
"build:types:core": "tsc -p tsconfig.types.json",
6273
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",

‎packages/nextjs/rollup.npm.config.mjs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ export default [
3535

3636
packageSpecificConfig: {
3737
output: {
38-
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
39-
entryFileNames: 'config/templates/[name].js',
40-
4138
// this is going to be add-on code, so it doesn't need the trappings of a full module (and in fact actively
4239
// shouldn't have them, lest they muck with the module to which we're adding it)
4340
sourcemap: false,
@@ -55,21 +52,22 @@ export default [
5552
],
5653
},
5754
}),
55+
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
56+
{ entryFileNameWithoutExtension: 'config/templates/[name]' }
5857
),
5958
...makeNPMConfigVariants(
6059
makeBaseNPMConfig({
6160
entrypoints: ['src/config/loaders/index.ts'],
6261

6362
packageSpecificConfig: {
6463
output: {
65-
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
66-
entryFileNames: 'config/loaders/[name].js',
67-
6864
// make it so Rollup calms down about the fact that we're combining default and named exports
6965
exports: 'named',
7066
},
7167
external: ['@rollup/plugin-commonjs', 'rollup'],
7268
},
7369
}),
70+
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
71+
{ entryFileNameWithoutExtension: 'config/loaders/[name]' }
7472
),
7573
];

‎packages/nextjs/scripts/buildRollup.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎packages/node-experimental/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/types/index.d.ts": [

‎packages/node/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/types/index.d.ts": [

‎packages/opentelemetry-node/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/types/index.d.ts": [

‎packages/opentelemetry/package.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
19+
"module": "build/esm/index.mjs",
2020
"types": "build/types/index.d.ts",
21+
"exports": {
22+
"./package.json": "./package.json",
23+
".": {
24+
"import": {
25+
"types": "./build/types/index.d.ts",
26+
"default": "./build/esm/index.mjs"
27+
},
28+
"require": {
29+
"types": "./build/types/index.d.ts",
30+
"default": "./build/cjs/index.js"
31+
}
32+
}
33+
},
2134
"typesVersions": {
2235
"<4.9": {
2336
"build/types/index.d.ts": [

0 commit comments

Comments
 (0)