diff --git a/packages/gamut/package.json b/packages/gamut/package.json index 1cc8f38c40..cb8df0cbdc 100644 --- a/packages/gamut/package.json +++ b/packages/gamut/package.json @@ -10,7 +10,7 @@ "@codecademy/gamut-styles": "16.3.0", "@codecademy/variance": "0.21.3", "@reach/auto-id": "^0.16.0", - "@reach/tabs": "^0.16.4", + "@reach/tabs": "^0.18.0", "@types/marked": "^4.0.8", "classnames": "^2.2.5", "framer-motion": "^6.5.1", diff --git a/packages/styleguide/.storybook/main.ts b/packages/styleguide/.storybook/main.ts index 128ee1cdf9..44613f4edf 100644 --- a/packages/styleguide/.storybook/main.ts +++ b/packages/styleguide/.storybook/main.ts @@ -53,6 +53,29 @@ module.exports = { }, webpackFinal: (config: any) => { + const transpileModules = ['@reach']; + + // Find existing rule that excludes node_modules + const nodeModulesRule = config.module.rules?.find((rule: any) => + rule.exclude?.toString().includes('node_modules') + ); + if (nodeModulesRule) { + // Tell existing rule to not exclude modules that need transpiling + const newExclude = new RegExp( + `node_modules/(?!(${transpileModules.join('|')})/).*` + ); + + if (Array.isArray(nodeModulesRule.exclude)) { + nodeModulesRule.exclude = [ + newExclude, + ...nodeModulesRule.exclude?.filter( + (exclude: any) => !exclude.toString().includes('node_modules') + ), + ]; + } else { + nodeModulesRule.exclude = newExclude; + } + } config.module.rules = config.module.rules.concat( configs.css().module.rules ); diff --git a/yarn.lock b/yarn.lock index ceb8d079de..f274fbbdbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4101,7 +4101,14 @@ resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353" integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q== -"@reach/auto-id@0.16.0", "@reach/auto-id@^0.16.0": +"@reach/auto-id@0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.18.0.tgz#4b97085cd1cf1360a9bedc6e9c78e97824014f0d" + integrity sha512-XwY1IwhM7mkHZFghhjiqjQ6dstbOdpbFLdggeke75u8/8icT8uEHLbovFUgzKjy9qPvYwZIB87rLiR8WdtOXCg== + dependencies: + "@reach/utils" "0.18.0" + +"@reach/auto-id@^0.16.0": version "0.16.0" resolved "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.16.0.tgz#dfabc3227844e8c04f8e6e45203a8e14a8edbaed" integrity sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg== @@ -4109,13 +4116,17 @@ "@reach/utils" "0.16.0" tslib "^2.3.0" -"@reach/descendants@0.16.1": - version "0.16.1" - resolved "https://registry.npmjs.org/@reach/descendants/-/descendants-0.16.1.tgz#fa3d89c0503565369707f32985d87eef61985d9f" - integrity sha512-3WZgRnD9O4EORKE31rrduJDiPFNMOjUkATx0zl192ZxMq3qITe4tUj70pS5IbJl/+v9zk78JwyQLvA1pL7XAPA== +"@reach/descendants@0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@reach/descendants/-/descendants-0.18.0.tgz#16fe52a5154da262994b0b8768baff4f670922d1" + integrity sha512-GXUxnM6CfrX5URdnipPIl3Tlc6geuz4xb4n61y4tVWXQX1278Ra9Jz9DMRN8x4wheHAysvrYwnR/SzAlxQzwtA== dependencies: - "@reach/utils" "0.16.0" - tslib "^2.3.0" + "@reach/utils" "0.18.0" + +"@reach/polymorphic@0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@reach/polymorphic/-/polymorphic-0.18.0.tgz#2fe42007a774e06cdbc8e13e0d46f2dc30f2f1ed" + integrity sha512-N9iAjdMbE//6rryZZxAPLRorzDcGBnluf7YQij6XDLiMtfCj1noa7KyLpEc/5XCIB/EwhX3zCluFAwloBKdblA== "@reach/router@^1.3.4": version "1.3.4" @@ -4127,16 +4138,15 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" -"@reach/tabs@^0.16.4": - version "0.16.4" - resolved "https://registry.npmjs.org/@reach/tabs/-/tabs-0.16.4.tgz#7da85e46f64052bdd1c0f9582f900e379b098ac5" - integrity sha512-4EK+1U0OoLfg2tJ1BSZf6/tx0hF5vlXKxY7qB//bPWtlIh9Xfp/aSDIdspFf3xS8MjtKeb6IVmo5UAxDMq85ZA== +"@reach/tabs@^0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@reach/tabs/-/tabs-0.18.0.tgz#f2e789d445d61a371eace9415841502729d099c9" + integrity sha512-gTRJzStWJJtgMhn9FDEmKogAJMcqNaGZx0i1SGoTdVM+D29DBhVeRdO8qEg+I2l2k32DkmuZxG/Mrh+GZTjczQ== dependencies: - "@reach/auto-id" "0.16.0" - "@reach/descendants" "0.16.1" - "@reach/utils" "0.16.0" - prop-types "^15.7.2" - tslib "^2.3.0" + "@reach/auto-id" "0.18.0" + "@reach/descendants" "0.18.0" + "@reach/polymorphic" "0.18.0" + "@reach/utils" "0.18.0" "@reach/utils@0.16.0": version "0.16.0" @@ -4146,6 +4156,11 @@ tiny-warning "^1.0.3" tslib "^2.3.0" +"@reach/utils@0.18.0": + version "0.18.0" + resolved "https://registry.npmjs.org/@reach/utils/-/utils-0.18.0.tgz#4f3cebe093dd436eeaff633809bf0f68f4f9d2ee" + integrity sha512-KdVMdpTgDyK8FzdKO9SCpiibuy/kbv3pwgfXshTI6tEcQT1OOwj7BAksnzGC0rPz0UholwC+AgkqEl3EJX3M1A== + "@sigstore/bundle@^1.1.0": version "1.1.0" resolved "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"