Merge branch 'next' into future/base

.circleci/config.yml

@@ -274,32 +274,31 @@ jobs:
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
-      # TODO: we disabled this one because it keeps failing, we should fix it, and enable it again!
-      # - attach_workspace:
-      #     at: .
-      # - run:
-      #     name: Running local registry
-      #     command: yarn local-registry --port 6000 --open
-      #     background: true
-      # - run:
-      #     name: Wait for registry
-      #     command: yarn wait-on http://localhost:6000
-      # - run:
-      #     name: run e2e tests cra
-      #     command: yarn test:e2e-framework --pnp cra
+      - attach_workspace:
+          at: .
+      - run:
+          name: Running local registry
+          command: yarn local-registry --port 6000 --open
+          background: true
+      - run:
+          name: Wait for registry
+          command: yarn wait-on http://localhost:6000
+      - run:
+          name: run e2e tests cra
+          command: yarn test:e2e-framework --pnp cra
       # - run:
       #     name: run e2e tests vue
       #     command: yarn test:e2e-framework --pnp sfcVue
-      # - run:
-      #     name: prep artifacts
-      #     when: always
-      #     command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
-      # - store_artifacts:
-      #     path: /tmp/cypress-record
-      #     destination: cypress
-      # - store_artifacts:
-      #     path: /tmp/storybook-e2e-testing-out.zip
-      #     destination: e2e
+      - run:
+          name: prep artifacts
+          when: always
+          command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
+      - store_artifacts:
+          path: /tmp/cypress-record
+          destination: cypress
+      - store_artifacts:
+          path: /tmp/storybook-e2e-testing-out.zip
+          destination: e2e
   e2e-tests-examples:
     executor:
       class: small

lib/core-common/src/presets.ts

@@ -93,7 +93,7 @@ export const resolveAddonName = (
   const managerFile = safeResolve(`${path}/manager`);
   const registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`);
   const previewFile = safeResolve(`${path}/preview`);
-  const presetFile = safeResolve(`${path}/preset`);
+  const presetFile = r(`${path}/preset`);
 
   if (!(managerFile || previewFile) && presetFile) {
     return {

lib/router/package.json

@@ -35,6 +35,7 @@
   "dependencies": {
     "@storybook/client-logger": "7.0.0-alpha.1",
     "core-js": "^3.8.2",
+    "qs": "^6.10.0",
     "regenerator-runtime": "^0.13.7"
   },
   "devDependencies": {
@@ -43,7 +44,6 @@
     "history": "5.0.0",
     "lodash": "^4.17.21",
     "memoizerific": "^1.11.3",
-    "qs": "^6.10.0",
     "react-router": "6.0.2",
     "react-router-dom": "6.0.2",
     "ts-dedent": "^2.0.0",

lib/ui/package.json

@@ -43,6 +43,7 @@
     "@storybook/semver": "^7.3.2",
     "@storybook/theming": "7.0.0-alpha.1",
     "core-js": "^3.8.2",
+    "qs": "^6.10.0",
     "regenerator-runtime": "^0.13.7",
     "resolve-from": "^5.0.0",
     "util": "^0.12.4"
@@ -61,7 +62,6 @@
     "markdown-to-jsx": "^7.1.3",
     "memoizerific": "^1.11.3",
     "polished": "^4.2.2",
-    "qs": "^6.10.0",
     "react-draggable": "^4.4.3",
     "react-helmet-async": "^1.0.7",
     "react-sizeme": "^3.0.1",