Skip to content

Commit 2e4eb73

Browse files
bashmishbashmish
committed
Merge branch 'master' into fix/storybook-builder-on-windows
# Conflicts: # .github/workflows/verify-node.yml # package-lock.json
2 parents a137a70 + d5ae228 commit 2e4eb73

File tree

58 files changed

+1319
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1319
-814
lines changed

‎.eslintignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ demo
1717
CHANGELOG.md
1818
.changeset
1919
_site
20-
dist-types
20+
_site-dev
21+
dist-types
22+
/docs/_merged_data

‎docs/docs/storybook-builder/migration-to-storybook-7.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm install @storybook/builder-vite@0.4 @storybook/web-components@6 --save-dev
1919
Then proceed with the `upgrade` script and follow it's interactive process:
2020

2121
```bash
22-
npx storybook@latest upgrade
22+
npx storybook@7 upgrade
2323
```
2424

2525
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.
3838
We recommend to install the following addons:
3939

4040
```bash
41-
npm install @storybook/addon-essentials @storybook/addon-links --save-dev
41+
npm install @storybook/addon-essentials@7 @storybook/addon-links@7 --save-dev
4242
```
4343

4444
Then register them in the Storybook main configuration file:

‎docs/docs/test-runner/browser-launchers/puppeteer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Testing Firefox with Puppeteer is still experimental. There is currently no offi
124124
```json
125125
{
126126
"scripts": {
127-
"postinstall": "cd node_modules/puppeteer && PUPPETEER_PRODUCT=firefox node install.js"
127+
"postinstall": "cd node_modules/puppeteer && PUPPETEER_BROWSER=firefox node install.js"
128128
}
129129
}
130130
```

‎docs/docs/test-runner/cli-and-configuration.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ For example to expose the global `process` variable:
221221
```js
222222
export default {
223223
testRunnerHtml: testFramework =>
224-
`<html>
224+
`<!DOCTYPE html>
225+
<html>
225226
<body>
226227
<script>window.process = { env: { NODE_ENV: "development" } }</script>
227228
<script type="module" src="${testFramework}"></script>
@@ -322,7 +323,8 @@ export default {
322323
{
323324
name: 'polyfills-a',
324325
testRunnerHtml: testFramework =>
325-
`<html>
326+
`<!DOCTYPE html>
327+
<html>
326328
<body>
327329
<script src="./polyfills-a.js"></script>
328330
<script type="module" src="${testFramework}"></script>
@@ -332,7 +334,8 @@ export default {
332334
{
333335
name: 'polyfills-b',
334336
testRunnerHtml: testFramework =>
335-
`<html>
337+
`<!DOCTYPE html>
338+
<html>
336339
<body>
337340
<script src="./polyfills-b.js"></script>
338341
<script type="module" src="${testFramework}"></script>

‎docs/guides/going-buildless/serving.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ the [HyperText Transfer Protocol](https://developer.mozilla.org/en-US/docs/Web/H
1212

1313
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.
1414

15-
So when the request for `GET https://my-domain.dev/` comes in, the web server parses it into three major parts,
15+
So when the request for `GET https://my-domain.com/` comes in, the web server parses it into three major parts,
1616

1717
1. the protocol `https://`,
18-
2. the domain name `my-domain.dev`
18+
2. the domain name `my-domain.com`
1919
3. the path `/`
2020

21-
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.
21+
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.
2222

2323
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/`.
2424

‎integration/test-runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dependencies": {
2323
"@web/dev-server-legacy": "^2.1.0",
24-
"@web/test-runner-core": "^0.13.1"
24+
"@web/test-runner-core": "^0.13.3"
2525
},
2626
"devDependencies": {
2727
"@esm-bundle/chai": "^4.1.5"

0 commit comments

Comments
 (0)