updated to yarn berry

chromaui · May 21, 2024 · e12d29f · e12d29f
1 parent 6cb0b86
commit e12d29f
Show file tree

Hide file tree

Showing 10 changed files with 19,091 additions and 15,075 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -2,11 +2,7 @@ import { StorybookConfig } from '@storybook/react-webpack5';
 
 const config: StorybookConfig = {
   stories: ['../node-src/**/*.@(mdx|stories.*)'],
-  addons: [
-    '@storybook/addon-essentials',
-    '@storybook/addon-webpack5-compiler-swc',
-    '@chromatic-com/storybook',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-webpack5-compiler-swc'],
   framework: {
     name: '@storybook/react-webpack5',
     options: {},

diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/bin-src/__mocks__/normalProjectJson/project.json b/bin-src/__mocks__/normalProjectJson/project.json
@@ -11,20 +11,19 @@
   "framework": { "name": "@storybook/react-webpack5", "options": {} },
   "builder": "@storybook/builder-webpack5",
   "renderer": "@storybook/react",
-  "storybookVersion": "8.1.1",
-  "storybookVersionSpecifier": "^8.1.1",
+  "storybookVersion": "8.1.2",
+  "storybookVersionSpecifier": "^8.1.2",
   "language": "typescript",
   "storybookPackages": {
-    "@storybook/csf-tools": { "version": "8.1.1" },
+    "@storybook/csf-tools": { "version": "8.1.2" },
     "@storybook/linter-config": { "version": "4.0.0" },
-    "@storybook/react": { "version": "8.1.1" },
-    "@storybook/react-webpack5": { "version": "8.1.1" },
-    "storybook": { "version": "8.1.1" }
+    "@storybook/react": { "version": "8.1.2" },
+    "@storybook/react-webpack5": { "version": "8.1.2" },
+    "storybook": { "version": "8.1.2" }
   },
   "addons": {
-    "@storybook/addon-essentials": { "version": "8.1.1" },
+    "@storybook/addon-essentials": { "version": "8.1.2" },
     "@storybook/addon-webpack5-compiler-swc": { "version": "1.0.2" },
-    "@chromatic-com/storybook": { "version": "1.4.0" },
     "chromatic": { "version": "11.4.0", "versionSpecifier": "latest" }
   }
 }
diff --git a/bin-src/__mocks__/unsupportedAddons/project.json b/bin-src/__mocks__/unsupportedAddons/project.json
@@ -11,20 +11,19 @@
   "framework": { "name": "@storybook/react-webpack5", "options": {} },
   "builder": "@storybook/builder-webpack5",
   "renderer": "@storybook/react",
-  "storybookVersion": "8.1.1",
-  "storybookVersionSpecifier": "^8.1.1",
+  "storybookVersion": "8.1.2",
+  "storybookVersionSpecifier": "^8.1.2",
   "language": "typescript",
   "storybookPackages": {
-    "@storybook/csf-tools": { "version": "8.1.1" },
+    "@storybook/csf-tools": { "version": "8.1.2" },
     "@storybook/linter-config": { "version": "4.0.0" },
-    "@storybook/react": { "version": "8.1.1" },
-    "@storybook/react-webpack5": { "version": "8.1.1" },
-    "storybook": { "version": "8.1.1" }
+    "@storybook/react": { "version": "8.1.2" },
+    "@storybook/react-webpack5": { "version": "8.1.2" },
+    "storybook": { "version": "8.1.2" }
   },
   "addons": {
-    "@storybook/addon-essentials": { "version": "8.1.1" },
+    "@storybook/addon-essentials": { "version": "8.1.2" },
     "@storybook/addon-webpack5-compiler-swc": { "version": "1.0.2" },
-    "@chromatic-com/storybook": { "version": "1.4.0" },
     "chromatic": { "version": "11.4.0", "versionSpecifier": "latest" },
     "storybook-addon-apollo-client": {
       "version": "4.0.11"

diff --git a/node-src/index.test.ts b/node-src/index.test.ts
@@ -762,7 +762,7 @@ it('should upload metadata files if --upload-metadata is passed', async () => {
   expect(upload.mock.calls.at(-1)[1]).toEqual(
     expect.arrayContaining([
       {
-        contentLength: 720,
+        contentLength: 675,
         contentType: 'text/typescript',
         fileKey: '',
         filePath: '.chromatic/main.ts',

diff --git a/node-src/lib/getStorybookInfo.test.ts b/node-src/lib/getStorybookInfo.test.ts
@@ -33,7 +33,7 @@ describe('getStorybookInfo', () => {
       expect.objectContaining({
         viewLayer: 'react',
         version: expect.any(String),
-        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
       })
     );
   });
@@ -69,12 +69,8 @@ describe('getStorybookInfo', () => {
             name: 'compiler-swc',
             packageName: '@storybook/addon-webpack5-compiler-swc',
           },
-          {
-            name: 'chromatic-com',
-            packageName: '@chromatic-com/storybook',
-          },
         ],
-        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
       })
     );
   });
@@ -85,7 +81,7 @@ describe('getStorybookInfo', () => {
       expect.objectContaining({
         viewLayer: 'react',
         version: expect.any(String),
-        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+        builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
       })
     );
     expect(log.info).toHaveBeenCalledWith(
@@ -102,7 +98,7 @@ describe('getStorybookInfo', () => {
         expect.objectContaining({
           viewLayer: 'react',
           version: '3.2.1',
-          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
         })
       );
     });
@@ -113,7 +109,7 @@ describe('getStorybookInfo', () => {
         expect.objectContaining({
           viewLayer: 'react',
           version: '3.2.1',
-          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
         })
       );
     });
@@ -131,12 +127,8 @@ describe('getStorybookInfo', () => {
               name: 'compiler-swc',
               packageName: '@storybook/addon-webpack5-compiler-swc',
             },
-            {
-              name: 'chromatic-com',
-              packageName: '@chromatic-com/storybook',
-            },
           ],
-          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
         })
       );
     });
@@ -154,12 +146,8 @@ describe('getStorybookInfo', () => {
               name: 'compiler-swc',
               packageName: '@storybook/addon-webpack5-compiler-swc',
             },
-            {
-              name: 'chromatic-com',
-              packageName: '@chromatic-com/storybook',
-            },
           ],
-          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.1' },
+          builder: { name: '@storybook/react-webpack5', packageVersion: '8.1.2' },
         })
       );
     });
@@ -176,21 +164,16 @@ describe('getStorybookInfo', () => {
           {
             name: 'essentials',
             packageName: '@storybook/addon-essentials',
-            packageVersion: '8.1.1',
+            packageVersion: '8.1.2',
           },
           {
             name: 'compiler-swc',
             packageName: '@storybook/addon-webpack5-compiler-swc',
             packageVersion: '1.0.2',
           },
-          {
-            name: 'chromatic-com',
-            packageName: '@chromatic-com/storybook',
-            packageVersion: '1.4.0',
-          },
         ],
-        builder: { name: '@storybook/builder-webpack5', packageVersion: '8.1.1' },
-        version: '8.1.1',
+        builder: { name: '@storybook/builder-webpack5', packageVersion: '8.1.2' },
+        version: '8.1.2',
         viewLayer: '@storybook/react-webpack5',
       });
     });
@@ -218,21 +201,16 @@ describe('getStorybookInfo', () => {
           {
             name: 'essentials',
             packageName: '@storybook/addon-essentials',
-            packageVersion: '8.1.1',
+            packageVersion: '8.1.2',
           },
           {
             name: 'compiler-swc',
             packageName: '@storybook/addon-webpack5-compiler-swc',
             packageVersion: '1.0.2',
           },
-          {
-            name: 'chromatic-com',
-            packageName: '@chromatic-com/storybook',
-            packageVersion: '1.4.0',
-          },
         ],
-        builder: { name: '@storybook/builder-webpack5', packageVersion: '8.1.1' },
-        version: '8.1.1',
+        builder: { name: '@storybook/builder-webpack5', packageVersion: '8.1.2' },
+        version: '8.1.2',
         viewLayer: '@storybook/react-webpack5',
       });
     });

diff --git a/node-src/lib/supportedAddons.ts b/node-src/lib/supportedAddons.ts
@@ -27,5 +27,4 @@ export const supportedAddons = {
   '@storybook/addon-viewport': 'viewport',
   '@storybook/addon-interactions': 'interactions',
   '@storybook/addon-webpack5-compiler-swc': 'compiler-swc',
-  '@chromatic-com/storybook': 'chromatic-com',
 } as Record<string, string>;
diff --git a/package.json b/package.json
@@ -113,14 +113,13 @@
     "@actions/github": "^5.0.0",
     "@antfu/ni": "^0.21.5",
     "@auto-it/exec": "^11.0.4",
-    "@chromatic-com/storybook": "^1.4.0",
     "@discoveryjs/json-ext": "^0.5.7",
-    "@storybook/addon-essentials": "^8.1.1",
+    "@storybook/addon-essentials": "^8.1.2",
     "@storybook/addon-webpack5-compiler-swc": "^1.0.2",
-    "@storybook/csf-tools": "^8.1.1",
+    "@storybook/csf-tools": "^8.1.2",
     "@storybook/linter-config": "^4.0.0",
-    "@storybook/react": "^8.1.1",
-    "@storybook/react-webpack5": "^8.1.1",
+    "@storybook/react": "^8.1.2",
+    "@storybook/react-webpack5": "^8.1.2",
     "@tsconfig/node16": "^16.1.1",
     "@types/archiver": "^5.3.1",
     "@types/async-retry": "^1.4.3",
@@ -191,7 +190,7 @@
     "slash": "^3.0.0",
     "snyk-nodejs-lockfile-parser": "^1.52.1",
     "sort-package-json": "1.50.0",
-    "storybook": "^8.1.1",
+    "storybook": "^8.1.2",
     "string-argv": "^0.3.1",
     "strip-ansi": "6.0.0",
     "tmp-promise": "3.0.2",