Merge branch 'main' into ghengeveld/323-if-chromaticconfigjson-has-st…

…orybookbuilddir-con

.github/workflows/chromatic.yml

@@ -10,7 +10,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies
-        run: yarn install --ignore-scripts
+        run: yarn install --immutable
 
       - name: Publish to Chromatic
         uses: chromaui/action@v1

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         run: git fetch --unshallow --tags
 
       - name: Install dependencies
-        run: yarn install --ignore-scripts
+        run: yarn install --immutable
 
       - name: Create Release
         run: yarn run release

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install dependencies
-        run: yarn install --ignore-scripts
+        run: yarn install --immutable
 
       - name: Lint
         run: yarn lint

.gitignore

@@ -8,3 +8,11 @@ build-storybook.log
 chromatic.log
 chromatic-build-*.xml
 chromatic-diagnostics.json
+
+**/.pnp.*
+**/.yarn/*
+!**/.yarn/patches
+!**/.yarn/plugins
+!**/.yarn/releases
+!**/.yarn/sdks
+!**/.yarn/versions

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-berry.cjs

package.json

@@ -44,8 +44,8 @@
     "prerelease": "zx scripts/prepublish-checks.mjs",
     "release": "yarn run build && auto shipit",
     "start": "run-p build:watch 'storybook --quiet'",
-    "storybook": "CHROMATIC_ADDON_NAME='../src/dev.ts' storybook dev -p 6006",
-    "storybook-from-dist": "CHROMATIC_USE_DIST_VERSION=true CHROMATIC_ADDON_NAME='../dist/index.js' storybook dev -p 6006",
+    "storybook": "CHROMATIC_ADDON_NAME='../src/dev.ts' storybook dev -p 6004",
+    "storybook-from-dist": "CHROMATIC_USE_DIST_VERSION=true CHROMATIC_ADDON_NAME='../dist/index.js' storybook dev -p 6004",
     "test": "vitest",
     "typecheck": "tsc --noemit"
   },
@@ -137,6 +137,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "packageManager": "[email protected]",
   "bundler": {
     "exportEntries": [
       "./src/index.ts"