Reworked rollup builds

.buildkite/basic/browser-pipeline.yml

@@ -59,7 +59,6 @@ steps:
             run: "browser-maze-runner-bs"
             use-aliases: true
             command:
-              - "--fail-fast"
               - "--farm=bs"
               - "--browser={{matrix}}"
           artifacts#v1.5.0:
@@ -83,7 +82,7 @@ steps:
           - "safari_10"
           - "ios_15"
           - "android_9"
-          - "chrome_43"
+          - "chrome_53" # TODO: Revert to Chrome 47 when Maze Runner supports it again (see PLAT-16280)
           - "chrome_72"
           - "firefox_78"
         depends_on: "browser-maze-runner-bs"
@@ -94,7 +93,6 @@ steps:
             run: "browser-maze-runner-bs"
             use-aliases: true
             command:
-              - "--fail-fast"
               - "--https"
               - "--farm=bs"
               - "--browser={{matrix}}"
@@ -127,7 +125,6 @@ steps:
             service-ports: true
             use-aliases: true
             command:
-              - "--fail-fast"
               - "--https"
               - "--farm=bb"
               - "--browser={{matrix}}"
@@ -145,31 +142,3 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: "eager"
 
-      - label: ":bitbar: ie_11 Browser tests (EU hub)"
-        depends_on: "browser-maze-runner-bb"
-        timeout_in_minutes: 30
-        plugins:
-          docker-compose#v4.12.0:
-            pull: "browser-maze-runner-bb"
-            run: "browser-maze-runner-bb"
-            service-ports: true
-            use-aliases: true
-            command:
-              - "--fail-fast"
-              - "--farm=bb"
-              - "--browser=ie_11"
-              - "--no-tunnel"
-              - "--aws-public-ip"
-          artifacts#v1.5.0:
-            upload:
-              - "./test/browser/maze_output/failed/**/*"
-          test-collector#v1.10.2:
-            files: "reports/TEST-*.xml"
-            format: "junit"
-            branch: "^main|next$$"
-            api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
-        concurrency: 25
-        concurrency_group: "bitbar"
-        concurrency_method: "eager"
-        env:
-          HOST: "localhost" # IE11 needs the host set to localhost

.buildkite/pipeline.yml

@@ -77,7 +77,8 @@ steps:
     plugins:
       docker-compose#v4.12.0:
         run: ci
-    command: "npm run test:unit"
+    command: 
+      - "npm run test:unit"
 
   - label: "Type checks/tests"
     depends_on: "ci-image"

.rollup/index.mjs

@@ -1,4 +1,7 @@
+
 import typescript from '@rollup/plugin-typescript'
+import commonjs from '@rollup/plugin-commonjs'
+import nodeResolve from '@rollup/plugin-node-resolve'
 import replace from '@rollup/plugin-replace'
 import fs from 'fs'
 
@@ -10,59 +13,96 @@ const defaultOptions = () => ({
   external: [],
   // the entry point for the bundle
   input: undefined,
-  // output directory for the bundle
-  output: undefined
+  // additional rollup plugins
+  plugins: []
 })
 
-export const sharedOutput = {
-  dir: 'dist',
-  generatedCode: {
-    preset: 'es2015',
-  }
-}
-
 function createRollupConfig (options = defaultOptions()) {
   const packageJson = JSON.parse(fs.readFileSync(`${process.cwd()}/package.json`))
 
-  return {
-    input: options.input || 'src/index.ts',
-    output: options.output || [
-      {
-        ...sharedOutput,
+  return [
+    // ESM build
+    {
+      input: options.input || './src/index.ts',
+      output: {
+        dir: 'dist/esm',
         entryFileNames: '[name].js',
-        format: 'cjs'
-      },
-      {
-        ...sharedOutput,
-        preserveModules: true,
-        entryFileNames: '[name].mjs',
-        format: 'esm'
-      }
-    ],
-    external: options.external,
-    plugins: [
-      replace({
-        preventAssignment: true,
-        values: {
-          __VERSION__: packageJson.version,
-          ...options.additionalReplacements,
+        format: 'es',
+        sourcemap: true,
+        generatedCode: {
+          preset: 'es2015',
         }
-      }),
-      typescript({
-        removeComments: true,
-        // don't output anything if there's a TS error
-        noEmitOnError: true,
-        // turn on declaration files and declaration maps
-        compilerOptions: {
-          declaration: true,
-          declarationMap: true,
-          emitDeclarationOnly: true,
-          declarationDir: 'dist/types',
-        }
-      }),
-      ...(options.plugins ?? [])
-    ]
-  }
+      },
+      external: options.external,
+      plugins: [
+        replace({
+          preventAssignment: true,
+          values: {
+            __BUGSNAG_NOTIFIER_VERSION__: packageJson.version,
+            ...options.additionalReplacements,
+          }
+        }),
+        nodeResolve({
+          preferBuiltins: true
+        }),
+        commonjs(),
+        typescript({
+          tsconfig: './tsconfig.json',
+          declarationDir: 'dist/esm',
+          outDir: 'dist/esm',
+          noEmitOnError: true
+        }),
+        ...(options.plugins ?? [])
+      ]
+    },
+    // CJS build
+    {
+      input: options.input || './src/index.ts',
+      output: {
+        dir: 'dist/cjs',
+        entryFileNames: '[name].js',
+        format: 'cjs',
+        sourcemap: true,
+        generatedCode: {
+          preset: 'es2015',
+        },
+        exports: 'named',
+        interop: 'auto',
+        footer: 'module.exports = Object.assign(exports.default || {}, exports);'
+      },
+      external: options.external,
+      plugins: [
+        replace({
+          preventAssignment: true,
+          values: {
+            __BUGSNAG_NOTIFIER_VERSION__: packageJson.version,
+            ...options.additionalReplacements,
+          }
+        }),
+        nodeResolve({
+          preferBuiltins: true
+        }),
+        commonjs(),
+        typescript({
+          tsconfig: './tsconfig.json',
+          declarationDir: 'dist/cjs',
+          outDir: 'dist/cjs',
+          noEmitOnError: true
+        }),
+        {
+          name: 'emit-cjs-package-json',
+          generateBundle() {
+            this.emitFile({
+              type: 'asset',
+              fileName: 'package.json',
+              source: JSON.stringify({ type: 'commonjs' }, null, 2)
+            });
+          }
+        },
+        ...(options.plugins ?? [])
+      ]
+    }
+  ]
 }
 
-export default createRollupConfig
+export default createRollupConfig

babel.config.js

@@ -9,7 +9,7 @@ module.exports = api => {
     presets.push(['@babel/preset-env', {targets: {node: 'current'}}])
     presets.push('@babel/preset-typescript')
     overrides.push({
-      test: '**/node_modules/react-native/**/*',
+      test: ['node_modules/react-native/**/*', 'node_modules/@react-native/**/*'],
       presets: ['module:metro-react-native-babel-preset', '@babel/preset-typescript']
     })
     overrides.push({

config/electron-jest.config.js

@@ -1,21 +1,64 @@
+// these paths must be specified because otherwise typescript relies on the
+// "main" field in each package.json file, which points to the compiled JS and
+// we want to run Jest against the TS source
+const paths = {
+  // @bugsnag/core must resolve to source so that module-level singleton state
+  // (e.g. clone-client's onCloneCallbacks) is shared across jest.isolateModules
+  // boundaries. Without this, bundled dist creates duplicate state.
+  '@bugsnag/core': ['./packages/core/src/index.ts']
+}
+
+const moduleNameMapper = Object.fromEntries(
+  Object.entries(paths)
+    .map(([name, directories]) => [
+      `^${name}$`,
+      directories.map(directory => directory.replace('./', '<rootDir>/'))
+    ])
+)
+
+const defaultModuleConfig = {
+  preset: 'ts-jest/presets/js-with-ts',
+  moduleNameMapper,
+  transform: {
+    '^.+\\.m?[tj]sx?$': [
+      'ts-jest',
+      {
+        isolatedModules: true,
+        tsconfig: {
+          module: 'commonjs',
+          target: 'ES2019',
+          esModuleInterop: true,
+          allowSyntheticDefaultImports: true,
+          allowJs: true,
+          skipLibCheck: true,
+          jsx: 'react',
+          paths
+        }
+      }
+    ]
+  }
+}
+
 module.exports = {
   projects: [
     {
-      resolver: '<rootDir>/jest/node-exports-resolver',
+      ...defaultModuleConfig,
       setupFilesAfterEnv: ['<rootDir>/test/electron/setup.ts'],
       clearMocks: true,
       modulePathIgnorePatterns: ['.verdaccio', 'fixtures', 'examples'],
       displayName: 'electron main',
-      runner: '@jest-runner/electron/main',
+      runner: '@kayahr/jest-electron-runner/main',
+      testEnvironment: 'node',
       testMatch: ['**/test/**/*.test-main.ts']
     },
     {
-      resolver: '<rootDir>/jest/node-exports-resolver',
+      ...defaultModuleConfig,
       setupFilesAfterEnv: ['<rootDir>/test/electron/setup.ts'],
       clearMocks: true,
       modulePathIgnorePatterns: ['.verdaccio', 'fixtures', 'examples'],
       displayName: 'electron renderer',
-      runner: '@jest-runner/electron',
+      runner: '@kayahr/jest-electron-runner',
+      testEnvironment: '@kayahr/jest-electron-runner/environment',
       testMatch: ['**/test/**/*.test-renderer.ts']
     }
   ]

dockerfiles/Dockerfile.ci

@@ -6,7 +6,7 @@ RUN apk add --update bash python3 make gcc g++ musl-dev xvfb-run curl
 WORKDIR /app
 
 COPY package*.json ./
-COPY babel.config.js lerna.json eslint.config.mjs jest.config.js tsconfig.json ./
+COPY babel.config.js lerna.json eslint.config.mjs jest.config.js tsconfig.json tsconfig.test.json ./
 COPY jest ./jest
 ADD min_packages.tar .
 COPY .rollup ./.rollup