modernweb-dev · koddsson · Aug 8, 2022 · Aug 8, 2022 · Aug 10, 2022 · Aug 12, 2022
diff --git a/.changeset/clever-monkeys-smash.md b/.changeset/clever-monkeys-smash.md
@@ -0,0 +1,15 @@
+---
+'@web/browser-logs': minor
+'@web/dev-server-import-maps': minor
+'@web/dev-server-rollup': minor
+'@web/test-runner': minor
+'@web/test-runner-browserstack': minor
+'@web/test-runner-commands': minor
+'@web/test-runner-core': minor
+'@web/test-runner-junit-reporter': minor
+'@web/test-runner-saucelabs': minor
+'@web/test-runner-selenium': minor
+'@web/test-runner-webdriver': minor
+---
+
+Update Chai to version 5.
diff --git a/docs/blog/introducing-web-test-runner/index.md.review b/docs/blog/introducing-web-test-runner/index.md.review
@@ -33,7 +33,7 @@ This is the minimal instruction on how to start using the web test runner.
 1. Install the necessary packages
 
    ```
-   npm i --save-dev @web/test-runner @esm-bundle/chai
+   npm i --save-dev @web/test-runner chai
    ```
 
 2. Add a script to your `package.json`
@@ -50,7 +50,7 @@ This is the minimal instruction on how to start using the web test runner.
 3. Create a test file `test/sum.test.js`.
 
    ```js
-   import { expect } from '@esm-bundle/chai';
+   import { expect } from 'chai';
    import { sum } from '../src/sum.js';
 
    it('sums up 2 numbers', () => {
@@ -189,7 +189,7 @@ npm i --save-dev @web/test-runner-commands
 With that, we get a `setViewport` method which we can use.
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { setViewport } from '@web/test-runner-commands';
 import { isMobile } from '../src/isMobile';
 
@@ -236,7 +236,7 @@ See more instructions in the [Code Coverage Guide](../../guides/test-runner/code
 First, we need to install the required dependencies:
 
 ```
-npm i --save-dev @web/test-runner @esm-bundle/chai @types/mocha typescript
+npm i --save-dev @web/test-runner chai @types/mocha typescript
 ```
 
 Add the `src/sum.ts` file:
@@ -254,7 +254,7 @@ export function sum(...numbers: number[]) {
 Add the `test/sum.test.ts` file:
 
 ```ts
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { sum } from '../src/sum.js';
 
 it('sums up 2 numbers', () => {

diff --git a/docs/docs/dev-server/plugins/import-maps.md b/docs/docs/dev-server/plugins/import-maps.md
@@ -65,7 +65,7 @@ When the plugin is installed any import maps found in HTML files are used to res
     <script type="importmap">
       {
         "imports": {
-          "chai": "/node_modules/@esm-bundle/chai/chai.js",
+          "chai": "/node_modules/chai/chai.js",
           "./app.js": "./mocked-app.js"
         }
       }
@@ -74,7 +74,7 @@ When the plugin is installed any import maps found in HTML files are used to res
 
   <body>
     <script type="module">
-      // mapped to /node_modules/@esm-bundle/chai/chai.js
+      // mapped to /node_modules/chai/chai.js
       import chai from 'chai';
       // mapped to ./mocked-app.js
       import app from './app.js';

diff --git a/docs/docs/test-runner/writing-tests/helper-libraries.md b/docs/docs/test-runner/writing-tests/helper-libraries.md
@@ -8,10 +8,10 @@ Not all helper libraries ship es modules which are usable in the browser. On thi
 
 ## Assertions
 
-[chai](https://www.npmjs.com/package/chai) is a popular assertion library. It doesn't ship an es module, but you can use [@esm-bundle/chai](https://www.npmjs.com/package/@esm-bundle/chai) for that.
+[chai](https://www.npmjs.com/package/chai) is a popular assertion library.
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 
 expect(undefined).to.not.be.a('function');
 ```

diff --git a/docs/docs/test-runner/writing-tests/html-tests.md b/docs/docs/test-runner/writing-tests/html-tests.md
@@ -9,7 +9,7 @@ With mocha, you need to define your tests inside the `runTests` function:
   <body>
     <script type="module">
       import { runTests } from '@web/test-runner-mocha';
-      import { expect } from '@esm-bundle/chai';
+      import { expect } from 'chai';
 
       runTests(async () => {
         // write your tests inline

diff --git a/docs/docs/test-runner/writing-tests/js-tests.md b/docs/docs/test-runner/writing-tests/js-tests.md
@@ -5,7 +5,7 @@ Javascript files are loaded by the test framework that is configured. The defaul
 For example:
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { myFunction } from '../src/myFunction.js';
 
 describe('myFunction', () => {

diff --git a/docs/docs/test-runner/writing-tests/mocking.md b/docs/docs/test-runner/writing-tests/mocking.md
@@ -105,7 +105,7 @@ Test file:
   <body>
     <script type="module">
       import { runTests } from '@web/test-runner-mocha';
-      import { expect } from '@esm-bundle/chai';
+      import { expect } from 'chai';
       // import inside will resolve to ./mocks/postData.js
       import { sendMessage } from '../src/sendMessage.js';
       // resolves to ./mocks/postData.js

diff --git a/docs/guides/going-buildless/es-modules.md b/docs/guides/going-buildless/es-modules.md
@@ -158,7 +158,7 @@ UMD modules are "universal modules", meaning they support multiple module format
 
 You can actually import these libraries using a module import, but instead of exporting something, the UMD module will register itself to the window. You can set up a proxy file to reexport this variable from the window.
 
-A good example of this is the chai library:
+A good example of this is how the chai library used to work before it started shipping ES Modules:
 
 `test/chai.js`:
 

diff --git a/docs/guides/test-runner/code-coverage/index.md b/docs/guides/test-runner/code-coverage/index.md
@@ -24,7 +24,7 @@ As good citizens we start with the tests first
 👉 `test/calc.test.js`
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { calc } from '../src/calc.js';
 
 it('does plus for 2 numbers', () => {

diff --git a/docs/guides/test-runner/getting-started.md b/docs/guides/test-runner/getting-started.md
@@ -24,7 +24,7 @@ Now that we know what we want we need to place this file somewhere and run a too
 1. Install the necessary packages
 
    ```
-   npm i --save-dev @web/test-runner @esm-bundle/chai
+   npm i --save-dev @web/test-runner chai
    ```
 
 2. Add a script to your `package.json`
@@ -56,7 +56,7 @@ fair enough - we didn't create a test file yet.
 1. Take the spec/test from above and create a test file `test/sum.test.js`.
 
    ```js
-   import { expect } from '@esm-bundle/chai';
+   import { expect } from 'chai';
    import { sum } from '../src/sum.js';
 
    it('sums up 2 numbers', () => {

diff --git a/docs/guides/test-runner/responsive.md b/docs/guides/test-runner/responsive.md
@@ -42,7 +42,7 @@ npm i --save-dev @web/test-runner-commands
 With that we get a `setViewport` method which we can put to good use.
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { setViewport } from '@web/test-runner-commands';
 import { isMobile } from '../src/isMobile';
 
@@ -110,7 +110,7 @@ Next, we can write our tests to change the viewport and check if our media queri
 
     <script type="module">
       import { runTests } from '@web/test-runner-mocha';
-      import { expect } from '@esm-bundle/chai';
+      import { expect } from 'chai';
       import { setViewport } from '@web/test-runner-commands';
 
       runTests(() => {

diff --git a/docs/guides/test-runner/watch-and-debug/index.md b/docs/guides/test-runner/watch-and-debug/index.md
@@ -35,7 +35,7 @@ We want to be able to pass in a string like `1 + 2 + 3` to get its sum.
 👉 `test/calc.test.js`
 
 ```js
-import { expect } from '@esm-bundle/chai';
+import { expect } from 'chai';
 import { calc } from '../src/calc.js';
 
 it('calculates sums', () => {

diff --git a/integration/test-runner/package.json b/integration/test-runner/package.json
@@ -14,7 +14,6 @@
   },
   "author": "modern-web",
   "homepage": "https://github.com/modernweb-dev/web/tree/master/packages/test-runner-integration-tests",
-  "main": "index.js",
   "scripts": {
     "test": "mocha test/**/*.test.ts --require ts-node/register --reporter dot",
     "test:watch": "mocha test/**/*.test.ts --require ts-node/register --watch --watch-files src,test --reporter dot"
@@ -24,6 +23,6 @@
     "@web/test-runner-core": "^0.11.2"
   },
   "devDependencies": {
-    "@esm-bundle/chai": "^4.1.5"
+    "chai": "^5.0.0-alpha.0"
   }
 }
diff --git a/integration/test-runner/tests/basic/browser-tests/basic.test.html b/integration/test-runner/tests/basic/browser-tests/basic.test.html
@@ -1,7 +1,7 @@
 <html>
   <body>
     <script type="module">
-      import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+      import { expect } from '../../../../../node_modules/chai/chai.js';
       import { runTests } from '../../../../../packages/test-runner-mocha/dist/standalone.js';
 
       runTests(() => {

diff --git a/integration/test-runner/tests/basic/browser-tests/basic.test.js b/integration/test-runner/tests/basic/browser-tests/basic.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 describe('basic test', () => {
   it('works', () => {

diff --git a/integration/test-runner/tests/basic/browser-tests/js-syntax.test.js b/integration/test-runner/tests/basic/browser-tests/js-syntax.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('supports object spread', () => {
   const foo = { a: 1 };

diff --git a/integration/test-runner/tests/basic/browser-tests/module-features.test.js b/integration/test-runner/tests/basic/browser-tests/module-features.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 import module from './module-features-a.js';
 
 it('supports static imports', () => {

diff --git a/integration/test-runner/tests/config-groups/browser-tests/test-runner-html-a.test.js b/integration/test-runner/tests/config-groups/browser-tests/test-runner-html-a.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 describe('basic test', () => {
   it('works', () => {

diff --git a/integration/test-runner/tests/config-groups/browser-tests/test-runner-html-b.test.js b/integration/test-runner/tests/config-groups/browser-tests/test-runner-html-b.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 describe('basic test', () => {
   it('works', () => {

diff --git a/integration/test-runner/tests/focus/browser-tests/focus-a.test.js b/integration/test-runner/tests/focus/browser-tests/focus-a.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('can run a test with focus a', async () => {
   const input = document.createElement('input');

diff --git a/integration/test-runner/tests/focus/browser-tests/focus-b.test.js b/integration/test-runner/tests/focus/browser-tests/focus-b.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('can run a test with focus b', async () => {
   const input = document.createElement('input');

diff --git a/integration/test-runner/tests/focus/browser-tests/focus-c.test.js b/integration/test-runner/tests/focus/browser-tests/focus-c.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('can run a test with focus c', async () => {
   const input = document.createElement('input');

diff --git a/integration/test-runner/tests/focus/browser-tests/focus-d.test.js b/integration/test-runner/tests/focus/browser-tests/focus-d.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('can run a test with focus d', async () => {
   const input = document.createElement('input');

diff --git a/integration/test-runner/tests/focus/browser-tests/focus-e.test.js b/integration/test-runner/tests/focus/browser-tests/focus-e.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('can run a test with focus e', async () => {
   const input = document.createElement('input');

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-after-each.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-after-each.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 afterEach(() => {
   throw new Error('error thrown in afterEach hook');

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-after.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-after.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 after(() => {
   throw new Error('error thrown in after hook');

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-before-each.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-before-each.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 beforeEach(() => {
   throw new Error('error thrown in beforeEach hook');

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-before.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-before.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 before(() => {
   throw new Error('error thrown in before hook');

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-circular-error.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-circular-error.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('bad predicate', function() {
   const fixture = { x: 'x' }

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-error-module-exec.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-error-module-exec.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 throw new Error('This is thrown before running tests');
 

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-object-diff.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-object-diff.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 import './shared-a.js';
 
 it('object diff A', () => {

diff --git a/integration/test-runner/tests/test-failure/browser-tests/fail-string-diff.test.js b/integration/test-runner/tests/test-failure/browser-tests/fail-string-diff.test.js
@@ -1,4 +1,4 @@
-import { expect } from '../../../../../node_modules/@esm-bundle/chai/esm/chai.js';
+import { expect } from '../../../../../node_modules/chai/chai.js';
 
 it('string diff', () => {
   expect('foo').to.equal('bar');

diff --git a/integration/test-runner/tests/test-failure/runTestFailureTest.ts b/integration/test-runner/tests/test-failure/runTestFailureTest.ts
@@ -52,7 +52,7 @@ export function runTestFailureTest(
         expect(session.testResults!.suites.length).to.equal(0);
         expect(session.testResults!.tests.length).to.equal(0);
         expect(session.request404s).to.eql([
-          'integration/test-runner/tests/test-failure/browser-tests/non-existing.js',
+          'integration/test-runner/tests/test-failure/browser-tests/non-existing.js?systemjs=true',
         ]);
         expect(session.errors).to.eql([ERROR_NOT_IMPORTABLE]);
         expect(session.logs.length).to.equal(1);