update rollup

Author: c298lee

dev-packages/rollup-utils/bundleHelpers.mjs

@@ -8,6 +8,7 @@ import deepMerge from 'deepmerge';
 
 import {
   getEs5Polyfills,
+  makeAliasPlugin,
   makeBrowserBuildPlugin,
   makeCleanupPlugin,
   makeCommonJSPlugin,
@@ -29,6 +30,7 @@ export function makeBaseBundleConfig(options) {
 
   const isEs5 = jsVersion.toLowerCase() === 'es5';
 
+  const aliasPlugin = makeAliasPlugin();
   const nodeResolvePlugin = makeNodeResolvePlugin();
   const sucrasePlugin = makeSucrasePlugin();
   const cleanupPlugin = makeCleanupPlugin();
@@ -124,8 +126,8 @@ export function makeBaseBundleConfig(options) {
       esModule: false,
     },
     plugins: isEs5
-      ? [tsPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin]
-      : [sucrasePlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
+      ? [tsPlugin, aliasPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin]
+      : [sucrasePlugin, aliasPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
     treeshake: 'smallest',
   };
 

dev-packages/rollup-utils/npmHelpers.mjs

@@ -9,6 +9,7 @@ import * as path from 'path';
 import deepMerge from 'deepmerge';
 
 import {
+  makeAliasPlugin,
   makeCleanupPlugin,
   makeDebugBuildStatementReplacePlugin,
   makeExtractPolyfillsPlugin,
@@ -30,6 +31,7 @@ export function makeBaseNPMConfig(options = {}) {
     addPolyfills = true,
   } = options;
 
+  const aliasPlugin = makeAliasPlugin();
   const nodeResolvePlugin = makeNodeResolvePlugin();
   const sucrasePlugin = makeSucrasePlugin({ disableESTransforms: !addPolyfills });
   const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
@@ -91,6 +93,7 @@ export function makeBaseNPMConfig(options = {}) {
     },
 
     plugins: [
+      aliasPlugin,
       nodeResolvePlugin,
       setSdkSourcePlugin,
       sucrasePlugin,

dev-packages/rollup-utils/plugins/bundlePlugins.mjs

@@ -1,4 +1,5 @@
 /**
+ * Alias plugin docs: https://github.com/rollup/plugins/tree/master/packages/alias
  * CommonJS plugin docs: https://github.com/rollup/plugins/tree/master/packages/commonjs
  * License plugin docs: https://github.com/mjeanroy/rollup-plugin-license
  * Replace plugin docs: https://github.com/rollup/plugins/tree/master/packages/replace
@@ -13,6 +14,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 
+import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
@@ -189,3 +191,14 @@ export function makeNodeResolvePlugin() {
 }
 
 export { commonjs as makeCommonJSPlugin };
+
+export function makeAliasPlugin() {
+  return alias({
+    entries: [
+      { find: 'react', replacement: 'preact/compat' },
+      { find: 'react-dom/test-utils', replacement: 'preact/test-utils' },
+      { find: 'react-dom', replacement: 'preact/compat' },
+      { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' }
+    ]
+  });
+}

package.json

@@ -90,6 +90,7 @@
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.4.0",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",

packages/feedback-screenshot/package.json

@@ -33,8 +33,7 @@
     "@sentry/types": "7.100.0",
     "@sentry/utils": "7.100.0",
     "preact": "^10.19.4",
-    "preact-compat": "^3.19.0",
-    "@rollup/plugin-alias": "5.1.0"
+    "preact-compat": "^3.19.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types build:bundle",

packages/feedback-screenshot/rollup.bundle.config.mjs

@@ -1,23 +1,11 @@
 import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';
-import alias from '@rollup/plugin-alias';
 
 const baseBundleConfig = makeBaseBundleConfig({
   bundleType: 'addon',
   entrypoints: ['src/index.ts'],
   jsVersion: 'es6',
   licenseTitle: '@sentry-internal/feedback-screenshot',
   outputFileBase: () => 'bundles/feedback-screenshot',
-  plugins: [
-    alias({
-      entries: [
-        { find: 'react', replacement: 'preact/compat' },
-        { find: 'react-dom/test-utils', replacement: 'preact/test-utils' },
-        { find: 'react-dom', replacement: 'preact/compat' },
-        { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' }
-      ]
-    })
-  ],
-
 });
 
 const builds = makeBundleConfigVariants(baseBundleConfig);

packages/feedback-screenshot/rollup.npm.config.mjs

@@ -1,5 +1,4 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
-import alias from '@rollup/plugin-alias';
 
 export default makeNPMConfigVariants(
   makeBaseNPMConfig({
@@ -13,15 +12,5 @@ export default makeNPMConfigVariants(
         preserveModules: false,
       },
     },
-    plugins: ['@babel/transform-react-jsx', { pragma: 'h' },
-      alias({
-        entries: [
-          { find: 'react', replacement: 'preact/compat' },
-          { find: 'react-dom/test-utils', replacement: 'preact/test-utils' },
-          { find: 'react-dom', replacement: 'preact/compat' },
-          { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' }
-        ]
-      })
-    ],
   }),
 );

packages/feedback-screenshot/src/index.ts

@@ -5,4 +5,4 @@ export {
 } from './screenshot';
 export type { FeedbackScreenshotIntegrationOptions } from './screenshot';
 
-console.log('screenshot 6');
+console.log('screenshot 9');

packages/feedback-screenshot/src/screenshot.ts

@@ -6,12 +6,12 @@ import { h, render } from 'preact';
 
 interface FeedbackScreenshotOptions {
   el: Element;
-  props: string;
+  props: unknown;
 }
 
 export interface FeedbackScreenshotIntegrationOptions {
   el: Element;
-  props: string;
+  props: unknown;
 }
 
 const INTEGRATION_NAME = 'FeedbackScreenshot';
@@ -24,7 +24,7 @@ export const _feedbackScreenshotIntegration = ((options: Partial<FeedbackScreens
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     setupOnce() {},
     getOptions(): FeedbackScreenshotIntegrationOptions {
-      return { el: options.el || WINDOW.document.createElement('div'), props: options.props || 'prop' };
+      return { el: options.el || WINDOW.document.createElement('div'), props: options.props || null };
     },
     renderScreenshotWidget: (options: FeedbackScreenshotOptions) => {
       return render(h(Hello, null), options.el);

packages/feedback-screenshot/src/screenshotWidget.tsx

@@ -1,12 +1,7 @@
-import { h, render } from 'preact';
-
-interface FeedbackScreenshotOptions {
-  el: Element;
-  props: string;
-}
+import { h, createElement } from 'preact';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export function Hello(options: FeedbackScreenshotOptions) {
-  console.log('screenshot widget');
+export function Hello() {
+  console.log('screenshot widget 1');
   return h('div', null, 'hello');
 }

packages/feedback/src/widget/Form.ts

@@ -158,7 +158,7 @@ export function Form({
 
   const screenshot = createElement('div', { className: 'btn-group' });
 
-  // @ts-expect-error testing
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
   ScreenshotIntegration.feedbackScreenshotIntegration().renderScreenshotWidget({
     el: screenshot,
     props: null,

yarn.lock

@@ -5293,7 +5293,7 @@
   dependencies:
     web-streams-polyfill "^3.1.1"
 
-"@rollup/[email protected]":
+"@rollup/plugin-alias@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
   integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
@@ -5549,16 +5549,6 @@
     semver "7.3.2"
     semver-intersect "1.4.0"
 
-"@sentry-internal/feedback-screenshot@file:packages/feedback-screenshot":
-  version "7.100.0"
-  dependencies:
-    "@rollup/plugin-alias" "5.1.0"
-    "@sentry/core" "7.100.0"
-    "@sentry/types" "7.100.0"
-    "@sentry/utils" "7.100.0"
-    preact "^10.19.4"
-    preact-compat "^3.19.0"
-
 "@sentry-internal/[email protected]":
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/@sentry-internal/rrdom/-/rrdom-2.11.0.tgz#f7c8f54705ad84ece0e97e53f12e87c687749b32"