Skip to content

Commit

Permalink
chore: rebase main (#193)
Browse files Browse the repository at this point in the history
* 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: Алаев Евгений <[email protected]>

* fix: build fixes (#190)

* chore: lock fixes

---------

Co-authored-by: Trdat Mkrtchyan <[email protected]>
  • Loading branch information
korvin89 and zefirka committed Jul 24, 2023
1 parent 91b86a3 commit 349b00d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
26 changes: 0 additions & 26 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 349b00d

Please sign in to comment.