diff --git a/.eslintrc.js b/.eslintrc.js index 5a217a09fd75..882db9c4b069 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -62,7 +62,7 @@ module.exports = { }, }, { - files: ['scenarios/**', 'rollup/**'], + files: ['scenarios/**', 'packages/rollup-utils/**'], parserOptions: { sourceType: 'module', }, diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c7d639db7ed..726e2398d488 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,9 +86,9 @@ jobs: - 'CHANGELOG.md' - '.github/**' - 'jest/**' - - 'rollup/**' - 'scripts/**' - 'packages/core/**' + - 'packages/rollup-utils/**' - 'packages/tracing/**' - 'packages/tracing-internal/**' - 'packages/utils/**' diff --git a/package.json b/package.json index db8a133e494b..080235bde9a9 100644 --- a/package.json +++ b/package.json @@ -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", @@ -69,6 +69,7 @@ "packages/remix", "packages/replay", "packages/replay-worker", + "packages/rollup-utils", "packages/serverless", "packages/svelte", "packages/sveltekit", @@ -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", @@ -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", diff --git a/packages/astro/package.json b/packages/astro/package.json index 6546a3243030..af17f35903a4 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -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", diff --git a/packages/astro/rollup.npm.config.js b/packages/astro/rollup.npm.config.mjs similarity index 81% rename from packages/astro/rollup.npm.config.js rename to packages/astro/rollup.npm.config.mjs index eaab8bdb45bf..c485392d0ec7 100644 --- a/packages/astro/rollup.npm.config.js +++ b/packages/astro/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; const variants = makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/browser/package.json b/packages/browser/package.json index f47e4c89b373..4f5b3a0876dc 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -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", diff --git a/packages/browser/rollup.bundle.config.js b/packages/browser/rollup.bundle.config.mjs similarity index 98% rename from packages/browser/rollup.bundle.config.js rename to packages/browser/rollup.bundle.config.mjs index 9ebe2bd8b5aa..c64a88931a33 100644 --- a/packages/browser/rollup.bundle.config.js +++ b/packages/browser/rollup.bundle.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js'; +import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils'; const builds = []; diff --git a/packages/integrations/rollup.npm.config.js b/packages/browser/rollup.npm.config.mjs similarity index 64% rename from packages/integrations/rollup.npm.config.js rename to packages/browser/rollup.npm.config.mjs index 4ffa8b9396d8..6d09adefc859 100644 --- a/packages/integrations/rollup.npm.config.js +++ b/packages/browser/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/browser/test/integration/debugging.md b/packages/browser/test/integration/debugging.md index f97abe998aed..f25d70d788ae 100644 --- a/packages/browser/test/integration/debugging.md +++ b/packages/browser/test/integration/debugging.md @@ -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. diff --git a/packages/bun/package.json b/packages/bun/package.json index 0d7bb7b19edb..2c227464c197 100644 --- a/packages/bun/package.json +++ b/packages/bun/package.json @@ -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", diff --git a/packages/bun/rollup.npm.config.js b/packages/bun/rollup.npm.config.mjs similarity index 62% rename from packages/bun/rollup.npm.config.js rename to packages/bun/rollup.npm.config.mjs index ebbeb7063089..19f01d8cb3f8 100644 --- a/packages/bun/rollup.npm.config.js +++ b/packages/bun/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; const config = makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/core/package.json b/packages/core/package.json index 45d214a9933a..9b479f86857e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -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", diff --git a/packages/core/rollup.npm.config.js b/packages/core/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/core/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/core/rollup.npm.config.mjs b/packages/core/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/core/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/deno/package.json b/packages/deno/package.json index e879bd7e96e5..a9a4be67d57e 100644 --- a/packages/deno/package.json +++ b/packages/deno/package.json @@ -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", @@ -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", diff --git a/packages/deno/rollup.test.config.js b/packages/deno/rollup.test.config.mjs similarity index 100% rename from packages/deno/rollup.test.config.js rename to packages/deno/rollup.test.config.mjs diff --git a/packages/deno/rollup.types.config.js b/packages/deno/rollup.types.config.mjs similarity index 100% rename from packages/deno/rollup.types.config.js rename to packages/deno/rollup.types.config.mjs diff --git a/packages/eslint-config-sdk/src/base.js b/packages/eslint-config-sdk/src/base.js index a76af21e7a51..70f54626fbc7 100644 --- a/packages/eslint-config-sdk/src/base.js +++ b/packages/eslint-config-sdk/src/base.js @@ -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, diff --git a/packages/feedback/package.json b/packages/feedback/package.json index 6613d5af34ec..e15b1875ec1a 100644 --- a/packages/feedback/package.json +++ b/packages/feedback/package.json @@ -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", diff --git a/packages/feedback/rollup.bundle.config.js b/packages/feedback/rollup.bundle.config.mjs similarity index 91% rename from packages/feedback/rollup.bundle.config.js rename to packages/feedback/rollup.bundle.config.mjs index 185b38249dc0..3a9404947667 100644 --- a/packages/feedback/rollup.bundle.config.js +++ b/packages/feedback/rollup.bundle.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js'; +import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils'; const baseBundleConfig = makeBaseBundleConfig({ bundleType: 'addon', diff --git a/packages/feedback/rollup.npm.config.js b/packages/feedback/rollup.npm.config.mjs similarity index 81% rename from packages/feedback/rollup.npm.config.js rename to packages/feedback/rollup.npm.config.mjs index e823e7b18863..5a1800f23b08 100644 --- a/packages/feedback/rollup.npm.config.js +++ b/packages/feedback/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 47e54ae5b6d2..c2c99396c6e1 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -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", diff --git a/packages/gatsby/rollup.npm.config.js b/packages/gatsby/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/gatsby/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/gatsby/rollup.npm.config.mjs b/packages/gatsby/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/gatsby/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/hub/package.json b/packages/hub/package.json index 75c66ff8d3d8..2fa2b52951f0 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -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", diff --git a/packages/hub/rollup.npm.config.js b/packages/hub/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/hub/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/hub/rollup.npm.config.mjs b/packages/hub/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/hub/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json index 57d2bf660e2d..18008fcc0a31 100644 --- a/packages/integration-shims/package.json +++ b/packages/integration-shims/package.json @@ -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", diff --git a/packages/integration-shims/rollup.npm.config.js b/packages/integration-shims/rollup.npm.config.mjs similarity index 53% rename from packages/integration-shims/rollup.npm.config.js rename to packages/integration-shims/rollup.npm.config.mjs index 2928d05abeed..601cc6837ce0 100644 --- a/packages/integration-shims/rollup.npm.config.js +++ b/packages/integration-shims/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/integrations/package.json b/packages/integrations/package.json index 00df25bdb690..0989974a4b8a 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -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", diff --git a/packages/integrations/rollup.bundle.config.js b/packages/integrations/rollup.bundle.config.mjs similarity index 95% rename from packages/integrations/rollup.bundle.config.js rename to packages/integrations/rollup.bundle.config.mjs index 7c4d2d15e2a6..366585b8abe3 100644 --- a/packages/integrations/rollup.bundle.config.js +++ b/packages/integrations/rollup.bundle.config.mjs @@ -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 = []; diff --git a/packages/tracing/rollup.npm.config.js b/packages/integrations/rollup.npm.config.mjs similarity index 64% rename from packages/tracing/rollup.npm.config.js rename to packages/integrations/rollup.npm.config.mjs index 4ffa8b9396d8..6d09adefc859 100644 --- a/packages/tracing/rollup.npm.config.js +++ b/packages/integrations/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/integrations/scripts/buildBundles.ts b/packages/integrations/scripts/buildBundles.ts index c3c61ed66ef3..d056d5a523e2 100644 --- a/packages/integrations/scripts/buildBundles.ts +++ b/packages/integrations/scripts/buildBundles.ts @@ -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 { 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 }, }); diff --git a/packages/nextjs/rollup.npm.config.js b/packages/nextjs/rollup.npm.config.mjs similarity index 96% rename from packages/nextjs/rollup.npm.config.js rename to packages/nextjs/rollup.npm.config.mjs index e033fd6f90c1..39b79c9593b2 100644 --- a/packages/nextjs/rollup.npm.config.js +++ b/packages/nextjs/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default [ ...makeNPMConfigVariants( diff --git a/packages/nextjs/scripts/buildRollup.ts b/packages/nextjs/scripts/buildRollup.ts index 0bf01ba51e4c..d273146b872d 100644 --- a/packages/nextjs/scripts/buildRollup.ts +++ b/packages/nextjs/scripts/buildRollup.ts @@ -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 diff --git a/packages/node-experimental/package.json b/packages/node-experimental/package.json index b68e8e730287..39f4c5955ec8 100644 --- a/packages/node-experimental/package.json +++ b/packages/node-experimental/package.json @@ -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", diff --git a/packages/node-experimental/rollup.npm.config.js b/packages/node-experimental/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/node-experimental/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/node-experimental/rollup.npm.config.mjs b/packages/node-experimental/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/node-experimental/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/node/package.json b/packages/node/package.json index 08cc8f08aafa..a2725d727a5e 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -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", diff --git a/packages/node/rollup.npm.config.js b/packages/node/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/node/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/node/rollup.npm.config.mjs b/packages/node/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/node/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json index 2f941536e63e..95056c2db144 100644 --- a/packages/opentelemetry-node/package.json +++ b/packages/opentelemetry-node/package.json @@ -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", diff --git a/packages/opentelemetry-node/rollup.npm.config.js b/packages/opentelemetry-node/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/opentelemetry-node/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/opentelemetry-node/rollup.npm.config.mjs b/packages/opentelemetry-node/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/opentelemetry-node/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json index 4ca5eab7a721..29dbec1784cb 100644 --- a/packages/opentelemetry/package.json +++ b/packages/opentelemetry/package.json @@ -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", diff --git a/packages/opentelemetry/rollup.npm.config.js b/packages/opentelemetry/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/opentelemetry/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/opentelemetry/rollup.npm.config.mjs b/packages/opentelemetry/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/opentelemetry/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/react/package.json b/packages/react/package.json index 0611bc0c5de0..586352e98697 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -59,13 +59,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", diff --git a/packages/react/rollup.npm.config.js b/packages/react/rollup.npm.config.mjs similarity index 51% rename from packages/react/rollup.npm.config.js rename to packages/react/rollup.npm.config.mjs index ebe81bb263c6..d87739380bd6 100644 --- a/packages/react/rollup.npm.config.js +++ b/packages/react/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/remix/package.json b/packages/remix/package.json index 030bc03e0053..8ab0d273d0b0 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -49,13 +49,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.server.ts", diff --git a/packages/remix/rollup.npm.config.js b/packages/remix/rollup.npm.config.mjs similarity index 80% rename from packages/remix/rollup.npm.config.js rename to packages/remix/rollup.npm.config.mjs index dc51f24c7bb2..c588c260c703 100644 --- a/packages/remix/rollup.npm.config.js +++ b/packages/remix/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json index 06e806f070e9..ea42514386f5 100644 --- a/packages/replay-worker/package.json +++ b/packages/replay-worker/package.json @@ -16,8 +16,8 @@ "private": true, "scripts": { "build": "run-p build:transpile build:types", - "build:transpile": "rollup -c rollup.worker.config.js", - "build:examples": "rollup -c rollup.examples.config.js", + "build:transpile": "rollup -c rollup.worker.config.mjs", + "build:examples": "rollup -c rollup.examples.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", diff --git a/packages/replay-worker/rollup.worker.config.js b/packages/replay-worker/rollup.worker.config.mjs similarity index 100% rename from packages/replay-worker/rollup.worker.config.js rename to packages/replay-worker/rollup.worker.config.mjs diff --git a/packages/replay/package.json b/packages/replay/package.json index 177064e08084..36dd377bbd14 100644 --- a/packages/replay/package.json +++ b/packages/replay/package.json @@ -15,8 +15,8 @@ "sideEffects": false, "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", diff --git a/packages/replay/rollup.bundle.config.js b/packages/replay/rollup.bundle.config.mjs similarity index 91% rename from packages/replay/rollup.bundle.config.js rename to packages/replay/rollup.bundle.config.mjs index 75f240f85822..a209b8d41af4 100644 --- a/packages/replay/rollup.bundle.config.js +++ b/packages/replay/rollup.bundle.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js'; +import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils'; const baseBundleConfig = makeBaseBundleConfig({ bundleType: 'addon', diff --git a/packages/replay/rollup.npm.config.js b/packages/replay/rollup.npm.config.mjs similarity index 81% rename from packages/replay/rollup.npm.config.js rename to packages/replay/rollup.npm.config.mjs index c3c2db72bebf..8c50a33f0afb 100644 --- a/packages/replay/rollup.npm.config.js +++ b/packages/replay/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/rollup-utils/README.md b/packages/rollup-utils/README.md new file mode 100644 index 000000000000..2d79f3eabeec --- /dev/null +++ b/packages/rollup-utils/README.md @@ -0,0 +1,5 @@ +# The `rollup-utils` Package + +This is a small utility packages for all the Rollup configurations we have in this project. It contains helpers to create standardized configs, custom rollup plugins, and other things that might have to do with the build process like polyfill snippets. + +This package will not be published and is only intended to be used inside this repository. diff --git a/rollup/bundleHelpers.js b/packages/rollup-utils/bundleHelpers.mjs similarity index 98% rename from rollup/bundleHelpers.js rename to packages/rollup-utils/bundleHelpers.mjs index cd329dfb31d2..93a84670a6ff 100644 --- a/rollup/bundleHelpers.js +++ b/packages/rollup-utils/bundleHelpers.mjs @@ -19,8 +19,8 @@ import { makeSucrasePlugin, makeTSPlugin, makeTerserPlugin, -} from './plugins/index.js'; -import { mergePlugins } from './utils'; +} from './plugins/index.mjs'; +import { mergePlugins } from './utils.mjs'; const BUNDLE_VARIANTS = ['.js', '.min.js', '.debug.min.js']; diff --git a/packages/rollup-utils/index.mjs b/packages/rollup-utils/index.mjs new file mode 100644 index 000000000000..2d8c9a2150bc --- /dev/null +++ b/packages/rollup-utils/index.mjs @@ -0,0 +1,7 @@ +// TODO Is this necessary? +import * as plugins from './plugins/index.mjs'; +export { plugins }; + +export * from './bundleHelpers.mjs'; +export * from './npmHelpers.mjs'; +export { insertAt } from './utils.mjs'; diff --git a/rollup/npmHelpers.js b/packages/rollup-utils/npmHelpers.mjs similarity index 94% rename from rollup/npmHelpers.js rename to packages/rollup-utils/npmHelpers.mjs index 3d374a4e05f0..6085a502200f 100644 --- a/rollup/npmHelpers.js +++ b/packages/rollup-utils/npmHelpers.mjs @@ -2,6 +2,7 @@ * Rollup config docs: https://rollupjs.org/guide/en/#big-list-of-options */ +import * as fs from 'fs'; import { builtinModules } from 'module'; import * as path from 'path'; @@ -15,10 +16,10 @@ import { makeRrwebBuildPlugin, makeSetSDKSourcePlugin, makeSucrasePlugin, -} from './plugins/index.js'; -import { mergePlugins } from './utils'; +} from './plugins/index.mjs'; +import { mergePlugins } from './utils.mjs'; -const packageDotJSON = require(path.resolve(process.cwd(), './package.json')); +const packageDotJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), './package.json'), { encoding: 'utf8' })); export function makeBaseNPMConfig(options = {}) { const { diff --git a/packages/rollup-utils/package.json b/packages/rollup-utils/package.json new file mode 100644 index 000000000000..b44f51559d01 --- /dev/null +++ b/packages/rollup-utils/package.json @@ -0,0 +1,19 @@ +{ + "name": "@sentry-internal/rollup-utils", + "version": "7.88.0", + "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK", + "repository": "git://github.com/getsentry/sentry-javascript.git", + "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils", + "author": "Sentry", + "license": "MIT", + "private": true, + "main": "./index.mjs", + "dependencies": { + "acorn": "^8.7.0", + "recast": "^0.20.5" + }, + "volta": { + "extends": "../../package.json" + }, + "type": "module" +} diff --git a/rollup/plugins/bundlePlugins.js b/packages/rollup-utils/plugins/bundlePlugins.mjs similarity index 95% rename from rollup/plugins/bundlePlugins.js rename to packages/rollup-utils/plugins/bundlePlugins.mjs index 87dfffc1f0f0..66f8e8c78228 100644 --- a/rollup/plugins/bundlePlugins.js +++ b/packages/rollup-utils/plugins/bundlePlugins.mjs @@ -8,8 +8,10 @@ * Typescript plugin docs: https://github.com/rollup/plugins/tree/master/packages/typescript/#readme */ +import * as childProcess from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; +import { fileURLToPath } from 'url'; import commonjs from '@rollup/plugin-commonjs'; import { nodeResolve } from '@rollup/plugin-node-resolve'; @@ -26,7 +28,7 @@ import { terser } from 'rollup-plugin-terser'; * @returns An instance of the `rollup-plugin-license` plugin */ export function makeLicensePlugin(title) { - const commitHash = require('child_process').execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim(); + const commitHash = childProcess.execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim(); const plugin = license({ banner: { @@ -42,8 +44,7 @@ export function makeLicensePlugin(title) { } export function getEs5Polyfills() { - // Note: __dirname resolves to e.g. packages/browser or packages/tracing - return fs.readFileSync(path.join(__dirname, '../../rollup/polyfills/es5.js'), 'utf-8'); + return fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), '../polyfills/es5.js'), 'utf-8'); } /** diff --git a/rollup/plugins/extractPolyfillsPlugin.js b/packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs similarity index 98% rename from rollup/plugins/extractPolyfillsPlugin.js rename to packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs index e036e70e9593..ad7c99094843 100644 --- a/rollup/plugins/extractPolyfillsPlugin.js +++ b/packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs @@ -1,7 +1,7 @@ import * as path from 'path'; +import * as acorn from 'acorn'; import * as recast from 'recast'; -import * as acornParser from 'recast/parsers/acorn'; const POLYFILL_NAMES = new Set([ '_asyncNullishCoalesce', @@ -53,7 +53,7 @@ export function makeExtractPolyfillsPlugin() { // See https://github.com/benjamn/recast/issues/578. parser: { parse(source, options) { - return acornParser.parse(source, { + return acorn.parse(source, { ...options, // By this point in the build, everything should already have been down-compiled to whatever JS version // we're targeting. Setting this parser to `latest` just means that whatever that version is (or changes diff --git a/packages/rollup-utils/plugins/index.mjs b/packages/rollup-utils/plugins/index.mjs new file mode 100644 index 000000000000..5e40aa3508e4 --- /dev/null +++ b/packages/rollup-utils/plugins/index.mjs @@ -0,0 +1,2 @@ +export * from './bundlePlugins.mjs'; +export * from './npmPlugins.mjs'; diff --git a/rollup/plugins/npmPlugins.js b/packages/rollup-utils/plugins/npmPlugins.mjs similarity index 98% rename from rollup/plugins/npmPlugins.js rename to packages/rollup-utils/plugins/npmPlugins.mjs index b7683a1306e4..507480c1dd43 100644 --- a/rollup/plugins/npmPlugins.js +++ b/packages/rollup-utils/plugins/npmPlugins.mjs @@ -64,6 +64,7 @@ export function makeSucrasePlugin(options = {}) { export function makeDebuggerPlugin(hookName) { return { name: 'debugger-plugin', + // eslint-disable-next-line no-unused-vars [hookName]: (..._args) => { // eslint-disable-next-line no-debugger debugger; @@ -130,4 +131,4 @@ export function makeRrwebBuildPlugin({ excludeShadowDom, excludeIframe } = {}) { }); } -export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.js'; +export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs'; diff --git a/rollup/polyfills/es5.js b/packages/rollup-utils/polyfills/es5.js similarity index 100% rename from rollup/polyfills/es5.js rename to packages/rollup-utils/polyfills/es5.js diff --git a/rollup/utils.js b/packages/rollup-utils/utils.mjs similarity index 100% rename from rollup/utils.js rename to packages/rollup-utils/utils.mjs diff --git a/packages/serverless/package.json b/packages/serverless/package.json index 3db9a1290d59..5ae633418dd0 100644 --- a/packages/serverless/package.json +++ b/packages/serverless/package.json @@ -46,13 +46,13 @@ "build": "run-p build:transpile build:types build:bundle", "build:bundle": "yarn ts-node scripts/buildLambdaLayer.ts", "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", diff --git a/packages/serverless/rollup.aws.config.js b/packages/serverless/rollup.aws.config.mjs similarity index 97% rename from packages/serverless/rollup.aws.config.js rename to packages/serverless/rollup.aws.config.mjs index 5a32f2632f3e..5d9883a3f9f7 100644 --- a/packages/serverless/rollup.aws.config.js +++ b/packages/serverless/rollup.aws.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseBundleConfig, makeBaseNPMConfig, makeBundleConfigVariants } from '../../rollup/index.js'; +import { makeBaseBundleConfig, makeBaseNPMConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils'; export default [ // The SDK diff --git a/packages/serverless/rollup.npm.config.js b/packages/serverless/rollup.npm.config.mjs similarity index 86% rename from packages/serverless/rollup.npm.config.js rename to packages/serverless/rollup.npm.config.mjs index 4e9641d5879e..b51a3bdafdb5 100644 --- a/packages/serverless/rollup.npm.config.js +++ b/packages/serverless/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/serverless/scripts/buildLambdaLayer.ts b/packages/serverless/scripts/buildLambdaLayer.ts index 540a1cab7451..9b6912898386 100644 --- a/packages/serverless/scripts/buildLambdaLayer.ts +++ b/packages/serverless/scripts/buildLambdaLayer.ts @@ -20,7 +20,7 @@ async function buildLambdaLayer(): Promise { await ensureBundleBuildPrereqs({ dependencies: ['@sentry/utils', '@sentry/hub', '@sentry/core', '@sentry/node'], }); - run('yarn rollup --config rollup.aws.config.js'); + run('yarn rollup --config rollup.aws.config.mjs'); // We build a minified bundle, but it's standing in for the regular `index.js` file listed in `package.json`'s `main` // property, so we have to rename it so it's findable. diff --git a/packages/svelte/package.json b/packages/svelte/package.json index be4bd6383e0e..5688faf899af 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -39,13 +39,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", diff --git a/packages/svelte/rollup.npm.config.js b/packages/svelte/rollup.npm.config.mjs similarity index 69% rename from packages/svelte/rollup.npm.config.js rename to packages/svelte/rollup.npm.config.mjs index ae3c7a9a5b8a..e756611ad33a 100644 --- a/packages/svelte/rollup.npm.config.js +++ b/packages/svelte/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index f3ac37df21b8..d3ac78962355 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -51,11 +51,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", diff --git a/packages/sveltekit/rollup.npm.config.js b/packages/sveltekit/rollup.npm.config.mjs similarity index 77% rename from packages/sveltekit/rollup.npm.config.js rename to packages/sveltekit/rollup.npm.config.mjs index 8e562f3d5168..b0a19e091ad8 100644 --- a/packages/sveltekit/rollup.npm.config.js +++ b/packages/sveltekit/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/tracing-internal/package.json b/packages/tracing-internal/package.json index 30ca1c3f22fe..f0ed285430ba 100644 --- a/packages/tracing-internal/package.json +++ b/packages/tracing-internal/package.json @@ -33,13 +33,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": "run-p build:transpile:watch build:types: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", "clean": "rimraf build coverage sentry-internal-tracing-*.tgz", diff --git a/packages/tracing-internal/rollup.npm.config.js b/packages/tracing-internal/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/tracing-internal/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/tracing-internal/rollup.npm.config.mjs b/packages/tracing-internal/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/tracing-internal/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 6f7ba1b3a778..90fa1a9cc987 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -36,13 +36,13 @@ "scripts": { "build": "run-p build:transpile build:types", "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": "run-p build:transpile:watch build:types: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", "clean": "rimraf build coverage sentry-tracing-*.tgz", diff --git a/packages/browser/rollup.npm.config.js b/packages/tracing/rollup.npm.config.mjs similarity index 64% rename from packages/browser/rollup.npm.config.js rename to packages/tracing/rollup.npm.config.mjs index 4ffa8b9396d8..6d09adefc859 100644 --- a/packages/browser/rollup.npm.config.js +++ b/packages/tracing/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/packages/types/package.json b/packages/types/package.json index eaa65fdb2a79..d5ac8ba2164b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -25,13 +25,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", "clean": "rimraf build sentry-types-*.tgz", diff --git a/packages/types/rollup.npm.config.js b/packages/types/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/types/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/types/rollup.npm.config.mjs b/packages/types/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/types/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/utils/package.json b/packages/utils/package.json index eeb9ab784ae9..940a62d01846 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -39,7 +39,7 @@ "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", diff --git a/packages/utils/rollup.npm.config.js b/packages/utils/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/utils/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/utils/rollup.npm.config.mjs b/packages/utils/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/utils/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/utils/scripts/buildRollup.ts b/packages/utils/scripts/buildRollup.ts index 6ce18d747787..80064a14aed7 100644 --- a/packages/utils/scripts/buildRollup.ts +++ b/packages/utils/scripts/buildRollup.ts @@ -9,7 +9,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'); // We want to distribute the README because it contains the MIT license blurb from Sucrase and Rollup fs.copyFileSync('src/buildPolyfills/README.md', 'build/cjs/buildPolyfills/README.md'); diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index 380e28a08d1d..7ad9965f1a71 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -35,13 +35,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", diff --git a/packages/vercel-edge/rollup.npm.config.js b/packages/vercel-edge/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/vercel-edge/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/vercel-edge/rollup.npm.config.mjs b/packages/vercel-edge/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/vercel-edge/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/vue/package.json b/packages/vue/package.json index ffd7ee5e1bb2..096ba312ff9d 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -37,13 +37,13 @@ "scripts": { "build": "run-p build:transpile build:types", "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/types build/types-ts3.8 --to ts3.8", "build:watch": "run-p build:transpile:watch build:types:watch", "build:dev:watch": "run-p build:transpile:watch build:types: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", diff --git a/packages/vue/rollup.npm.config.js b/packages/vue/rollup.npm.config.js deleted file mode 100644 index 5a62b528ef44..000000000000 --- a/packages/vue/rollup.npm.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; - -export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/vue/rollup.npm.config.mjs b/packages/vue/rollup.npm.config.mjs new file mode 100644 index 000000000000..84a06f2fb64a --- /dev/null +++ b/packages/vue/rollup.npm.config.mjs @@ -0,0 +1,3 @@ +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; + +export default makeNPMConfigVariants(makeBaseNPMConfig()); diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 1ec627dc86b7..8ed638485478 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -29,16 +29,16 @@ }, "scripts": { "build": "run-p build:transpile build:bundle build:types", - "build:bundle": "rollup --config rollup.bundle.config.js", + "build:bundle": "rollup --config rollup.bundle.config.mjs", "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:bundle:watch build:types:watch", - "build:bundle:watch": "rollup --config rollup.bundle.config.js --watch", + "build:bundle:watch": "rollup --config rollup.bundle.config.mjs --watch", "build:dev:watch": "run-p build:transpile:watch build:types: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", diff --git a/packages/wasm/rollup.bundle.config.js b/packages/wasm/rollup.bundle.config.mjs similarity index 91% rename from packages/wasm/rollup.bundle.config.js rename to packages/wasm/rollup.bundle.config.mjs index 2c97176f0dee..b149d75d6244 100644 --- a/packages/wasm/rollup.bundle.config.js +++ b/packages/wasm/rollup.bundle.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js'; +import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils'; const baseBundleConfig = makeBaseBundleConfig({ bundleType: 'addon', diff --git a/packages/wasm/rollup.npm.config.js b/packages/wasm/rollup.npm.config.mjs similarity index 64% rename from packages/wasm/rollup.npm.config.js rename to packages/wasm/rollup.npm.config.mjs index 4ffa8b9396d8..6d09adefc859 100644 --- a/packages/wasm/rollup.npm.config.js +++ b/packages/wasm/rollup.npm.config.mjs @@ -1,4 +1,4 @@ -import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'; +import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils'; export default makeNPMConfigVariants( makeBaseNPMConfig({ diff --git a/rollup/index.js b/rollup/index.js deleted file mode 100644 index 2ae4712165ad..000000000000 --- a/rollup/index.js +++ /dev/null @@ -1,9 +0,0 @@ -Error.stackTraceLimit = Infinity; - -// TODO Is this necessary? -import * as plugins from './plugins/index.js'; -export { plugins }; - -export * from './bundleHelpers.js'; -export * from './npmHelpers.js'; -export { insertAt } from './utils.js'; diff --git a/rollup/plugins/index.js b/rollup/plugins/index.js deleted file mode 100644 index 014b3b383b4d..000000000000 --- a/rollup/plugins/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export * from './bundlePlugins'; -export * from './npmPlugins'; diff --git a/scripts/tarball-checksums.sh b/scripts/tarball-checksums.sh new file mode 100644 index 000000000000..60487f9037d3 --- /dev/null +++ b/scripts/tarball-checksums.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# Get the directory of the script +script_dir=$(cd "$(dirname "$0")" && pwd) + +# Function to calculate SHA checksums for files +calculate_sha_checksum() { + file="$1" + # Strip the directory name from the file path + file_name=$(basename "$file") + sha_checksum=$(sha256sum "$file" | awk '{print $1}') + # Align the output + printf "%-48s: %s\n" "$file_name" "$sha_checksum" +} + +# Main function to process files recursively +process_files() { + # Find all ".tgz" files recursively + find "$script_dir/.." -type f -name "*.tgz" | while IFS= read -r file; do + calculate_sha_checksum "$file" + done +} + +# Call the main function to process files +process_files