From 349b00dabeb572b9d3d1596c25de1c559c7ab21f Mon Sep 17 00:00:00 2001 From: "Mr.Dr.Professor Patrick" Date: Wed, 5 Jul 2023 14:40:42 +0200 Subject: [PATCH] chore: rebase main (#193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update node in actions to 18 (#191) * chore: update node in actions to 18 * feat: upgrade lock version to 3 * fix: lint fixes * chore: fix main-preview action (#192) * feat(Yagr plugin)!: update to v3 (#180) * feat!: updated Yagr version * fix: updated package-lock, added npmrc * fix: switched to npm@8 to have lock version of 2 * chore: fixed jest config * feat: updated yagr to 3.3.0 * fix: bumped yarg patch version * fix: fix rebase artifacts --------- Co-authored-by: Алаев Евгений * fix: build fixes (#190) * chore: lock fixes --------- Co-authored-by: Trdat Mkrtchyan --- .github/workflows/ci.yml | 4 ++-- .storybook/main.ts | 26 -------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bbbd363..f65d15b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: '18.x' + node-version: 18 cache: 'npm' - name: Install Packages run: npm ci @@ -38,7 +38,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: '18.x' + node-version: 18 cache: 'npm' - name: Install Packages run: npm ci diff --git a/.storybook/main.ts b/.storybook/main.ts index 3b66f5e5..593a17c0 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -14,32 +14,6 @@ const config: StorybookConfig = { {name: '@storybook/addon-essentials', options: {backgrounds: false}}, './theme-addon/register.tsx', ], - webpackFinal: async (config) => { - const babelModuleIdx = config.module?.rules?.findIndex((rule) => { - const use = (Array.isArray(rule.use) ? rule.use?.[0] : rule.use) as {loader: string}; - return use.loader?.includes('babel-loader') && typeof rule.include === 'function'; - }); - - if (babelModuleIdx === undefined || babelModuleIdx === -1) { - return config; - } - - if (config.module?.rules?.[babelModuleIdx]?.include) { - const ii = config.module?.rules?.[babelModuleIdx]?.include as (s: string) => boolean; - config.module.rules[babelModuleIdx].include = (input: string) => { - const res = ii(input); - if ( - input.includes('node_modules/uplot') || - input.includes('node_modules/@gravity-ui/yagr') - ) { - return true; - } - return res; - }; - } - - return config; - }, }; export default config;