rename feedback2 to feedback

Author: ryan953

.size-limit.js

@@ -55,30 +55,23 @@ module.exports = [
     limit: '35 KB',
   },
   {
-    name: '@sentry/browser (incl. Feedback) - Webpack (gzipped)',
+    name: '@sentry/browser (incl. feedbackIntegration) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
     import: '{ init, feedbackIntegration }',
     gzip: true,
     limit: '50 KB',
   },
   {
-    name: '@sentry/browser (incl. feedback2Integration) - Webpack (gzipped)',
+    name: '@sentry/browser (incl. feedbackModalIntegration) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedback2Integration }',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration }',
     gzip: true,
     limit: '50 KB',
   },
   {
-    name: '@sentry/browser (incl. feedback2ModalIntegration) - Webpack (gzipped)',
+    name: '@sentry/browser (incl. feedbackScreenshotIntegration) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedback2Integration, feedback2ModalIntegration }',
-    gzip: true,
-    limit: '50 KB',
-  },
-  {
-    name: '@sentry/browser (incl. feedback2ScreenshotIntegration) - Webpack (gzipped)',
-    path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, feedback2Integration, feedback2ModalIntegration, feedback2ScreenshotIntegration }',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration, feedbackScreenshotIntegration }',
     gzip: true,
     limit: '50 KB',
   },

package.json

@@ -55,7 +55,6 @@
     "packages/eslint-config-sdk",
     "packages/eslint-plugin-sdk",
     "packages/feedback",
-    "packages/feedback2",
     "packages/gatsby",
     "packages/google-cloud",
     "packages/integration-shims",

packages/feedback/.eslintrc.js

@@ -7,29 +7,18 @@ module.exports = {
   extends: ['../../.eslintrc.js'],
   overrides: [
     {
-      files: ['jest.setup.ts', 'jest.config.ts'],
-      parserOptions: {
-        project: ['tsconfig.test.json'],
-      },
+      files: ['src/**/*.ts', 'src/**/*.tsx'],
       rules: {
-        'no-console': 'off',
+        '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
       },
     },
     {
-      files: ['test/**/*.ts'],
-
-      rules: {
-        // most of these errors come from `new Promise(process.nextTick)`
-        '@typescript-eslint/unbound-method': 'off',
-        // TODO: decide if we want to enable this again after the migration
-        // We can take the freedom to be a bit more lenient with tests
-        '@typescript-eslint/no-floating-promises': 'off',
+      files: ['jest.setup.ts', 'jest.config.ts'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
       },
-    },
-    {
-      files: ['src/types/deprecated.ts'],
       rules: {
-        '@typescript-eslint/naming-convention': 'off',
+        'no-console': 'off',
       },
     },
   ],

packages/feedback/package.json

@@ -18,33 +18,35 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./build/npm/types/index.d.ts",
-        "default": "./build/npm/esm/index.js"
-      },
-      "require": {
-        "types": "./build/npm/types/index.d.ts",
-        "default": "./build/npm/cjs/index.js"
-      }
-    }
-  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
         "build/npm/types-ts3.8/index.d.ts"
       ]
     }
   },
+  "exports": {
+   "./package.json": "./package.json",
+   ".": {
+     "import": {
+       "types": "./build/npm/types/index.d.ts",
+       "default": "./build/npm/esm/index.js"
+     },
+     "require": {
+       "types": "./build/npm/types/index.d.ts",
+       "default": "./build/npm/cjs/index.js"
+     }
+   }
+  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
-    "@sentry/utils": "8.0.0-alpha.2"
+    "@sentry/utils": "8.0.0-alpha.2",
+    "preact": "^10.19.4",
+    "preact-compat": "^3.19.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types build:bundle",

packages/feedback/rollup.bundle.config.mjs

@@ -1,12 +1,15 @@
 import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';
 
-const baseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'addon',
-  entrypoints: ['src/index.ts'],
-  licenseTitle: '@sentry-internal/feedback',
-  outputFileBase: () => 'bundles/feedback',
-});
-
-const builds = makeBundleConfigVariants(baseBundleConfig);
-
-export default builds;
+export default makeBundleConfigVariants(
+  makeBaseBundleConfig({
+    bundleType: 'addon',
+    entrypoints: ['src/index.ts'],
+    jsVersion: 'es6',
+    licenseTitle: '@sentry-internal/feedback',
+    outputFileBase: () => 'bundles/feedback',
+    sucrase: {
+      jsxPragma: 'h',
+      jsxFragmentPragma: 'Fragment',
+    },
+  }),
+);

packages/feedback/rollup.npm.config.mjs

@@ -12,5 +12,9 @@ export default makeNPMConfigVariants(
         preserveModules: false,
       },
     },
+    sucrase: {
+      jsxPragma: 'h',
+      jsxFragmentPragma: 'Fragment',
+    },
   }),
 );

packages/feedback/src/constants.ts

@@ -16,8 +16,8 @@ import {
   SUBMIT_BUTTON_LABEL,
   SUCCESS_MESSAGE_TEXT,
 } from '../constants';
-import type { IFeedback2ModalIntegration } from '../modal/integration';
-import type { IFeedback2ScreenshotIntegration } from '../screenshot/integration';
+import type { IFeedbackModalIntegration } from '../modal/integration';
+import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
 import type {
   Dialog,
   FeedbackInternalOptions,
@@ -33,7 +33,7 @@ import { sendFeedback } from './sendFeedback';
 
 type Unsubscribe = () => void;
 
-interface PublicFeedback2Integration {
+interface PublicFeedbackIntegration {
   attachTo: (el: Element | string, optionOverrides: OverrideFeedbackConfiguration) => () => void;
   createWidget: (optionOverrides: OverrideFeedbackConfiguration & { shouldCreateActor?: boolean }) => Promise<Dialog>;
   getWidget: () => Dialog | null;
@@ -42,9 +42,9 @@ interface PublicFeedback2Integration {
   closeDialog: () => void;
   removeWidget: () => void;
 }
-export type IFeedback2Integration = IntegrationFnResult & PublicFeedback2Integration;
+export type IFeedbackIntegration = IntegrationFnResult & PublicFeedbackIntegration;
 
-export const _feedback2Integration = (({
+export const _feedbackIntegration = (({
   // FeedbackGeneralConfiguration
   id = 'sentry-feedback',
   showBranding = true,
@@ -147,8 +147,8 @@ export const _feedback2Integration = (({
     if (!client) {
       throw new Error('Sentry Client is not initialized correctly');
     }
-    const modalIntegration = client.getIntegrationByName<IFeedback2ModalIntegration>('Feedback2Modal');
-    const screenshotIntegration = client.getIntegrationByName<IFeedback2ScreenshotIntegration>('Feedback2Screenshot');
+    const modalIntegration = client.getIntegrationByName<IFeedbackModalIntegration>('FeedbackModal');
+    const screenshotIntegration = client.getIntegrationByName<IFeedbackScreenshotIntegration>('FeedbackScreenshot');
     const screenshotIsSupported = isScreenshotSupported();
 
     // START TEMP: Error messages
@@ -239,7 +239,7 @@ export const _feedback2Integration = (({
   };
 
   return {
-    name: 'Feedback2',
+    name: 'Feedback',
     setupOnce() {
       if (!isBrowser() || !_options.autoInject) {
         return;
@@ -277,4 +277,4 @@ export const _feedback2Integration = (({
   };
 }) satisfies IntegrationFn;
 
-export const feedback2Integration = defineIntegration(_feedback2Integration);
+export const feedbackIntegration = defineIntegration(_feedbackIntegration);

packages/feedback2/src/constants/index.ts renamed to packages/feedback/src/constants/index.ts

@@ -1,2 +1,7 @@
-export { sendFeedback } from './sendFeedback';
-export { feedbackIntegration } from './integration';
+export { sendFeedback } from './core/sendFeedback';
+export { feedbackIntegration } from './core/integration';
+export { feedbackModalIntegration } from './modal/integration';
+export { feedbackScreenshotIntegration } from './screenshot/integration';
+
+export type { OptionalFeedbackConfiguration } from './types';
+export type { IFeedbackIntegration } from './core/integration';