From 66862879cbadc7319e6baffb6896627b990e3fad Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 18:00:41 -0700 Subject: [PATCH 1/3] chore(react-storybook): run migration generator --- packages/react-components/react-storybook/.npmignore | 5 +++-- .../react-storybook/tsconfig.spec.json | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/react-components/react-storybook/.npmignore b/packages/react-components/react-storybook/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-storybook/.npmignore +++ b/packages/react-components/react-storybook/.npmignore @@ -3,10 +3,11 @@ bundle-size/ config/ coverage/ -e2e/ +docs/ etc/ node_modules/ src/ +stories/ dist/types/ temp/ __fixtures__ @@ -16,7 +17,7 @@ __tests__ *.api.json *.log *.spec.* -*.stories.* +*.cy.* *.test.* *.yml diff --git a/packages/react-components/react-storybook/tsconfig.spec.json b/packages/react-components/react-storybook/tsconfig.spec.json index 469fcba4d7ba75..911456fe4b4d91 100644 --- a/packages/react-components/react-storybook/tsconfig.spec.json +++ b/packages/react-components/react-storybook/tsconfig.spec.json @@ -5,5 +5,13 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] + "include": [ + "**/*.spec.ts", + "**/*.spec.tsx", + "**/*.test.ts", + "**/*.test.tsx", + "**/*.d.ts", + "./src/testing/**/*.ts", + "./src/testing/**/*.tsx" + ] } From e9b1ddc523fdf371f0dffbf1e5c0790364dfd512 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 18:06:42 -0700 Subject: [PATCH 2/3] chore(react-storybook-addon): run migration generator --- .../react-components/react-storybook-addon/.npmignore | 5 +++-- .../react-storybook-addon/.storybook/main.js | 2 +- .../react-storybook-addon/.storybook/tsconfig.json | 2 +- .../{src => stories}/index.stories.tsx | 0 .../react-storybook-addon/tsconfig.spec.json | 10 +++++++++- 5 files changed, 14 insertions(+), 5 deletions(-) rename packages/react-components/react-storybook-addon/{src => stories}/index.stories.tsx (100%) diff --git a/packages/react-components/react-storybook-addon/.npmignore b/packages/react-components/react-storybook-addon/.npmignore index 52d2a7273a151d..f7ce568a6dbf7c 100644 --- a/packages/react-components/react-storybook-addon/.npmignore +++ b/packages/react-components/react-storybook-addon/.npmignore @@ -3,10 +3,11 @@ bundle-size/ config/ coverage/ -e2e/ +docs/ etc/ node_modules/ src/ +stories/ dist/types/ temp/ __fixtures__ @@ -16,7 +17,7 @@ __tests__ *.api.json *.log *.spec.* -*.stories.* +*.cy.* *.test.* *.yml diff --git a/packages/react-components/react-storybook-addon/.storybook/main.js b/packages/react-components/react-storybook-addon/.storybook/main.js index f57cfd09509e78..26536b61b387f6 100644 --- a/packages/react-components/react-storybook-addon/.storybook/main.js +++ b/packages/react-components/react-storybook-addon/.storybook/main.js @@ -2,7 +2,7 @@ const rootMain = require('../../../../.storybook/main'); module.exports = /** @type {Omit} */ ({ ...rootMain, - stories: [...rootMain.stories, '../src/**/*.stories.mdx', '../src/**/index.stories.@(ts|tsx)'], + stories: [...rootMain.stories, '../stories/**/*.stories.mdx', '../stories/**/index.stories.@(ts|tsx)'], addons: [...rootMain.addons], webpackFinal: (config, options) => { const localConfig = { ...rootMain.webpackFinal(config, options) }; diff --git a/packages/react-components/react-storybook-addon/.storybook/tsconfig.json b/packages/react-components/react-storybook-addon/.storybook/tsconfig.json index f9f60e1234ed49..ea89218a3d916f 100644 --- a/packages/react-components/react-storybook-addon/.storybook/tsconfig.json +++ b/packages/react-components/react-storybook-addon/.storybook/tsconfig.json @@ -6,5 +6,5 @@ "checkJs": true, "types": ["static-assets", "environment", "storybook__addons"] }, - "include": ["../src/**/*.stories.ts", "../src/**/*.stories.tsx", "*.js"] + "include": ["../stories/**/*.stories.ts", "../stories/**/*.stories.tsx", "*.js"] } diff --git a/packages/react-components/react-storybook-addon/src/index.stories.tsx b/packages/react-components/react-storybook-addon/stories/index.stories.tsx similarity index 100% rename from packages/react-components/react-storybook-addon/src/index.stories.tsx rename to packages/react-components/react-storybook-addon/stories/index.stories.tsx diff --git a/packages/react-components/react-storybook-addon/tsconfig.spec.json b/packages/react-components/react-storybook-addon/tsconfig.spec.json index 469fcba4d7ba75..911456fe4b4d91 100644 --- a/packages/react-components/react-storybook-addon/tsconfig.spec.json +++ b/packages/react-components/react-storybook-addon/tsconfig.spec.json @@ -5,5 +5,13 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] + "include": [ + "**/*.spec.ts", + "**/*.spec.tsx", + "**/*.test.ts", + "**/*.test.tsx", + "**/*.d.ts", + "./src/testing/**/*.ts", + "./src/testing/**/*.tsx" + ] } From 504343a6576c41f3e567228ba68c972ffc400941 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Tue, 1 Nov 2022 20:47:07 -0700 Subject: [PATCH 3/3] chore: remove unneeded testing path from tsconfig --- .../react-storybook-addon/tsconfig.spec.json | 10 +--------- .../react-storybook/tsconfig.spec.json | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/react-components/react-storybook-addon/tsconfig.spec.json b/packages/react-components/react-storybook-addon/tsconfig.spec.json index 911456fe4b4d91..469fcba4d7ba75 100644 --- a/packages/react-components/react-storybook-addon/tsconfig.spec.json +++ b/packages/react-components/react-storybook-addon/tsconfig.spec.json @@ -5,13 +5,5 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.test.ts", - "**/*.test.tsx", - "**/*.d.ts", - "./src/testing/**/*.ts", - "./src/testing/**/*.tsx" - ] + "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] } diff --git a/packages/react-components/react-storybook/tsconfig.spec.json b/packages/react-components/react-storybook/tsconfig.spec.json index 911456fe4b4d91..469fcba4d7ba75 100644 --- a/packages/react-components/react-storybook/tsconfig.spec.json +++ b/packages/react-components/react-storybook/tsconfig.spec.json @@ -5,13 +5,5 @@ "outDir": "dist", "types": ["jest", "node"] }, - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "**/*.test.ts", - "**/*.test.tsx", - "**/*.d.ts", - "./src/testing/**/*.ts", - "./src/testing/**/*.tsx" - ] + "include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.test.ts", "**/*.test.tsx", "**/*.d.ts"] }