Rebase from next

.buildkite/basic/browser-pipeline.yml

@@ -59,6 +59,7 @@ steps:
             service-ports: true
             use-aliases: true
             command:
+              - "--https"
               - "--farm=bb"
               - "--browser={{matrix}}"
               - "--no-tunnel"
@@ -135,15 +136,10 @@ steps:
         env:
           HOST: "localhost" # IE11 needs the host set to localhost for some reason
 
-      #
-      # BrowserStack tests
-      #
       - label: ":browserstack: {{matrix}} tests"
         matrix:
           - edge_17
           - safari_10
-          - safari_16
-          - ios_10
           - ios_15
           - android_7
           # TODO: Move these to BitBar
@@ -158,6 +154,7 @@ steps:
             run: browser-maze-runner-bs
             use-aliases: true
             command:
+              - "--https"
               - "--farm=bs"
               - "--browser={{matrix}}"
           artifacts#v1.5.0:
@@ -171,3 +168,32 @@ steps:
         concurrency: 2
         concurrency_group: "browserstack"
         concurrency_method: eager
+
+      #
+      # BrowserStack non-https tests
+      #
+      - label: ":browserstack: {{matrix}} non-https tests"
+        matrix:
+          - safari_16
+          - ios_10
+        depends_on: "browser-maze-runner-bs"
+        timeout_in_minutes: 30
+        plugins:
+          docker-compose#v4.12.0:
+            pull: browser-maze-runner-bs
+            run: browser-maze-runner-bs
+            use-aliases: true
+            command:
+              - "--farm=bs"
+              - "--browser={{matrix}}"
+          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: 2
+        concurrency_group: "browserstack"
+        concurrency_method: eager

.buildkite/basic/electron-pipeline.yml

@@ -27,7 +27,7 @@ steps:
       - echo "Running on Node `node -v`"
       - npm install electron@${ELECTRON_VERSION} --no-audit --progress=false --no-save
       - npm ci --no-audit --progress=false
-      - npm run build:electron
+      - npm run build
       - defaults write com.apple.CrashReporter DialogType none
       - npm run test:unit:electron-runner
       - npm run test:electron

.eslintrc.js

@@ -31,6 +31,12 @@ const ruleOverrides = {
   '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
   '@typescript-eslint/prefer-includes': 'off',
   '@typescript-eslint/no-for-in-array': 'off',
+
+  // Optional chaining compiles to a lot more code
+  '@typescript-eslint/prefer-optional-chain': 'off',
+
+  // Support TypeScript 3.8 by disallowing import { type Module } from 'module'
+  'import/consistent-type-specifier-style': ['warn', 'prefer-top-level']
 }
 
 module.exports = {
@@ -44,7 +50,8 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     jsx: true,
-    ecmaVersion: 2018
+    ecmaVersion: 2018,
+    sourceType: 'module'
   },
   overrides: [
     // linting for js files

.github/workflows/test-electron.yml

@@ -43,7 +43,7 @@ jobs:
     - run: npm ci --no-audit --progress=false
       env:
         PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    - run: npm run build:electron
+    - run: npm run build
       shell: bash
     - run: sudo apt-get install cppcheck --assume-yes
       name: Install cppcheck

.rollup/index.mjs

@@ -0,0 +1,67 @@
+import typescript from '@rollup/plugin-typescript'
+import replace from '@rollup/plugin-replace'
+import fs from 'fs'
+
+const defaultOptions = () => ({
+  // additional variables to define with '@rollup/plugin-replace'
+  // e.g. '{ ABC: 123 }' is equivalent to running 'globalThis.ABC = 123'
+  additionalReplacements: {},
+  // additional external dependencies, such as '@bugsnag/browser'
+  external: [],
+  // the entry point for the bundle
+  input: undefined,
+  // output directory for the bundle
+  output: undefined
+})
+
+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,
+        entryFileNames: '[name].js',
+        format: 'cjs'
+      },
+      {
+        ...sharedOutput,
+        preserveModules: true,
+        entryFileNames: '[name].mjs',
+        format: 'esm'
+      }
+    ],
+    external: ['@bugsnag/core'].concat(options.external),
+    plugins: [
+      replace({
+        preventAssignment: true,
+        values: {
+          __VERSION__: packageJson.version,
+          ...options.additionalReplacements,
+        }
+      }),
+      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',
+        }
+      })
+    ]
+  }
+}
+
+export default createRollupConfig

dockerfiles/Dockerfile.browser

@@ -8,6 +8,7 @@ WORKDIR /app
 COPY package*.json ./
 COPY babel.config.js lerna.json .eslintignore .eslintrc.js jest.config.js tsconfig.json ./
 ADD min_packages.tar .
+COPY .rollup ./.rollup
 COPY bin ./bin
 COPY packages ./packages
 

dockerfiles/Dockerfile.ci

@@ -8,6 +8,7 @@ WORKDIR /app
 COPY package*.json ./
 COPY babel.config.js lerna.json .eslintignore .eslintrc.js jest.config.js tsconfig.json ./
 ADD min_packages.tar .
+COPY .rollup ./.rollup
 COPY bin ./bin
 COPY scripts ./scripts
 COPY test ./test

dockerfiles/Dockerfile.node

@@ -8,6 +8,7 @@ WORKDIR /app
 COPY package*.json ./
 COPY babel.config.js lerna.json .eslintignore .eslintrc.js jest.config.js tsconfig.json ./
 ADD min_packages.tar .
+COPY .rollup ./.rollup
 COPY bin ./bin
 COPY packages ./packages