Merge branch 'next-debug' of github.com:storybookjs/storybook into next-debug

JReinhold · JReinhold · commit f4b1734935a4 · 2023-06-08T22:09:25.000+02:00
diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -82,7 +82,7 @@
     "@storybook/preview-api": "7.1.0-alpha.29",
     "@storybook/theming": "7.1.0-alpha.29",
     "@storybook/types": "7.1.0-alpha.29",
-    "jest-mock": "^27.0.6",
+    "jest-mock": "^29.5.0",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"
   },
@@ -114,9 +114,8 @@
       "./src/index.ts",
       "./src/manager.tsx",
       "./src/preview.ts",
-      "./src/preset/checkActionsLoaded.ts"
-    ],
-    "platform": "node"
+      "./src/preset.ts"
+    ]
   },
   "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
   "storybook": {
diff --git a/code/addons/interactions/preset.js b/code/addons/interactions/preset.js
@@ -1,4 +1,4 @@
-const { checkActionsLoaded } = require('./dist/preset/checkActionsLoaded');
+const { checkActionsLoaded } = require('./dist/preset');
 
 function previewAnnotations(entry = [], options) {
   checkActionsLoaded(options.configDir);
diff --git a/code/addons/interactions/src/preset.ts b/code/addons/interactions/src/preset.ts
diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json
@@ -46,7 +46,7 @@
     "@storybook/types": "7.1.0-alpha.29",
     "@types/jest-specific-snapshot": "^0.5.6",
     "glob": "^10.0.0",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "preact-render-to-string": "^5.1.19",
     "pretty-format": "^29.0.0",
     "react-test-renderer": "^16.8.0 || ^17.0.0 || ^18.0.0",
@@ -66,7 +66,7 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.5",
     "enzyme-to-json": "^3.6.1",
-    "jest-preset-angular": "^12.2.3",
+    "jest-preset-angular": "^13.0.1",
     "jest-vue-preprocessor": "^1.7.1",
     "react-test-renderer": "^16",
     "rxjs": "^6.6.3",
diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
@@ -82,6 +82,7 @@
     "babel-plugin-named-exports-order": "^0.0.2",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
+    "constants-browserify": "^1.0.0",
     "css-loader": "^6.7.1",
     "express": "^4.17.3",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
@@ -94,6 +95,7 @@
     "swc-loader": "^0.2.3",
     "terser-webpack-plugin": "^5.3.1",
     "ts-dedent": "^2.0.0",
+    "url": "^0.11.0",
     "util": "^0.12.4",
     "util-deprecate": "^1.0.2",
     "webpack": "5",
diff --git a/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -308,9 +308,13 @@ export default async (
       mainFields: ['browser', 'module', 'main'].filter(Boolean),
       alias: storybookPaths,
       fallback: {
+        stream: false,
         path: require.resolve('path-browserify'),
         assert: require.resolve('browser-assert'),
         util: require.resolve('util'),
+        url: require.resolve('url'),
+        fs: false,
+        constants: require.resolve('constants-browserify'),
       },
       // Set webpack to resolve symlinks based on whether the user has asked node to.
       // This feels like it should be default out-of-the-box in webpack :shrug:
diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
@@ -53,7 +53,7 @@
     "@types/node": "^16.0.0"
   },
   "devDependencies": {
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "typescript": "~4.9.3"
   },
   "peerDependencies": {
diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json
@@ -63,7 +63,7 @@
     "@types/jscodeshift": "^0.11.6",
     "ansi-regex": "^5.0.1",
     "jest": "^29.3.1",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "mdast-util-mdx-jsx": "^2.1.2",
     "mdast-util-mdxjs-esm": "^1.3.1",
     "remark": "^14.0.2",
diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
@@ -104,7 +104,7 @@
     "@types/serve-favicon": "^2.5.2",
     "@types/ws": "^8",
     "jest-os-detection": "^1.3.1",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "node-fetch": "^3.3.1",
     "slash": "^5.0.0",
     "typescript": "~4.9.3"
diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.1",
-    "@types/js-yaml": "^3.12.6",
+    "@types/js-yaml": "^4.0.5",
     "js-yaml": "^4.1.0",
     "typescript": "~4.9.3"
   },
diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.0",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "require-from-string": "^2.0.2",
     "typescript": "~4.9.3"
   },
diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "jest": "^29.3.1",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "jscodeshift": "^0.14.0",
     "typescript": "~4.9.3"
   },
diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json
@@ -84,7 +84,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@jest/globals": "^26.6.2",
+    "@jest/globals": "^29.5.0",
     "@storybook/core-common": "7.1.0-alpha.29",
     "ansi-to-html": "^0.6.11",
     "react": "^16.14.0",
diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json
@@ -51,7 +51,7 @@
     "prettier": "^2.8.0"
   },
   "devDependencies": {
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "typescript": "~4.9.3"
   },
   "peerDependencies": {
diff --git a/code/package.json b/code/package.json
@@ -234,7 +234,7 @@
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "jest-image-snapshot": "^6.0.0",
-    "jest-junit": "^14.0.1",
+    "jest-junit": "^16.0.0",
     "jest-os-detection": "^1.3.1",
     "jest-serializer-html": "^7.1.0",
     "jest-watch-typeahead": "^2.2.1",
diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "fs-extra": "^11.1.0",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "typescript": "~4.9.3",
     "yaml": "^2.3.1"
   },
diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
@@ -78,7 +78,7 @@
     "@babel/core": "^7.22.0",
     "@types/util-deprecate": "^1.0.0",
     "expect-type": "^0.15.0",
-    "jest-specific-snapshot": "^7.0.0",
+    "jest-specific-snapshot": "^8.0.0",
     "require-from-string": "^2.0.2",
     "typescript": "~4.9.3"
   },
diff --git a/code/renderers/vue3/src/docs/sourceDecorator.test.ts b/code/renderers/vue3/src/docs/sourceDecorator.test.ts
@@ -1,7 +1,5 @@
 import { describe, expect, test } from '@jest/globals';
-import type { Args } from '@storybook/types';
 
-import type { ArgsType } from 'jest-mock';
 import {
   mapAttributesAndDirectives,
   generateAttributesSource,
@@ -241,7 +239,7 @@ describe('Vue3: sourceDecorator->generateAttributesSource()', () => {
       generateAttributesSource(
         mapAttributesAndDirectives({ camelCaseBooleanArg: true }),
         { camelCaseBooleanArg: true },
-        [{ camelCaseBooleanArg: { type: 'boolean' } }] as ArgsType<Args>
+        [{ camelCaseBooleanArg: { type: 'boolean' } }] as any
       )
     ).toMatchInlineSnapshot(`:camel-case-boolean-arg="true"`);
   });
@@ -250,7 +248,7 @@ describe('Vue3: sourceDecorator->generateAttributesSource()', () => {
       generateAttributesSource(
         mapAttributesAndDirectives({ camelCaseStringArg: 'foo' }),
         { camelCaseStringArg: 'foo' },
-        [{ camelCaseStringArg: { type: 'string' } }] as ArgsType<Args>
+        [{ camelCaseStringArg: { type: 'string' } }] as any
       )
     ).toMatchInlineSnapshot(`camel-case-string-arg="foo"`);
   });
@@ -268,7 +266,7 @@ describe('Vue3: sourceDecorator->generateAttributesSource()', () => {
           camelCaseStringArg: 'foo',
           cameCaseNumberArg: 2023,
         },
-        [] as ArgsType<Args>
+        [] as any
       )
     ).toMatchInlineSnapshot(
       `:camel-case-boolean-arg="true" camel-case-string-arg="foo" :came-case-number-arg="2023"`
diff --git a/code/yarn.lock b/code/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { checkActionsLoaded } = require('./dist/preset/checkActionsLoaded');`
	`1`	`+const { checkActionsLoaded } = require('./dist/preset');`
`2`	`2`
`3`	`3`	`function previewAnnotations(entry = [], options) {`
`4`	`4`	`checkActionsLoaded(options.configDir);`