remove sucrase test hack

lobsterkatie · lobsterkatie · commit 9e2840b2e40b · 2022-05-09T18:26:49.000-07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -256,8 +256,6 @@ jobs:
           NODE_VERSION: ${{ matrix.node }}
         run: |
           [[ $NODE_VERSION == 8 ]] && yarn add --dev --ignore-engines --ignore-scripts --ignore-workspace-root-check ts-node@8.x
-          # TODO remove this when we switch to sucrase
-          yarn ts-node scripts/sucrase-test-hack.ts
           yarn test-ci
       - name: Compute test coverage
         uses: codecov/codecov-action@v1
@@ -494,278 +492,3 @@ jobs:
         run: |
           cd packages/node-integration-tests
           yarn test
-
-  job_unit_test_sucrase:
-    name: Sucrase Test (Node ${{ matrix.node }})
-    needs: job_build
-    continue-on-error: true
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [8, 10, 12, 14, 16]
-    steps:
-      - name: Check out current commit (${{ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run tests
-        env:
-          NODE_VERSION: ${{ matrix.node }}
-          SUCRASE: true
-        run: |
-          [[ $NODE_VERSION == 8 ]] && yarn add --dev --ignore-engines --ignore-scripts --ignore-workspace-root-check ts-node@8.x rollup@2.2.0 @rollup/plugin-node-resolve@10.x rollup-plugin-terser@5.0.0 rollup-plugin-typescript2@0.30.0
-          yarn ts-node scripts/sucrase-test-hack.ts
-          yarn test-ci
-      - name: Compute test coverage
-        uses: codecov/codecov-action@v1
-
-  job_nextjs_integration_test_sucrase:
-    name: Sucrase Test @sentry/nextjs on (Node ${{ matrix.node }})
-    needs: job_build
-    continue-on-error: true
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [10, 12, 14, 16]
-    steps:
-      - name: Check out current commit (${{ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run tests
-        env:
-          NODE_VERSION: ${{ matrix.node }}
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          cd packages/nextjs
-          yarn test:integration
-
-  # Ember tests are separate from the rest because they are the slowest part of the test suite, and making them a
-  # separate job allows them to run in parallel with the other tests.
-  job_ember_tests_sucrase:
-    name: Sucrase Test @sentry/ember
-    needs: job_build
-    continue-on-error: true
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out current commit (${{ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-        # TODO: removing `fetch-depth` below seems to have no effect, and the commit which added it had no description,
-        # so it's not clear why it's necessary. That said, right now ember tests are xfail, so it's a little hard to
-        # tell if it's safe to remove. Once ember tests are fixed, let's try again with it turned off, and if all goes
-        # well, we can pull it out.
-          fetch-depth: 0
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          # The only danger with Ember in terms of Node versions is that the build tool, ember-cli, won't work if Node
-          # is too old. Since Oct 2019, Node 10 has been the oldest version supported by ember-cli, so test against
-          # that. If it passes, newer versions of Node should also be fine. This saves us from having to run the Ember
-          # tests in our Node matrix above.
-          node-version: '10'
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run Ember tests
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          yarn test --scope=@sentry/ember
-      - name: Compute test coverage
-        uses: codecov/codecov-action@v1
-
-  job_browser_playwright_tests_sucrase:
-    name: Sucrase Playwright - ${{ (matrix.tracing_only && 'Browser + Tracing') || 'Browser' }} (${{ matrix.bundle }})
-    needs: job_build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        bundle:
-          - esm
-          - cjs
-        tracing_only:
-          - true
-          - false
-        exclude:
-          # `tracing_only` only makes a difference for bundles - tests of the esm and cjs builds always include the
-          # tracing tests
-          - bundle: esm
-            tracing_only: false
-          - bundle: cjs
-            tracing_only: false
-    steps:
-      - name: Check out current commit (${{ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '16'
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run Playwright tests
-        env:
-          PW_BUNDLE: ${{ matrix.bundle }}
-          PW_TRACING_ONLY: ${{ matrix.tracing_only }}
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          cd packages/integration-tests
-          yarn run playwright install-deps webkit
-          yarn test:ci
-
-  job_browser_integration_tests_sucrase:
-    name: Sucrase Old Browser Integration Tests (${{ matrix.browser }})
-    needs: job_build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    continue-on-error: true
-    strategy:
-      matrix:
-        browser:
-          - ChromeHeadless
-          - FirefoxHeadless
-          - WebkitHeadless
-    steps:
-      - name: Check out current commit (${{ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run integration tests
-        env:
-          KARMA_BROWSER: ${{ matrix.browser }}
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          cd packages/browser
-          [[ $KARMA_BROWSER == WebkitHeadless ]] && yarn run playwright install-deps webkit
-          yarn test:integration
-
-  job_browser_build_tests_sucrase:
-    name: Sucrase Browser Build Tests
-    needs: job_build
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    continue-on-error: true
-    steps:
-      - name: Check out current commit (${ env.HEAD_COMMIT }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '16'
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run browser build tests
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          cd packages/browser
-          yarn test:package
-      - name: Run utils build tests
-        run: |
-          cd packages/utils
-          yarn test:package
-
-  job_node_integration_tests_sucrase:
-    name: Sucrase Node SDK Integration Tests (${{ matrix.node }})
-    needs: job_build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    continue-on-error: true
-    strategy:
-      matrix:
-        node: [10, 12, 14, 16]
-    steps:
-      - name: Check out current commit (${{ github.sha }})
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Check dependency cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run integration tests
-        env:
-          NODE_VERSION: ${{ matrix.node }}
-        run: |
-          yarn ts-node scripts/sucrase-test-hack.ts
-          cd packages/node-integration-tests
-          yarn test
diff --git a/rollup/npmHelpers.js b/rollup/npmHelpers.js
@@ -33,8 +33,7 @@ export function makeBaseNPMConfig(options = {}) {
   const removeBlankLinesPlugin = makeRemoveBlankLinesPlugin();
   const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
 
-  // return {
-  const config = {
+  return {
     input: entrypoints,
 
     output: {
@@ -44,10 +43,10 @@ export function makeBaseNPMConfig(options = {}) {
       sourcemap: true,
 
       // output individual files rather than one big bundle
-      // preserveModules: true,
+      preserveModules: true,
 
       // any wrappers or helper functions generated by rollup can use ES6 features
-      // generatedCode: 'es2015',
+      generatedCode: 'es2015',
 
       // don't add `"use strict"` to the top of cjs files
       strict: false,
@@ -101,17 +100,6 @@ export function makeBaseNPMConfig(options = {}) {
     // treeshake: 'smallest',
     treeshake: false,
   };
-
-  // temporary hack for testing sucrase bundles before we switch over
-  if (!process.version.startsWith('v8')) {
-    console.log('Doing normal preserveModules');
-    config.output.preserveModules = true;
-  } else {
-    console.log('Doing node 8 preserveModules');
-    config.preserveModules = true;
-  }
-
-  return config;
 }
 
 export function makeNPMConfigVariants(baseConfig) {
diff --git a/scripts/sucrase-test-hack.ts b/scripts/sucrase-test-hack.ts
