Skip to content

Commit

Permalink
feat: Emit *.mjs files across all packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@AbhiPrasad
AbhiPrasad committed Feb 27, 2024
1 parent 6d7c1c9 commit b0d0d93
Show file tree
Hide file tree
Showing 30 changed files with 357 additions and 66 deletions.
8 changes: 6 additions & 2 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,18 @@ export function makeBaseNPMConfig(options = {}) {
}

export function makeNPMConfigVariants(baseConfig, options = {}) {
const { emitMjs = true } = options;
const { emitMjs = true, entryFileNameWithoutExtension = '[name]'} = options;
const variantSpecificConfigs = [
{ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } },
{ output: { format: 'esm', dir: path.join(baseConfig.output.dir, 'esm') } },
];

if (emitMjs) {
variantSpecificConfigs[1].output.entryFileNames = '[name].mjs';
variantSpecificConfigs[1].output.entryFileNames = `${entryFileNameWithoutExtension}.mjs`;
}

if (entryFileNameWithoutExtension !== '[name]') {
variantSpecificConfigs[0].output.entryFileNames = `${entryFileNameWithoutExtension}.js`;
}

return variantSpecificConfigs.map(variant => deepMerge(baseConfig, variant));
Expand Down
14 changes: 7 additions & 7 deletions packages/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
"types-ts3.8"
],
"main": "build/cjs/index.client.js",
"module": "build/esm/index.server.js",
"browser": "build/esm/index.client.js",
"module": "build/esm/index.server.mjs",
"browser": "build/esm/index.client.mjs",
"types": "build/types/index.types.d.ts",
"exports": {
".": {
"node": "./build/esm/index.server.js",
"browser": "./build/esm/index.client.js",
"import": "./build/esm/index.client.js",
"node": "./build/esm/index.server.mjs",
"browser": "./build/esm/index.client.mjs",
"import": "./build/esm/index.client.mjs",
"require": "./build/cjs/index.server.js",
"types": "./build/types/index.types.d.ts"
},
"./middleware": {
"node": "./build/esm/integration/middleware/index.js",
"import": "./build/esm/integration/middleware/index.js",
"node": "./build/esm/integration/middleware/index.mjs",
"import": "./build/esm/integration/middleware/index.mjs",
"require": "./build/cjs/integration/middleware/index.js",
"types": "./build/types/integration/middleware/index.types.d.ts"
}
Expand Down
15 changes: 14 additions & 1 deletion packages/browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/npm/cjs/index.js",
"module": "build/npm/esm/index.js",
"module": "build/npm/esm/index.mjs",
"types": "build/npm/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/npm/types/index.d.ts",
"default": "./build/npm/esm/index.mjs"
},
"require": {
"types": "./build/npm.types/index.d.ts",
"default": "./build/npm/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/npm/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/bun/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/esm/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/npm/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
9 changes: 9 additions & 0 deletions packages/deno/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
"license": "MIT",
"module": "build/index.mjs",
"types": "build/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/index.d.ts",
"default": "./build/index.mjs"
}
}
},
"publishConfig": {
"access": "public"
},
Expand Down
15 changes: 14 additions & 1 deletion packages/feedback/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/npm/cjs/index.js",
"module": "build/npm/esm/index.js",
"module": "build/npm/esm/index.mjs",
"types": "build/npm/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/npm/types/index.d.ts",
"default": "./build/npm/esm/index.mjs"
},
"require": {
"types": "./build/npm/types/index.d.ts",
"default": "./build/npm/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/npm/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/gatsby/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,21 @@
"gatsby-node.d.ts"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/integration-shims/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,21 @@
"version": "7.100.0",
"description": "Shims for integrations in Sentry SDK.",
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
17 changes: 14 additions & 3 deletions packages/nextjs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,20 @@
"node": ">=14"
},
"main": "build/cjs/index.server.js",
"module": "build/esm/index.server.js",
"browser": "build/esm/index.client.js",
"module": "build/esm/index.server.mjs",
"browser": "build/esm/index.client.mjs",
"types": "build/types/index.types.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"browser": {
"import": "./build/esm/index.client.mjs",
"require": "./build/cjs/index.client.js"
},
"node": "./build/cjs/index.server.js",
"types": "./build/types/index.types.d.ts"
}
},
"typesVersions": {
"<4.9": {
"build/npm/types/index.d.ts": [
Expand Down Expand Up @@ -56,7 +67,7 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "ts-node scripts/buildRollup.ts",
"build:transpile": "rollup -c rollup.npm.config.mjs",
"build:types": "run-s build:types:core build:types:downlevel",
"build:types:core": "tsc -p tsconfig.types.json",
"build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
Expand Down
10 changes: 4 additions & 6 deletions packages/nextjs/rollup.npm.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ export default [

packageSpecificConfig: {
output: {
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
entryFileNames: 'config/templates/[name].js',

// this is going to be add-on code, so it doesn't need the trappings of a full module (and in fact actively
// shouldn't have them, lest they muck with the module to which we're adding it)
sourcemap: false,
Expand All @@ -55,21 +52,22 @@ export default [
],
},
}),
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
{ entryFileNameWithoutExtension: 'config/templates/[name]' }
),
...makeNPMConfigVariants(
makeBaseNPMConfig({
entrypoints: ['src/config/loaders/index.ts'],

packageSpecificConfig: {
output: {
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
entryFileNames: 'config/loaders/[name].js',

// make it so Rollup calms down about the fact that we're combining default and named exports
exports: 'named',
},
external: ['@rollup/plugin-commonjs', 'rollup'],
},
}),
// Preserve the original file structure (i.e., so that everything is still relative to `src`)
{ entryFileNameWithoutExtension: 'config/loaders/[name]' }
),
];
24 changes: 0 additions & 24 deletions packages/nextjs/scripts/buildRollup.ts
View file

This file was deleted.

15 changes: 14 additions & 1 deletion packages/node-experimental/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/opentelemetry-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down
15 changes: 14 additions & 1 deletion packages/opentelemetry/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@
"types-ts3.8"
],
"main": "build/cjs/index.js",
"module": "build/esm/index.js",
"module": "build/esm/index.mjs",
"types": "build/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/types/index.d.ts",
"default": "./build/esm/index.mjs"
},
"require": {
"types": "./build/types/index.d.ts",
"default": "./build/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/types/index.d.ts": [
Expand Down

0 comments on commit b0d0d93

Please sign in to comment.