Skip to content

build: Create internal rollup-utils package #9908

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
merged 25 commits into from
Dec 20, 2023
Merged

build: Create internal rollup-utils package #9908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5b9e354
Move files
Dec 19, 2023
3146a30
Create package.json
Dec 19, 2023
ff11336
Rename to mjs
Dec 19, 2023
1a3166c
Fix up imports in rollup utils package
Dec 19, 2023
4344ed1
Fix lint rules
Dec 19, 2023
1e2b1b8
fix pkg json
Dec 19, 2023
ed24aa0
moar eslint
Dec 19, 2023
c0006eb
Renaming hell
Dec 19, 2023
503c31e
More renaming hell
Dec 19, 2023
ed84d0a
eslint
Dec 19, 2023
84aabfb
Add tarball-checksums file
Dec 19, 2023
f559ce9
Better script
Dec 19, 2023
55310e7
Merge branch 'develop' into lforst-create-rollup-utils-package
Dec 19, 2023
51bc260
Add readme
Dec 19, 2023
1f1c6fa
trigger ci
Dec 19, 2023
948f3a7
Rm stackTraceLimit infinity
Dec 20, 2023
4d1bc7f
Merge branch 'develop' into lforst-create-rollup-utils-package
Dec 20, 2023
bc782e0
Merge branch 'develop' into lforst-create-rollup-utils-package
Dec 20, 2023
fea7e5e
Fix caching?
Dec 20, 2023
8326023
Fix anr stuff?
Dec 20, 2023
c592deb
retrigger ci
Dec 20, 2023
88cfe61
Fix anr stuff?
Dec 20, 2023
016c78a
Flip execution order of transpile and types
Dec 20, 2023
a401792
Merge remote-tracking branch 'origin/develop' into lforst-create-roll…
Dec 20, 2023
ab161de
Undo change
Dec 20, 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: 1 addition & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
},
},
{
files: ['scenarios/**', 'rollup/**'],
files: ['scenarios/**', 'packages/rollup-utils/**'],
parserOptions: {
sourceType: 'module',
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ jobs:
- 'CHANGELOG.md'
- '.github/**'
- 'jest/**'
- 'rollup/**'
- 'scripts/**'
- 'packages/core/**'
- 'packages/rollup-utils/**'
- 'packages/tracing/**'
- 'packages/tracing-internal/**'
- 'packages/utils/**'
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"scripts": {
"build": "node ./scripts/verify-packages-versions.js && run-s build:types build:transpile build:bundle",
"build": "node ./scripts/verify-packages-versions.js && run-s build:transpile build:types build:bundle",
"build:bundle": "lerna run build:bundle",
"build:dev": "lerna run build:types,build:transpile",
"build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",
Expand Down Expand Up @@ -69,6 +69,7 @@
"packages/remix",
"packages/replay",
"packages/replay-worker",
"packages/rollup-utils",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just make this build? If we move to a different package, we shouldn't change the package name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am gonna leave it at rollup-utils because that is what it is. build is too generic since building has many more steps than just calling some rollup utils.

"packages/serverless",
"packages/svelte",
"packages/sveltekit",
Expand Down Expand Up @@ -99,7 +100,6 @@
"@types/rimraf": "^3.0.2",
"@types/sinon": "^7.0.11",
"@vitest/coverage-c8": "^0.29.2",
"acorn": "^8.7.0",
"chai": "^4.1.2",
"codecov": "^3.6.5",
"deepmerge": "^4.2.2",
Expand All @@ -116,7 +116,6 @@
"mocha": "^6.1.4",
"nodemon": "^2.0.16",
"npm-run-all": "^4.1.5",
"recast": "^0.20.5",
"replace-in-file": "^4.0.0",
"rimraf": "^3.0.2",
"rollup": "^2.67.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js --bundleConfigAsCjs",
"build:transpile": "rollup -c rollup.npm.config.mjs",
"build:types": "tsc -p tsconfig.types.json",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --bundleConfigAsCjs --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/rollup.npm.config.js → packages/astro/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

const variants = makeNPMConfigVariants(
makeBaseNPMConfig({
Expand Down
10 changes: 5 additions & 5 deletions packages/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@
"build": "run-p build:transpile build:bundle build:types",
"build:dev": "yarn build",
"build:bundle": "run-p build:bundle:es5 build:bundle:es6",
"build:bundle:es5": "JS_VERSION=es5 rollup -c rollup.bundle.config.js",
"build:bundle:es6": "JS_VERSION=es6 rollup -c rollup.bundle.config.js",
"build:transpile": "rollup -c rollup.npm.config.js",
"build:bundle:es5": "JS_VERSION=es5 rollup -c rollup.bundle.config.mjs",
"build:bundle:es6": "JS_VERSION=es6 rollup -c rollup.bundle.config.mjs",
"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/npm/types build/npm/types-ts3.8 --to ts3.8",
"build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
"build:dev:watch": "run-p build:transpile:watch build:types:watch",
"build:bundle:watch": "rollup -c rollup.bundle.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:bundle:watch": "rollup -c rollup.bundle.config.mjs --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/rollup.bundle.config.js → packages/browser/rollup.bundle.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';

const builds = [];

Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/rollup.npm.config.js → packages/browser/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(
makeBaseNPMConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/test/integration/debugging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ These tests are hard to debug, because the testing system is somewhat complex, s
- Repo-level `rollup/bundleHelpers.js`:
- Comment out all bundle variants except whichever one `run.js` is turning into `artifacts/sdk.js`.

- Browser-package-level `rollup.bundle.config.js`:
- Browser-package-level `rollup.bundle.config.mjs`:
- Build only one of `es5` and `es6`.

- Run `build:bundle:watch` in a separate terminal tab, so that when you add `console.log`s to the SDK, they get picked up.
Expand Down
4 changes: 2 additions & 2 deletions packages/bun/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/bun/rollup.npm.config.js → packages/bun/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

const config = makeNPMConfigVariants(makeBaseNPMConfig());

Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/core/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/core/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(makeBaseNPMConfig());
4 changes: 2 additions & 2 deletions packages/deno/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"build:transpile": "yarn deno-types && rollup -c rollup.config.js",
"build:types": "run-s deno-types build:types:tsc build:types:bundle",
"build:types:tsc": "tsc -p tsconfig.types.json",
"build:types:bundle": "rollup -c rollup.types.config.js",
"build:types:bundle": "rollup -c rollup.types.config.mjs",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build build-types build-test coverage",
Expand All @@ -45,7 +45,7 @@
"install:deno": "node ./scripts/install-deno.mjs",
"pretest": "run-s deno-types test:build",
"test": "run-s install:deno test:types test:unit",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.js",
"test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs",
"test:types": "deno check ./build/index.mjs",
"test:unit": "deno test --allow-read --allow-run",
"test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
Expand Down
0 packages/deno/rollup.test.config.js → packages/deno/rollup.test.config.mjs
View file
Open in desktop
File renamed without changes.
0 packages/deno/rollup.types.config.js → packages/deno/rollup.types.config.mjs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/eslint-config-sdk/src/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ module.exports = {
},
{
// Configuration for config files like webpack/rollup
files: ['*.config.js'],
files: ['*.config.js', '*.config.mjs'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2018,
Expand Down
4 changes: 2 additions & 2 deletions packages/feedback/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"scripts": {
"build": "run-p build:transpile build:types build:bundle",
"build:transpile": "rollup -c rollup.npm.config.js",
"build:bundle": "rollup -c rollup.bundle.config.js",
"build:transpile": "rollup -c rollup.npm.config.mjs",
"build:bundle": "rollup -c rollup.bundle.config.mjs",
"build:dev": "run-p build:transpile build:types",
"build:types": "run-s build:types:core build:types:downlevel",
"build:types:core": "tsc -p tsconfig.types.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/feedback/rollup.bundle.config.js → packages/feedback/rollup.bundle.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';
import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';

const baseBundleConfig = makeBaseBundleConfig({
bundleType: 'addon',
Expand Down
2 changes: 1 addition & 1 deletion packages/feedback/rollup.npm.config.js → packages/feedback/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(
makeBaseNPMConfig({
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
"build:dev": "yarn build",
"build:plugin": "tsc -p tsconfig.plugin.json",
"build:transpile": "run-p build:rollup build:plugin",
"build:rollup": "rollup -c rollup.npm.config.js",
"build:rollup": "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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/gatsby/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/gatsby/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(makeBaseNPMConfig());
4 changes: 2 additions & 2 deletions packages/hub/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/hub/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/hub/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(makeBaseNPMConfig());
2 changes: 1 addition & 1 deletion packages/integration-shims/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"private": true,
"scripts": {
"build": "run-p build:transpile build:types",
"build:transpile": "rollup -c rollup.npm.config.js",
"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
2 changes: 1 addition & 1 deletion ...es/integration-shims/rollup.npm.config.js → ...s/integration-shims/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(
makeBaseNPMConfig({
Expand Down
4 changes: 2 additions & 2 deletions packages/integrations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"build": "run-p build:transpile build:types build:bundle",
"build:bundle": "ts-node scripts/buildBundles.ts --parallel",
"build:dev": "run-p build:transpile build:types",
"build:transpile": "rollup -c rollup.npm.config.js",
"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/npm/types build/npm/types-ts3.8 --to ts3.8",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion ...ages/integrations/rollup.bundle.config.js → ...ges/integrations/rollup.bundle.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import commonjs from '@rollup/plugin-commonjs';

import { insertAt, makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';
import { insertAt, makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';

const builds = [];

Expand Down
2 changes: 1 addition & 1 deletion packages/tracing/rollup.npm.config.js → packages/integrations/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(
makeBaseNPMConfig({
Expand Down
2 changes: 1 addition & 1 deletion packages/integrations/scripts/buildBundles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function getIntegrations(): string[] {
/** Builds a bundle for a specific integration and JavaScript ES version */
async function buildBundle(integration: string, jsVersion: string): Promise<void> {
return new Promise((resolve, reject) => {
const child = spawn('yarn', ['--silent', 'rollup', '--config', 'rollup.bundle.config.js'], {
const child = spawn('yarn', ['--silent', 'rollup', '--config', 'rollup.bundle.config.mjs'], {
env: { ...process.env, INTEGRATION_FILE: integration, JS_VERSION: jsVersion },
});

Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/rollup.npm.config.js → packages/nextjs/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js';
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default [
...makeNPMConfigVariants(
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/scripts/buildRollup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function run(cmd: string, options?: childProcess.ExecSyncOptions): string | Buff
return childProcess.execSync(cmd, { stdio: 'inherit', ...options });
}

run('yarn rollup -c rollup.npm.config.js');
run('yarn rollup -c rollup.npm.config.mjs');

// Regardless of whether nextjs is using the CJS or ESM version of our SDK, we want the code from our templates to be in
// ESM (since we'll be adding it onto page files which are themselves written in ESM), so copy the ESM versions of the
Expand Down
4 changes: 2 additions & 2 deletions packages/node-experimental/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/node-experimental/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/node-experimental/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(makeBaseNPMConfig());
6 changes: 3 additions & 3 deletions packages/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
"undici": "^5.21.0"
},
"scripts": {
"build": "run-p build:transpile build:types",
"build": "run-s build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/node/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/node/rollup.npm.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(makeBaseNPMConfig());
4 changes: 2 additions & 2 deletions packages/opentelemetry-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"scripts": {
"build": "run-p build:transpile build:types",
"build:dev": "yarn build",
"build:transpile": "rollup -c rollup.npm.config.js",
"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",
"build:watch": "run-p build:transpile:watch build:types:watch",
"build:dev:watch": "yarn build:watch",
"build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
"circularDepCheck": "madge --circular src/index.ts",
Expand Down
3 changes: 0 additions & 3 deletions packages/opentelemetry-node/rollup.npm.config.js
View file
Open in desktop

This file was deleted.

Loading