Skip to content
This repository has been archived by the owner on Jan 24, 2025. It is now read-only.

Commit

Permalink
chore(docz-core): add @babel/polyfill instead of babel-polyfill
Browse files Browse the repository at this point in the history
  • Loading branch information
pedronauck committed Aug 16, 2018
1 parent 67e68aa commit 035ec02
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion packages/docz-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"dependencies": {
"@babel/core": "7.0.0-beta.55",
"@babel/plugin-syntax-dynamic-import": "^7.0.0-beta.55",
"@babel/polyfill": "7.0.0-beta.55",
"@babel/preset-typescript": "^7.0.0-beta.55",
"@babel/runtime": "^7.0.0-beta.55",
"@mdx-js/loader": "^0.15.0-2",
Expand All @@ -34,7 +35,6 @@
"art-template": "^4.12.2",
"babel-loader": "^8.0.0-beta.4",
"babel-plugin-react-docgen": "^2.0.0-rc.1",
"babel-polyfill": "^7.0.0-beta.3",
"babel-preset-react-app": "^4.0.0-next.b2fd8db8",
"babylon": "^6.18.0",
"cache-loader": "^1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/docz-core/src/bundlers/webpack/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const createConfig = (args: Args, env: Env) => async (

config
.entry('app')
.add(require.resolve('babel-polyfill'))
.add(require.resolve('@babel/polyfill'))
.add(paths.indexJs)

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/docz-core/src/bundlers/webpack/loaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const setupHappypack = (config: Config, args: Args, babelrc: any) => {
id: 'jsx',
verbose: args.debug,
loaders: [
{
!args.debug && {
loader: require.resolve('cache-loader'),
options: {
cacheDirectory: paths.cache,
Expand All @@ -21,7 +21,7 @@ export const setupHappypack = (config: Config, args: Args, babelrc: any) => {
loader: require.resolve('babel-loader'),
options: babelrc,
},
] as any[],
].filter(Boolean) as any[],
}

if (args.propsParser && args.typescript) {
Expand All @@ -34,7 +34,7 @@ export const setupHappypack = (config: Config, args: Args, babelrc: any) => {
id: 'mdx',
verbose: args.debug,
loaders: [
{
!args.debug && {
loader: require.resolve('cache-loader'),
options: {
cacheDirectory: paths.cache,
Expand All @@ -49,7 +49,7 @@ export const setupHappypack = (config: Config, args: Args, babelrc: any) => {
.filter((p: string) => /babel\-plugin\-react\-docgen/.test(p)),
},
},
],
].filter(Boolean),
}

config.plugin('happypack-jsx').use(HappyPack, [jsx])
Expand Down
26 changes: 16 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,13 @@
"@babel/helper-regex" "7.0.0-beta.55"
regexpu-core "^4.1.3"

"@babel/[email protected]":
version "7.0.0-beta.55"
resolved "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0-beta.55.tgz#fc68159a3a32f67d4003298ee69d3412622b5303"
dependencies:
core-js "^2.5.7"
regenerator-runtime "^0.11.1"

"@babel/[email protected]":
version "7.0.0-beta.42"
resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.0.0-beta.42.tgz#671e688057c010b22a7811b965f7da5d79c472d3"
Expand Down Expand Up @@ -3184,13 +3191,6 @@ [email protected], babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
core-js "^2.5.0"
regenerator-runtime "^0.10.5"

babel-polyfill@^7.0.0-beta.3:
version "7.0.0-beta.3"
resolved "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-7.0.0-beta.3.tgz#053f0943cdf498910cc037de2ffc7b1f2e36223a"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"

[email protected]:
version "1.6.1"
resolved "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
Expand Down Expand Up @@ -4047,6 +4047,10 @@ clone@^2.1.1:
version "2.1.1"
resolved "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"

clone@^2.1.2:
version "2.1.2"
resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"

cmd-shim@^2.0.2:
version "2.0.2"
resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
Expand Down Expand Up @@ -8091,9 +8095,11 @@ less-loader@^4.1.0:
loader-utils "^1.1.0"
pify "^3.0.0"

less@^3.8.0:
version "3.8.0"
resolved "https://registry.npmjs.org/less/-/less-3.8.0.tgz#44785e40c23841c15ba3be741d36bd2775dd0596"
less@^3.8.1:
version "3.8.1"
resolved "https://registry.npmjs.org/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
dependencies:
clone "^2.1.2"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
Expand Down

0 comments on commit 035ec02

Please sign in to comment.