Merge remote-tracking branch 'origin/next' into valentin/migrate-vers…

…ion-to-use-workspace-syntax
storybookjs · Jul 25, 2023 · 7bbdcf6 · 7bbdcf6
2 parents 726e155 + 2050097
commit 7bbdcf6
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -459,6 +459,11 @@ jobs:
           template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench)
 
 workflows:
+  docs:
+    when:
+      equal: [docs, << pipeline.parameters.workflow >>]
+    jobs:
+      - pretty-docs
   normal:
     when:
       equal: [normal, << pipeline.parameters.workflow >>]

diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml
@@ -55,6 +55,25 @@ jobs:
         env:
           CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
           BRANCH: ${{ needs.get-branch.outputs.branch }}
+  trigger-docs-tests:
+    runs-on: ubuntu-latest
+    needs: get-branch
+    if: github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ci:docs')
+    steps:
+      - name: Trigger docs tests
+        run: >
+          curl -X POST --location "https://circleci.com/api/v2/project/gh/storybookjs/storybook/pipeline" \
+            -H "Content-Type: application/json" \
+            -H "Circle-Token: $CIRCLE_CI_TOKEN" \
+            -d '{
+                  "branch": "'"$BRANCH"'",
+                  "parameters": {
+                    "workflow": "docs"
+                  }
+                }'
+        env:
+          CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          BRANCH: ${{ needs.get-branch.outputs.branch }}
   trigger-merged-tests:
     runs-on: ubuntu-latest
     needs: get-branch

diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -82,7 +82,7 @@
     "@storybook/preview-api": "workspace:*",
     "@storybook/theming": "workspace:*",
     "@storybook/types": "workspace:*",
-    "jest-mock": "^29.5.0",
+    "jest-mock": "^27.0.6",
     "polished": "^4.2.2",
     "ts-dedent": "^2.2.0"
   },

diff --git a/code/frameworks/vue3-vite/src/preset.ts b/code/frameworks/vue3-vite/src/preset.ts
@@ -17,7 +17,7 @@ export const viteFinal: StorybookConfig['viteFinal'] = async (config, { presets
   const plugins: PluginOption[] = [];
 
   // Add vue plugin if not present
-  if (!(await hasVitePlugins(config.plugins, ['vite:vue']))) {
+  if (!(config.plugins && (await hasVitePlugins(config.plugins, ['vite:vue'])))) {
     const { default: vue } = await import('@vitejs/plugin-vue');
     plugins.push(vue());
   }

diff --git a/code/frameworks/vue3-vite/tsconfig.json b/code/frameworks/vue3-vite/tsconfig.json
@@ -5,7 +5,7 @@
     "types": ["node"],
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "strict": false
+    "strict": true
   },
   "include": ["src/**/*"]
 }
diff --git a/code/yarn.lock b/code/yarn.lock
@@ -5761,7 +5761,7 @@ __metadata:
     "@storybook/types": "workspace:*"
     "@types/node": ^16.0.0
     formik: ^2.2.9
-    jest-mock: ^29.5.0
+    jest-mock: ^27.0.6
     polished: ^4.2.2
     ts-dedent: ^2.2.0
     typescript: ~4.9.3
@@ -19787,7 +19787,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^27.3.0":
+"jest-mock@npm:^27.0.6, jest-mock@npm:^27.3.0":
   version: 27.5.1
   resolution: "jest-mock@npm:27.5.1"
   dependencies:
@@ -19797,7 +19797,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.5.0, jest-mock@npm:^29.6.1":
+"jest-mock@npm:^29.6.1":
   version: 29.6.1
   resolution: "jest-mock@npm:29.6.1"
   dependencies:

diff --git a/scripts/dangerfile.ts b/scripts/dangerfile.ts
@@ -17,7 +17,7 @@ const Versions = {
   MAJOR: 'MAJOR',
 };
 
-const ciLabels = ['ci:normal', 'ci:merged', 'ci:daily'];
+const ciLabels = ['ci:normal', 'ci:merged', 'ci:daily', 'ci:docs'];
 
 const branchVersion = Versions.MINOR;