Revert "build(cdn): Ensure ES5 bundles do not use non-ES5 code (#7550)"

This reverts commit 0e3552d.

Author: billyvg

.github/workflows/build.yml

@@ -321,10 +321,8 @@ jobs:
         uses: ./.github/actions/restore-cache
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Lint source files
+      - name: Run linter
         run: yarn lint
-      - name: Validate ES5 builds
-        run: yarn validate:es5
 
   job_circular_dep_check:
     name: Circular Dependency Check

package.json

@@ -23,7 +23,6 @@
     "link:yarn": "lerna exec yarn link",
     "lint": "lerna run lint",
     "lint:eslint": "lerna run lint:eslint",
-    "validate:es5": "lerna run validate:es5",
     "postpublish": "lerna run --stream --concurrency 1 postpublish",
     "test": "lerna run --ignore @sentry-internal/* test",
     "test:unit": "lerna run --ignore @sentry-internal/* test:unit",
@@ -90,7 +89,6 @@
     "chai": "^4.1.2",
     "codecov": "^3.6.5",
     "deepmerge": "^4.2.2",
-    "es-check": "7.1.0",
     "eslint": "7.32.0",
     "jest": "^27.5.1",
     "jest-environment-node": "^27.5.1",

packages/browser/package.json

@@ -68,7 +68,6 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --format stylish",
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
-    "validate:es5": "es-check es5 'build/bundles/*.es5*.js'",
     "size:check": "run-p size:check:es5 size:check:es6",
     "size:check:es5": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES5: \",$1,\"kB\";}'",
     "size:check:es6": "cat build/bundles/bundle.es6.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES6: \",$1,\"kB\";}'",

packages/eslint-config-sdk/src/index.js

@@ -161,9 +161,6 @@ module.exports = {
 
         // All imports should be accounted for
         'import/no-extraneous-dependencies': 'error',
-
-        // Do not allow usage of functions we do not polyfill for ES5
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'error',
       },
     },
     {

packages/eslint-plugin-sdk/src/index.js

@@ -13,6 +13,5 @@ module.exports = {
     'no-optional-chaining': require('./rules/no-optional-chaining'),
     'no-nullish-coalescing': require('./rules/no-nullish-coalescing'),
     'no-eq-empty': require('./rules/no-eq-empty'),
-    'no-unsupported-es6-methods': require('./rules/no-unsupported-es6-methods'),
   },
 };

packages/eslint-plugin-sdk/src/rules/no-unsupported-es6-methods.js

@@ -6,6 +6,5 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
   },
 };

packages/node/.eslintrc.js

@@ -10,7 +10,6 @@ module.exports = {
         'import/no-unresolved': 'off',
         '@sentry-internal/sdk/no-optional-chaining': 'off',
         '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
         'jsdoc/require-jsdoc': 'off',
       },
     },

packages/overhead-metrics/.eslintrc.cjs

@@ -7,8 +7,21 @@ module.exports = {
   extends: ['../../.eslintrc.js'],
   overrides: [
     {
-      files: ['src/**/*.ts'],
-      rules: {},
+      files: ['worker/**/*.ts'],
+      parserOptions: {
+        // TODO: figure out if we need a worker-specific tsconfig
+        project: ['tsconfig.worker.json'],
+      },
+      rules: {
+        // We cannot use backticks, as that conflicts with the stringified worker
+        'prefer-template': 'off',
+      },
+    },
+    {
+      files: ['src/worker/**/*.js'],
+      parserOptions: {
+        sourceType: 'module',
+      },
     },
     {
       files: ['jest.setup.ts', 'jest.config.ts'],

packages/replay/.eslintrc.js

@@ -3,7 +3,4 @@ module.exports = {
     browser: true,
   },
   extends: ['../../.eslintrc.js'],
-  rules: {
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
-  },
 };

packages/svelte/.eslintrc.js

@@ -33,7 +33,6 @@ const ANONYMOUS_COMPONENT_NAME = '<Anonymous>';
 
 const repeat = (str: string, n: number): string => {
   // string.repeat() is not supported by IE11, we fall back to just using the string in that case
-  // eslint-disable-next-line @sentry-internal/sdk/no-unsupported-es6-methods
   return str.repeat ? str.repeat(n) : str;
 };
 

packages/vue/src/vendor/components.ts

@@ -17,7 +17,6 @@ import {
   makeTerserPlugin,
   makeTSPlugin,
   makeSetSDKSourcePlugin,
-  getEs5Polyfills,
 } from './plugins/index.js';
 import { mergePlugins } from './utils';
 
@@ -26,8 +25,6 @@ const BUNDLE_VARIANTS = ['.js', '.min.js', '.debug.min.js'];
 export function makeBaseBundleConfig(options) {
   const { bundleType, entrypoints, jsVersion, licenseTitle, outputFileBase, packageSpecificConfig } = options;
 
-  const isEs5 = jsVersion.toLowerCase() === 'es5';
-
   const nodeResolvePlugin = makeNodeResolvePlugin();
   const sucrasePlugin = makeSucrasePlugin();
   const cleanupPlugin = makeCleanupPlugin();
@@ -45,10 +42,6 @@ export function makeBaseBundleConfig(options) {
     output: {
       format: 'iife',
       name: 'Sentry',
-      outro: () => {
-        // Add polyfills for ES6 array/string methods at the end of the bundle
-        return isEs5 ? getEs5Polyfills() : '';
-      },
     },
     context: 'window',
     plugins: [markAsBrowserBuildPlugin],
@@ -108,9 +101,10 @@ export function makeBaseBundleConfig(options) {
       strict: false,
       esModule: false,
     },
-    plugins: isEs5
-      ? [tsPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin]
-      : [sucrasePlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
+    plugins:
+      jsVersion === 'es5'
+        ? [tsPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin]
+        : [sucrasePlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
     treeshake: 'smallest',
   };
 

rollup/bundleHelpers.js

@@ -8,9 +8,6 @@
  * Typescript plugin docs: https://github.com/ezolenko/rollup-plugin-typescript2
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-
 import commonjs from '@rollup/plugin-commonjs';
 import deepMerge from 'deepmerge';
 import license from 'rollup-plugin-license';
@@ -41,11 +38,6 @@ export function makeLicensePlugin(title) {
   return plugin;
 }
 
-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');
-}
-
 /**
  * Create a plugin to set the value of the `__SENTRY_DEBUG__` magic string.
  *