storybookjs · ndelangen · Jan 6, 2023 · Jan 6, 2023 · Jan 6, 2023 · Jan 6, 2023
diff --git a/code/.eslintrc.js b/code/.eslintrc.js
@@ -90,7 +90,7 @@ module.exports = {
         '**/__testfixtures__/**',
         '**/*.test.*',
         '**/*.stories.*',
-        '**/storyshots/**/stories/**',
+        '**/storyshots-*/**/stories/**',
       ],
       rules: {
         '@typescript-eslint/no-empty-function': 'off',

diff --git a/code/.yarnrc.yml b/code/.yarnrc.yml
@@ -12,7 +12,7 @@ logFilters:
   - level: discard
     pattern: '@storybook/root@workspace:.'
   - level: discard
-    pattern: '@workspace:addons/storyshots/'
+    pattern: '@workspace:addons/storyshots-*/'
 
 nodeLinker: node-modules
 

diff --git a/...s/storyshots/storyshots-core/.eslintrc.js → code/addons/storyshots-core/.eslintrc.js b/...s/storyshots/storyshots-core/.eslintrc.js → code/addons/storyshots-core/.eslintrc.js
diff --git a/...dons/storyshots/storyshots-core/README.md → code/addons/storyshots-core/README.md b/...dons/storyshots/storyshots-core/README.md → code/addons/storyshots-core/README.md
diff --git a/.../storyshots-core/docs/storyshots-fail.png → .../storyshots-core/docs/storyshots-fail.png b/.../storyshots-core/docs/storyshots-fail.png → .../storyshots-core/docs/storyshots-fail.png
diff --git a/...shots/storyshots-core/docs/storyshots.png → ...ddons/storyshots-core/docs/storyshots.png b/...shots/storyshots-core/docs/storyshots.png → ...ddons/storyshots-core/docs/storyshots.png
diff --git a/...ryshots/storyshots-core/injectFileName.js → .../addons/storyshots-core/injectFileName.js b/...ryshots/storyshots-core/injectFileName.js → .../addons/storyshots-core/injectFileName.js
diff --git a/code/addons/storyshots/jest.config.js → code/addons/storyshots-core/jest.config.js b/code/addons/storyshots/jest.config.js → code/addons/storyshots-core/jest.config.js
diff --git a/...s/storyshots/storyshots-core/package.json → code/addons/storyshots-core/package.json b/...s/storyshots/storyshots-core/package.json → code/addons/storyshots-core/package.json
@@ -7,33 +7,34 @@
     "storybook",
     "test"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots/storyshots-core",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots-core",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "addons/storyshots/storyshots-core"
+    "directory": "addons/storyshots-core"
   },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
+    "*.mjs",
     "*.d.ts"
   ],
   "scripts": {
     "build-storybook": "sb build",
     "example": "jest storyshot.test",
-    "prep": "node ../../../../scripts/prepare.js",
+    "prep": "../../../scripts/prepare/tsc.ts",
     "storybook": "yarn sb dev -p 6006"
   },
   "dependencies": {
@@ -142,6 +143,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundler": {},
   "gitHead": "22701aedf564e467511887eb041f32ae0c96bcde",
   "storybook": {
     "displayName": "Storyshots",

diff --git a/...dons/storyshots/storyshots-core/preset.js → code/addons/storyshots-core/preset.js b/...dons/storyshots/storyshots-core/preset.js → code/addons/storyshots-core/preset.js
diff --git a/...s-core/src/Stories2SnapsConverter.test.ts → ...s-core/src/Stories2SnapsConverter.test.ts b/...s-core/src/Stories2SnapsConverter.test.ts → ...s-core/src/Stories2SnapsConverter.test.ts
diff --git a/...yshots-core/src/Stories2SnapsConverter.ts → ...yshots-core/src/Stories2SnapsConverter.ts b/...yshots-core/src/Stories2SnapsConverter.ts → ...yshots-core/src/Stories2SnapsConverter.ts
diff --git a/...ryshots-core/src/api/StoryshotsOptions.ts → ...ryshots-core/src/api/StoryshotsOptions.ts b/...ryshots-core/src/api/StoryshotsOptions.ts → ...ryshots-core/src/api/StoryshotsOptions.ts
diff --git a/...ots-core/src/api/ensureOptionsDefaults.ts → ...ots-core/src/api/ensureOptionsDefaults.ts b/...ots-core/src/api/ensureOptionsDefaults.ts → ...ots-core/src/api/ensureOptionsDefaults.ts
diff --git a/...oryshots/storyshots-core/src/api/index.ts → code/addons/storyshots-core/src/api/index.ts b/...oryshots/storyshots-core/src/api/index.ts → code/addons/storyshots-core/src/api/index.ts
diff --git a/...ots-core/src/api/integrityTestTemplate.ts → ...ots-core/src/api/integrityTestTemplate.ts b/...ots-core/src/api/integrityTestTemplate.ts → ...ots-core/src/api/integrityTestTemplate.ts
diff --git a/...ts-core/src/api/snapshotsTestsTemplate.ts → ...ts-core/src/api/snapshotsTestsTemplate.ts b/...ts-core/src/api/snapshotsTestsTemplate.ts → ...ts-core/src/api/snapshotsTestsTemplate.ts
diff --git a/.../storyshots-core/src/frameworks/Loader.ts → .../storyshots-core/src/frameworks/Loader.ts b/.../storyshots-core/src/frameworks/Loader.ts → .../storyshots-core/src/frameworks/Loader.ts
diff --git a/...core/src/frameworks/SupportedFramework.ts → ...core/src/frameworks/SupportedFramework.ts b/...core/src/frameworks/SupportedFramework.ts → ...core/src/frameworks/SupportedFramework.ts
diff --git a/...ots-core/src/frameworks/angular/loader.ts → ...ots-core/src/frameworks/angular/loader.ts b/...ots-core/src/frameworks/angular/loader.ts → ...ots-core/src/frameworks/angular/loader.ts
diff --git a/...core/src/frameworks/angular/renderTree.ts → ...core/src/frameworks/angular/renderTree.ts b/...core/src/frameworks/angular/renderTree.ts → ...core/src/frameworks/angular/renderTree.ts
diff --git a/...hots-core/src/frameworks/angular/types.ts → ...hots-core/src/frameworks/angular/types.ts b/...hots-core/src/frameworks/angular/types.ts → ...hots-core/src/frameworks/angular/types.ts
diff --git a/...ots-core/src/frameworks/configure.test.ts → ...ots-core/src/frameworks/configure.test.ts b/...ots-core/src/frameworks/configure.test.ts → ...ots-core/src/frameworks/configure.test.ts
@@ -2,7 +2,7 @@ import path from 'path';
 import { getPreviewFile, getMainFile } from './configure';
 
 // eslint-disable-next-line global-require, jest/no-mocks-import
-jest.mock('fs', () => require('../../../../../__mocks__/fs'));
+jest.mock('fs', () => require('../../../../__mocks__/fs'));
 const setupFiles = (files: Record<string, string>) => {
   // eslint-disable-next-line no-underscore-dangle, global-require
   require('fs').__setMockFiles(files);

diff --git a/...oryshots-core/src/frameworks/configure.ts → ...oryshots-core/src/frameworks/configure.ts b/...oryshots-core/src/frameworks/configure.ts → ...oryshots-core/src/frameworks/configure.ts
diff --git a/...ts-core/src/frameworks/frameworkLoader.ts → ...ts-core/src/frameworks/frameworkLoader.ts b/...ts-core/src/frameworks/frameworkLoader.ts → ...ts-core/src/frameworks/frameworkLoader.ts
diff --git a/...hots-core/src/frameworks/hasDependency.ts → ...hots-core/src/frameworks/hasDependency.ts b/...hots-core/src/frameworks/hasDependency.ts → ...hots-core/src/frameworks/hasDependency.ts
diff --git a/...yshots-core/src/frameworks/html/loader.ts → ...yshots-core/src/frameworks/html/loader.ts b/...yshots-core/src/frameworks/html/loader.ts → ...yshots-core/src/frameworks/html/loader.ts
diff --git a/...ts-core/src/frameworks/html/renderTree.ts → ...ts-core/src/frameworks/html/renderTree.ts b/...ts-core/src/frameworks/html/renderTree.ts → ...ts-core/src/frameworks/html/renderTree.ts
diff --git a/...s/storyshots-core/src/frameworks/index.ts → ...s/storyshots-core/src/frameworks/index.ts b/...s/storyshots-core/src/frameworks/index.ts → ...s/storyshots-core/src/frameworks/index.ts
diff --git a/...hots-core/src/frameworks/preact/loader.ts → ...hots-core/src/frameworks/preact/loader.ts b/...hots-core/src/frameworks/preact/loader.ts → ...hots-core/src/frameworks/preact/loader.ts
diff --git a/...-core/src/frameworks/preact/renderTree.ts → ...-core/src/frameworks/preact/renderTree.ts b/...-core/src/frameworks/preact/renderTree.ts → ...-core/src/frameworks/preact/renderTree.ts
diff --git a/...ryshots-core/src/frameworks/rax/loader.ts → ...ryshots-core/src/frameworks/rax/loader.ts b/...ryshots-core/src/frameworks/rax/loader.ts → ...ryshots-core/src/frameworks/rax/loader.ts
diff --git a/...ots-core/src/frameworks/rax/renderTree.ts → ...ots-core/src/frameworks/rax/renderTree.ts b/...ots-core/src/frameworks/rax/renderTree.ts → ...ots-core/src/frameworks/rax/renderTree.ts
diff --git a/...ore/src/frameworks/react-native/loader.ts → ...ore/src/frameworks/react-native/loader.ts b/...ore/src/frameworks/react-native/loader.ts → ...ore/src/frameworks/react-native/loader.ts
diff --git a/...shots-core/src/frameworks/react/loader.ts → ...shots-core/src/frameworks/react/loader.ts b/...shots-core/src/frameworks/react/loader.ts → ...shots-core/src/frameworks/react/loader.ts
diff --git a/...src/frameworks/react/renderShallowTree.ts → ...src/frameworks/react/renderShallowTree.ts b/...src/frameworks/react/renderShallowTree.ts → ...src/frameworks/react/renderShallowTree.ts
diff --git a/...s-core/src/frameworks/react/renderTree.ts → ...s-core/src/frameworks/react/renderTree.ts b/...s-core/src/frameworks/react/renderTree.ts → ...s-core/src/frameworks/react/renderTree.ts
diff --git a/...yshots-core/src/frameworks/riot/loader.ts → ...yshots-core/src/frameworks/riot/loader.ts b/...yshots-core/src/frameworks/riot/loader.ts → ...yshots-core/src/frameworks/riot/loader.ts
diff --git a/...ts-core/src/frameworks/riot/renderTree.ts → ...ts-core/src/frameworks/riot/renderTree.ts b/...ts-core/src/frameworks/riot/renderTree.ts → ...ts-core/src/frameworks/riot/renderTree.ts
diff --git a/...hots-core/src/frameworks/svelte/loader.ts → ...hots-core/src/frameworks/svelte/loader.ts b/...hots-core/src/frameworks/svelte/loader.ts → ...hots-core/src/frameworks/svelte/loader.ts
diff --git a/...-core/src/frameworks/svelte/renderTree.ts → ...-core/src/frameworks/svelte/renderTree.ts b/...-core/src/frameworks/svelte/renderTree.ts → ...-core/src/frameworks/svelte/renderTree.ts
diff --git a/...ryshots-core/src/frameworks/vue/loader.ts → ...ryshots-core/src/frameworks/vue/loader.ts b/...ryshots-core/src/frameworks/vue/loader.ts → ...ryshots-core/src/frameworks/vue/loader.ts
diff --git a/...ots-core/src/frameworks/vue/renderTree.ts → ...ots-core/src/frameworks/vue/renderTree.ts b/...ots-core/src/frameworks/vue/renderTree.ts → ...ots-core/src/frameworks/vue/renderTree.ts
diff --git a/...yshots-core/src/frameworks/vue3/loader.ts → ...yshots-core/src/frameworks/vue3/loader.ts b/...yshots-core/src/frameworks/vue3/loader.ts → ...yshots-core/src/frameworks/vue3/loader.ts
diff --git a/...ts-core/src/frameworks/vue3/renderTree.ts → ...ts-core/src/frameworks/vue3/renderTree.ts b/...ts-core/src/frameworks/vue3/renderTree.ts → ...ts-core/src/frameworks/vue3/renderTree.ts
diff --git a/...e/src/frameworks/web-components/loader.ts → ...e/src/frameworks/web-components/loader.ts b/...e/src/frameworks/web-components/loader.ts → ...e/src/frameworks/web-components/loader.ts
diff --git a/...c/frameworks/web-components/renderTree.ts → ...c/frameworks/web-components/renderTree.ts b/...c/frameworks/web-components/renderTree.ts → ...c/frameworks/web-components/renderTree.ts
diff --git a/...s/storyshots/storyshots-core/src/index.ts → code/addons/storyshots-core/src/index.ts b/...s/storyshots/storyshots-core/src/index.ts → code/addons/storyshots-core/src/index.ts
diff --git a/...yshots/storyshots-core/src/test-bodies.ts → ...addons/storyshots-core/src/test-bodies.ts b/...yshots/storyshots-core/src/test-bodies.ts → ...addons/storyshots-core/src/test-bodies.ts
diff --git a/...oryshots/storyshots-core/src/typings.d.ts → code/addons/storyshots-core/src/typings.d.ts b/...oryshots/storyshots-core/src/typings.d.ts → code/addons/storyshots-core/src/typings.d.ts
diff --git a/...snapshots__/storyshot.enzyme.test.js.snap → ...snapshots__/storyshot.enzyme.test.js.snap b/...snapshots__/storyshot.enzyme.test.js.snap → ...snapshots__/storyshot.enzyme.test.js.snap
diff --git a/...apshots__/storyshot.metadata.test.js.snap → ...apshots__/storyshot.metadata.test.js.snap b/...apshots__/storyshot.metadata.test.js.snap → ...apshots__/storyshot.metadata.test.js.snap
diff --git a/...napshots__/storyshot.shallow.test.js.snap → ...napshots__/storyshot.shallow.test.js.snap b/...napshots__/storyshot.shallow.test.js.snap → ...napshots__/storyshot.shallow.test.js.snap
diff --git a/...storyshot.shallowWithOptions.test.js.snap → ...storyshot.shallowWithOptions.test.js.snap b/...storyshot.shallowWithOptions.test.js.snap → ...storyshot.shallowWithOptions.test.js.snap
diff --git a/....snapshotWithOptionsFunction.test.js.snap → ....snapshotWithOptionsFunction.test.js.snap b/....snapshotWithOptionsFunction.test.js.snap → ....snapshotWithOptionsFunction.test.js.snap
diff --git a/...ories/exported_metadata/Async.stories.jsx → ...ories/exported_metadata/Async.stories.jsx b/...ories/exported_metadata/Async.stories.jsx → ...ories/exported_metadata/Async.stories.jsx
diff --git a/...ories/exported_metadata/Extra.stories.jsx → ...ories/exported_metadata/Extra.stories.jsx b/...ories/exported_metadata/Extra.stories.jsx → ...ories/exported_metadata/Extra.stories.jsx
diff --git a/...tories/exported_metadata/Text.stories.jsx → ...tories/exported_metadata/Text.stories.jsx b/...tories/exported_metadata/Text.stories.jsx → ...tories/exported_metadata/Text.stories.jsx
diff --git a/...ata/__snapshots__/Extra.stories.storyshot → ...ata/__snapshots__/Extra.stories.storyshot b/...ata/__snapshots__/Extra.stories.storyshot → ...ata/__snapshots__/Extra.stories.storyshot
diff --git a/...@Another-_-Button@with-_-some-_-emoji.boo → ...@Another-_-Button@with-_-some-_-emoji.boo b/...@Another-_-Button@with-_-some-_-emoji.boo → ...@Another-_-Button@with-_-some-_-emoji.boo
diff --git a/....stories@Another-_-Button@with-_-text.boo → ....stories@Another-_-Button@with-_-text.boo b/....stories@Another-_-Button@with-_-text.boo → ....stories@Another-_-Button@with-_-text.boo
diff --git a/...data/__snapshots__/Text.stories.storyshot → ...data/__snapshots__/Text.stories.storyshot b/...data/__snapshots__/Text.stories.storyshot → ...data/__snapshots__/Text.stories.storyshot
diff --git a/...ts-core/stories/exported_metadata/main.js → ...ts-core/stories/exported_metadata/main.js b/...ts-core/stories/exported_metadata/main.js → ...ts-core/stories/exported_metadata/main.js
diff --git a/...ore/stories/exported_metadata/preview.jsx → ...ore/stories/exported_metadata/preview.jsx b/...ore/stories/exported_metadata/preview.jsx → ...ore/stories/exported_metadata/preview.jsx
diff --git a/...hots-core/stories/storyshot.async.test.js → ...hots-core/stories/storyshot.async.test.js b/...hots-core/stories/storyshot.async.test.js → ...hots-core/stories/storyshot.async.test.js
diff --git a/...core/stories/storyshot.configFunc.test.js → ...core/stories/storyshot.configFunc.test.js b/...core/stories/storyshot.configFunc.test.js → ...core/stories/storyshot.configFunc.test.js
diff --git a/...ots-core/stories/storyshot.enzyme.test.js → ...ots-core/stories/storyshot.enzyme.test.js b/...ots-core/stories/storyshot.enzyme.test.js → ...ots-core/stories/storyshot.enzyme.test.js
diff --git a/...s-core/stories/storyshot.metadata.test.js → ...s-core/stories/storyshot.metadata.test.js b/...s-core/stories/storyshot.metadata.test.js → ...s-core/stories/storyshot.metadata.test.js
diff --git a/...core/stories/storyshot.renderOnly.test.js → ...core/stories/storyshot.renderOnly.test.js b/...core/stories/storyshot.renderOnly.test.js → ...core/stories/storyshot.renderOnly.test.js
diff --git a/...ories/storyshot.renderWithOptions.test.js → ...ories/storyshot.renderWithOptions.test.js b/...ories/storyshot.renderWithOptions.test.js → ...ories/storyshot.renderWithOptions.test.js
diff --git a/...ts-core/stories/storyshot.shallow.test.js → ...ts-core/stories/storyshot.shallow.test.js b/...ts-core/stories/storyshot.shallow.test.js → ...ts-core/stories/storyshot.shallow.test.js
diff --git a/...ries/storyshot.shallowWithOptions.test.js → ...ries/storyshot.shallowWithOptions.test.js b/...ries/storyshot.shallowWithOptions.test.js → ...ries/storyshot.shallowWithOptions.test.js
diff --git a/...yshot.snapshotWithOptionsFunction.test.js → ...yshot.snapshotWithOptionsFunction.test.js b/...yshot.snapshotWithOptionsFunction.test.js → ...yshot.snapshotWithOptionsFunction.test.js
diff --git a/...storyshots-core/stories/storyshot.test.js → ...storyshots-core/stories/storyshot.test.js b/...storyshots-core/stories/storyshot.test.js → ...storyshots-core/stories/storyshot.test.js
diff --git a/.../storyshots/storyshots-core/tsconfig.json → code/addons/storyshots-core/tsconfig.json b/.../storyshots/storyshots-core/tsconfig.json → code/addons/storyshots-core/tsconfig.json
diff --git a/...ryshots/storyshots-puppeteer/.eslintrc.js → .../addons/storyshots-puppeteer/.eslintrc.js b/...ryshots/storyshots-puppeteer/.eslintrc.js → .../addons/storyshots-puppeteer/.eslintrc.js
diff --git a/...storyshots/storyshots-puppeteer/README.md → code/addons/storyshots-puppeteer/README.md b/...storyshots/storyshots-puppeteer/README.md → code/addons/storyshots-puppeteer/README.md
diff --git a/code/addons/storyshots-puppeteer/jest.config.js b/code/addons/storyshots-puppeteer/jest.config.js
@@ -0,0 +1,12 @@
+const path = require('path');
+const baseConfig = require('../../jest.config.browser');
+
+module.exports = {
+  ...baseConfig,
+  snapshotSerializers: [...baseConfig.snapshotSerializers, 'enzyme-to-json/serializer'],
+  transform: {
+    ...baseConfig.transform,
+    '^.+\\.stories\\.[jt]sx?$': '@storybook/addon-storyshots/injectFileName',
+  },
+  displayName: __dirname.split(path.sep).slice(-2).join(path.posix.sep),
+};
diff --git a/...ryshots/storyshots-puppeteer/package.json → .../addons/storyshots-puppeteer/package.json b/...ryshots/storyshots-puppeteer/package.json → .../addons/storyshots-puppeteer/package.json
@@ -6,31 +6,32 @@
     "addon",
     "storybook"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots/storyshots-puppeteer",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/addons/storyshots-puppeteer",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "addons/storyshots/storyshots-puppeteer"
+    "directory": "addons/storyshots-puppeteer"
   },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
     "*.js",
+    "*.mjs",
     "*.d.ts"
   ],
   "scripts": {
-    "prep": "node ../../../../scripts/prepare.js"
+    "prep": "../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
     "@axe-core/puppeteer": "^4.2.0",
@@ -56,5 +57,6 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundler": {},
   "gitHead": "22701aedf564e467511887eb041f32ae0c96bcde"
 }
diff --git a/...storyshots/storyshots-puppeteer/preset.js → code/addons/storyshots-puppeteer/preset.js b/...storyshots/storyshots-puppeteer/preset.js → code/addons/storyshots-puppeteer/preset.js
diff --git a/...shots-puppeteer/src/__tests__/url.test.ts → ...shots-puppeteer/src/__tests__/url.test.ts b/...shots-puppeteer/src/__tests__/url.test.ts → ...shots-puppeteer/src/__tests__/url.test.ts
diff --git a/...shots/storyshots-puppeteer/src/axeTest.ts → ...ddons/storyshots-puppeteer/src/axeTest.ts b/...shots/storyshots-puppeteer/src/axeTest.ts → ...ddons/storyshots-puppeteer/src/axeTest.ts
diff --git a/...yshots/storyshots-puppeteer/src/config.ts → ...addons/storyshots-puppeteer/src/config.ts b/...yshots/storyshots-puppeteer/src/config.ts → ...addons/storyshots-puppeteer/src/config.ts
diff --git a/...storyshots-puppeteer/src/imageSnapshot.ts → ...storyshots-puppeteer/src/imageSnapshot.ts b/...storyshots-puppeteer/src/imageSnapshot.ts → ...storyshots-puppeteer/src/imageSnapshot.ts
diff --git a/...ryshots/storyshots-puppeteer/src/index.ts → .../addons/storyshots-puppeteer/src/index.ts b/...ryshots/storyshots-puppeteer/src/index.ts → .../addons/storyshots-puppeteer/src/index.ts
diff --git a/...storyshots-puppeteer/src/puppeteerTest.ts → ...storyshots-puppeteer/src/puppeteerTest.ts b/...storyshots-puppeteer/src/puppeteerTest.ts → ...storyshots-puppeteer/src/puppeteerTest.ts
diff --git a/...toryshots/storyshots-puppeteer/src/url.ts → code/addons/storyshots-puppeteer/src/url.ts b/...toryshots/storyshots-puppeteer/src/url.ts → code/addons/storyshots-puppeteer/src/url.ts
diff --git a/...yshots/storyshots-puppeteer/tsconfig.json → ...addons/storyshots-puppeteer/tsconfig.json b/...yshots/storyshots-puppeteer/tsconfig.json → ...addons/storyshots-puppeteer/tsconfig.json
diff --git a/code/addons/storyshots/README.md b/code/addons/storyshots/README.md
diff --git a/code/jest.config.base.js b/code/jest.config.base.js
@@ -10,7 +10,7 @@ const path = require('path');
 const skipOnWindows = [
   'lib/core-server/src/utils/__tests__/server-statics.test.ts',
   'lib/core-common/src/utils/__tests__/template.test.ts',
-  'addons/storyshots/storyshots-core/src/frameworks/configure.test.ts',
+  'addons/storyshots-core/src/frameworks/configure.test.ts',
   'lib/core-common/src/utils/__tests__/interpret-files.test.ts',
   'lib/cli/src/helpers.test.ts',
 ];

diff --git a/code/package.json b/code/package.json
@@ -40,7 +40,6 @@
   "workspaces": {
     "packages": [
       "addons/*",
-      "addons/storyshots/*",
       "examples/*",
       "examples-native/*",
       "frameworks/*",

diff --git a/code/workspace.json b/code/workspace.json
@@ -63,12 +63,12 @@
     },
     "@storybook/addon-storyshots": {
       "implicitDependencies": [],
-      "root": "addons/storyshots/storyshots-core",
+      "root": "addons/storyshots-core",
       "type": "library"
     },
     "@storybook/addon-storyshots-puppeteer": {
       "implicitDependencies": [],
-      "root": "addons/storyshots/storyshots-puppeteer",
+      "root": "addons/storyshots-puppeteer",
       "type": "library"
     },
     "@storybook/addon-storysource": {

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -5663,9 +5663,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/addon-storyshots-puppeteer@workspace:*, @storybook/addon-storyshots-puppeteer@workspace:addons/storyshots/storyshots-puppeteer":
+"@storybook/addon-storyshots-puppeteer@workspace:*, @storybook/addon-storyshots-puppeteer@workspace:addons/storyshots-puppeteer":
   version: 0.0.0-use.local
-  resolution: "@storybook/addon-storyshots-puppeteer@workspace:addons/storyshots/storyshots-puppeteer"
+  resolution: "@storybook/addon-storyshots-puppeteer@workspace:addons/storyshots-puppeteer"
   dependencies:
     "@axe-core/puppeteer": ^4.2.0
     "@storybook/csf": next
@@ -5684,9 +5684,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/addon-storyshots@workspace:*, @storybook/addon-storyshots@workspace:addons/storyshots/storyshots-core":
+"@storybook/addon-storyshots@workspace:*, @storybook/addon-storyshots@workspace:addons/storyshots-core":
   version: 0.0.0-use.local
-  resolution: "@storybook/addon-storyshots@workspace:addons/storyshots/storyshots-core"
+  resolution: "@storybook/addon-storyshots@workspace:addons/storyshots-core"
   dependencies:
     "@angular/core": ^13.3.6
     "@angular/platform-browser-dynamic": ^13.3.6

diff --git a/scripts/.yarnrc.yml b/scripts/.yarnrc.yml
@@ -12,7 +12,7 @@ logFilters:
   - level: discard
     pattern: '@storybook/root@workspace:.'
   - level: discard
-    pattern: '@workspace:addons/storyshots/'
+    pattern: '@workspace:addons/storyshots-*'
 
 nodeLinker: node-modules
 

diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json
@@ -76,8 +76,8 @@
     "@storybook/addon-links": "portal:../../code/addons/links",
     "@storybook/addon-measure": "portal:../../code/addons/measure",
     "@storybook/addon-outline": "portal:../../code/addons/outline",
-    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots/storyshots-core",
-    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots/storyshots-puppeteer",
+    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots-core",
+    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots-puppeteer",
     "@storybook/addon-storysource": "portal:../../code/addons/storysource",
     "@storybook/addon-toolbars": "portal:../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../code/addons/viewport",

diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json
@@ -54,8 +54,8 @@
     "@storybook/addon-links": "portal:../../code/addons/links",
     "@storybook/addon-measure": "portal:../../code/addons/measure",
     "@storybook/addon-outline": "portal:../../code/addons/outline",
-    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots/storyshots-core",
-    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots/storyshots-puppeteer",
+    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots-core",
+    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots-puppeteer",
     "@storybook/addon-storysource": "portal:../../code/addons/storysource",
     "@storybook/addon-toolbars": "portal:../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../code/addons/viewport",
@@ -125,4 +125,4 @@
     "@storybook/web-components": "portal:../../code/renderers/web-components",
     "@storybook/manager": "portal:../../code/ui/manager"
   }
-}
+}
diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json
@@ -45,8 +45,8 @@
     "@storybook/addon-links": "portal:../../code/addons/links",
     "@storybook/addon-measure": "portal:../../code/addons/measure",
     "@storybook/addon-outline": "portal:../../code/addons/outline",
-    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots/storyshots-core",
-    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots/storyshots-puppeteer",
+    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots-core",
+    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots-puppeteer",
     "@storybook/addon-storysource": "portal:../../code/addons/storysource",
     "@storybook/addon-toolbars": "portal:../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../code/addons/viewport",

diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json
@@ -30,8 +30,8 @@
     "@storybook/addon-links": "portal:../../code/addons/links",
     "@storybook/addon-measure": "portal:../../code/addons/measure",
     "@storybook/addon-outline": "portal:../../code/addons/outline",
-    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots/storyshots-core",
-    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots/storyshots-puppeteer",
+    "@storybook/addon-storyshots": "portal:../../code/addons/storyshots-core",
+    "@storybook/addon-storyshots-puppeteer": "portal:../../code/addons/storyshots-puppeteer",
     "@storybook/addon-storysource": "portal:../../code/addons/storysource",
     "@storybook/addon-toolbars": "portal:../../code/addons/toolbars",
     "@storybook/addon-viewport": "portal:../../code/addons/viewport",