Merge branch 'next' into fix/nextjs-tailwind-link

storybookjs · Jan 30, 2025 · 6ffe9b1 · 6ffe9b1
2 parents 5137a26 + c9a7dfa
commit 6ffe9b1
Show file tree

Hide file tree

Showing 25 changed files with 3,091 additions and 1,058 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1,2 @@
-22.6.0
+22.13.1
+
diff --git a/.yarn/releases/yarn-4.3.0.cjs b/.yarn/releases/yarn-4.3.0.cjs
diff --git a/.yarn/releases/yarn-4.6.0.cjs b/.yarn/releases/yarn-4.6.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -8,4 +8,4 @@ nodeLinker: node-modules
 
 npmPublishAccess: public
 
-yarnPath: .yarn/releases/yarn-4.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs
diff --git a/code/.yarn/releases/yarn-4.6.0.cjs b/code/.yarn/releases/yarn-4.6.0.cjs
diff --git a/code/.yarnrc.yml b/code/.yarnrc.yml
@@ -22,7 +22,6 @@ plugins:
   - path: ../.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: '@yarnpkg/plugin-workspace-tools'
 
-# See https://github.com/nrwl/nx/issues/22177
 supportedArchitectures:
   cpu:
     - current
@@ -36,6 +35,4 @@ supportedArchitectures:
 unsafeHttpWhitelist:
   - localhost
 
-yarnPath: ../.yarn/releases/yarn-4.3.0.cjs
-# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
-# checksumBehavior: 'update'
+yarnPath: .yarn/releases/yarn-4.6.0.cjs
diff --git a/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts b/code/core/src/preview-api/modules/preview-web/PreviewWeb.test.ts
@@ -3793,6 +3793,9 @@ describe('PreviewWeb', () => {
             },
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--a",
             "initialArgs": {
               "foo": "a",
@@ -3844,6 +3847,9 @@ describe('PreviewWeb', () => {
             },
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--b",
             "initialArgs": {
               "foo": "b",
@@ -3876,6 +3882,9 @@ describe('PreviewWeb', () => {
             "args": {},
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--e",
             "initialArgs": {},
             "kind": "Component One",
@@ -3914,6 +3923,9 @@ describe('PreviewWeb', () => {
             },
             "component": undefined,
             "componentId": "component-two",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-two--c",
             "initialArgs": {
               "foo": "c",

diff --git a/code/core/src/preview-api/modules/store/StoryStore.test.ts b/code/core/src/preview-api/modules/store/StoryStore.test.ts
@@ -301,6 +301,9 @@ describe('StoryStore', () => {
             },
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--a",
             "initialArgs": {
               "foo": "a",
@@ -471,6 +474,9 @@ describe('StoryStore', () => {
             },
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--a",
             "initialArgs": {
               "foo": "a",
@@ -514,6 +520,9 @@ describe('StoryStore', () => {
             },
             "component": undefined,
             "componentId": "component-one",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-one--b",
             "initialArgs": {
               "foo": "b",
@@ -557,6 +566,9 @@ describe('StoryStore', () => {
             },
             "component": undefined,
             "componentId": "component-two",
+            "globals": {
+              "a": "b",
+            },
             "id": "component-two--c",
             "initialArgs": {
               "foo": "c",
@@ -847,6 +859,9 @@ describe('StoryStore', () => {
               },
               "component": undefined,
               "componentId": "component-one",
+              "globals": {
+                "a": "b",
+              },
               "id": "component-one--a",
               "initialArgs": {
                 "foo": "a",
@@ -890,6 +905,9 @@ describe('StoryStore', () => {
               },
               "component": undefined,
               "componentId": "component-one",
+              "globals": {
+                "a": "b",
+              },
               "id": "component-one--b",
               "initialArgs": {
                 "foo": "b",
@@ -933,6 +951,9 @@ describe('StoryStore', () => {
               },
               "component": undefined,
               "componentId": "component-two",
+              "globals": {
+                "a": "b",
+              },
               "id": "component-two--c",
               "initialArgs": {
                 "foo": "c",

diff --git a/code/core/src/preview-api/modules/store/StoryStore.ts b/code/core/src/preview-api/modules/store/StoryStore.ts
@@ -323,7 +323,15 @@ export class StoryStore<TRenderer extends Renderer> {
             }
             return Object.assign(storyAcc, { [key]: value });
           },
-          { args: story.initialArgs }
+          {
+            //
+            args: story.initialArgs,
+            globals: {
+              ...this.userGlobals.initialGlobals,
+              ...this.userGlobals.globals,
+              ...story.storyGlobals,
+            },
+          }
         );
         return acc;
       },

diff --git a/code/package.json b/code/package.json
@@ -42,8 +42,9 @@
     "lint:js": "yarn lint:js:cmd .  --quiet",
     "lint:js:cmd": "cross-env NODE_ENV=production eslint --cache --cache-location=../.cache/eslint --ext .js,.jsx,.json,.html,.ts,.tsx,.mjs --report-unused-disable-directives",
     "lint:md": "../scripts/node_modules/.bin/remark -q .",
-    "lint:other": "prettier --write '**/*.{css,html,json,md,yml}'",
-    "lint:package": "sort-package-json",
+    "lint:other": "yarn lint:prettier '**/*.{css,html,json,md,yml}'",
+    "lint:package": "yarn --cwd ../scripts lint:package",
+    "lint:prettier": "prettier --write",
     "local-registry": "yarn --cwd ../scripts local-registry",
     "publish-sandboxes": "yarn --cwd ../scripts publish",
     "storybook:ui": "NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" ./lib/cli/bin/index.cjs dev --port 6006 --config-dir ./.storybook",
@@ -64,14 +65,14 @@
     "*.{html,js,json,jsx,mjs,ts,tsx}": [
       "yarn lint:js:cmd --fix"
     ],
-    "package.json": [
-      "yarn lint:package"
-    ],
     "*.ejs": [
       "../scripts/node_modules/.bin/ejslint"
     ],
     "*.{css,html,json,md,yml}": [
-      "../scripts/node_modules/.bin/prettier --write"
+      "yarn lint:prettier"
+    ],
+    "package.json": [
+      "yarn lint:package"
     ]
   },
   "browserslist": [
@@ -216,6 +217,7 @@
     "semver": "^7.3.7",
     "serve-static": "^1.14.1",
     "slash": "^5.0.0",
+    "sort-package-json": "^2.14.0",
     "storybook": "workspace:^",
     "svelte": "^5.0.0-next.268",
     "ts-dedent": "^2.0.0",
@@ -250,6 +252,7 @@
       "built": false
     }
   },
+  "packageManager": "[email protected]",
   "engines": {
     "node": ">=18.0.0"
   },

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -8865,6 +8865,7 @@ __metadata:
     semver: "npm:^7.3.7"
     serve-static: "npm:^1.14.1"
     slash: "npm:^5.0.0"
+    sort-package-json: "npm:^2.14.0"
     storybook: "workspace:^"
     svelte: "npm:^5.0.0-next.268"
     ts-dedent: "npm:^2.0.0"
@@ -15605,6 +15606,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detect-newline@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "detect-newline@npm:4.0.1"
+  checksum: 10c0/1cc1082e88ad477f30703ae9f23bd3e33816ea2db6a35333057e087d72d466f5a777809b71f560118ecff935d2c712f5b59e1008a8b56a900909d8fd4621c603
+  languageName: node
+  linkType: hard
+
 "detect-node-es@npm:^1.1.0":
   version: 1.1.0
   resolution: "detect-node-es@npm:1.1.0"
@@ -18658,6 +18666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-stdin@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "get-stdin@npm:9.0.0"
+  checksum: 10c0/7ef2edc0c81a0644ca9f051aad8a96ae9373d901485abafaabe59fd347a1c378689d8a3d8825fb3067415d1d09dfcaa43cb9b9516ecac6b74b3138b65a8ccc6b
+  languageName: node
+  linkType: hard
+
 "get-stream@npm:^4.0.0":
   version: 4.1.0
   resolution: "get-stream@npm:4.1.0"
@@ -18753,6 +18768,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"git-hooks-list@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "git-hooks-list@npm:3.1.0"
+  checksum: 10c0/f1b93dd11b80b2a687b99a8bb553c0d07f344532d475b3ac2a5ff044d40fa71567ddcfa5cb39fae0b4e43a670a33f02f71ec3b24b7263233f3a3df89deddfb5a
+  languageName: node
+  linkType: hard
+
 "github-release-from-changelog@npm:^2.1.1":
   version: 2.1.1
   resolution: "github-release-from-changelog@npm:2.1.1"
@@ -29298,6 +29320,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sort-package-json@npm:^2.14.0":
+  version: 2.14.0
+  resolution: "sort-package-json@npm:2.14.0"
+  dependencies:
+    detect-indent: "npm:^7.0.1"
+    detect-newline: "npm:^4.0.0"
+    get-stdin: "npm:^9.0.0"
+    git-hooks-list: "npm:^3.0.0"
+    is-plain-obj: "npm:^4.1.0"
+    semver: "npm:^7.6.0"
+    sort-object-keys: "npm:^1.1.3"
+    tinyglobby: "npm:^0.2.9"
+  bin:
+    sort-package-json: cli.js
+  checksum: 10c0/bcc114a3b5e11d4539ba46dd4eeda6d6909202cb1a9526c230850f1edfdfcf8712e9479b71f98d8f6cb8554740294acdfcaae84461dcecd90592867e1ba90924
+  languageName: node
+  linkType: hard
+
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
@@ -30424,7 +30464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.10":
+"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.9":
   version: 0.2.10
   resolution: "tinyglobby@npm:0.2.10"
   dependencies:
@@ -31038,11 +31078,11 @@ __metadata:
 
 "typescript@patch:typescript@npm%3A^5.3.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.6.2#optional!builtin<compat/typescript>":
   version: 5.6.3
-  resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=b45daf"
+  resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/ac8307bb06bbfd08ae7137da740769b7d8c3ee5943188743bb622c621f8ad61d244767480f90fbd840277fbf152d8932aa20c33f867dea1bb5e79b187ca1a92f
+  checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7
   languageName: node
   linkType: hard
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ nodeLinker: node-modules

		npmPublishAccess: public

		yarnPath: .yarn/releases/yarn-4.3.0.cjs
		yarnPath: .yarn/releases/yarn-4.6.0.cjs