Merge branch 'master' into fix/storybook-builder-on-windows

# Conflicts: # .github/workflows/verify-node.yml # package-lock.json
modernweb-dev · Sep 23, 2024 · 2e4eb73 · 2e4eb73
2 parents a137a70 + d5ae228
commit 2e4eb73
Show file tree

Hide file tree

Showing 58 changed files with 1,319 additions and 814 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -17,4 +17,6 @@ demo
 CHANGELOG.md
 .changeset
 _site
-dist-types
+_site-dev
+dist-types
+/docs/_merged_data
diff --git a/docs/docs/storybook-builder/migration-to-storybook-7.md b/docs/docs/storybook-builder/migration-to-storybook-7.md
@@ -19,7 +19,7 @@ npm install @storybook/[email protected] @storybook/web-components@6 --save-dev
 Then proceed with the `upgrade` script and follow it's interactive process:
 
 ```bash
-npx storybook@latest upgrade
+npx storybook@7 upgrade
 ```
 
 Then [configure the builder and framework](./configuration.md#configuring-builder-and-framework) in the main Storybook configuration.
@@ -38,7 +38,7 @@ In the new setup you'll need to install and configure them explicitly.
 We recommend to install the following addons:
 
 ```bash
-npm install @storybook/addon-essentials @storybook/addon-links --save-dev
+npm install @storybook/addon-essentials@7 @storybook/addon-links@7 --save-dev
 ```
 
 Then register them in the Storybook main configuration file:

diff --git a/docs/docs/test-runner/browser-launchers/puppeteer.md b/docs/docs/test-runner/browser-launchers/puppeteer.md
@@ -124,7 +124,7 @@ Testing Firefox with Puppeteer is still experimental. There is currently no offi
 ```json
 {
   "scripts": {
-    "postinstall": "cd node_modules/puppeteer && PUPPETEER_PRODUCT=firefox node install.js"
+    "postinstall": "cd node_modules/puppeteer && PUPPETEER_BROWSER=firefox node install.js"
   }
 }
 ```

diff --git a/docs/docs/test-runner/cli-and-configuration.md b/docs/docs/test-runner/cli-and-configuration.md
@@ -221,7 +221,8 @@ For example to expose the global `process` variable:
 ```js
 export default {
   testRunnerHtml: testFramework =>
-    `<html>
+    `<!DOCTYPE html>
+    <html>
       <body>
         <script>window.process = { env: { NODE_ENV: "development" } }</script>
         <script type="module" src="${testFramework}"></script>
@@ -322,7 +323,8 @@ export default {
     {
       name: 'polyfills-a',
       testRunnerHtml: testFramework =>
-        `<html>
+        `<!DOCTYPE html>
+        <html>
           <body>
             <script src="./polyfills-a.js"></script>
             <script type="module" src="${testFramework}"></script>
@@ -332,7 +334,8 @@ export default {
     {
       name: 'polyfills-b',
       testRunnerHtml: testFramework =>
-        `<html>
+        `<!DOCTYPE html>
+        <html>
           <body>
             <script src="./polyfills-b.js"></script>
             <script type="module" src="${testFramework}"></script>

diff --git a/docs/guides/going-buildless/serving.md b/docs/guides/going-buildless/serving.md
@@ -12,13 +12,13 @@ the [HyperText Transfer Protocol](https://developer.mozilla.org/en-US/docs/Web/H
 
 Now that your `GET` request has reached the web server, the server has to parse the URL to determine what to include in the response.
 
-So when the request for `GET https://my-domain.dev/` comes in, the web server parses it into three major parts,
+So when the request for `GET https://my-domain.com/` comes in, the web server parses it into three major parts,
 
 1. the protocol `https://`,
-2. the domain name `my-domain.dev`
+2. the domain name `my-domain.com`
 3. the path `/`
 
-So this particular request is asking for the entire web root directory since the path part of the URL didn't include any specific file in the request. How does the web server know how to respond? Most web servers when given a request for a directory will look for a special file in that directory named `index.html` and serve that. It's as if the user actually typed `https://my-domain.dev/index.html` into their browser.
+So this particular request is asking for the entire web root directory since the path part of the URL didn't include any specific file in the request. How does the web server know how to respond? Most web servers when given a request for a directory will look for a special file in that directory named `index.html` and serve that. It's as if the user actually typed `https://my-domain.com/index.html` into their browser.
 
 The simplest kinds of web servers retrieve the file located at the path specified in the URL, relative to the web root. The web root is the directory which that web server is configured to look in for files. For example, the [Apache](https://httpd.apache.org/) web server running on Ubuntu Linux 14.04 looks in `/var/www/html/` by default, whereas the nginx server by some default configurations looks in `/usr/share/nginx/html/`.
 

diff --git a/integration/test-runner/package.json b/integration/test-runner/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@web/dev-server-legacy": "^2.1.0",
-    "@web/test-runner-core": "^0.13.1"
+    "@web/test-runner-core": "^0.13.3"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.1.5"