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

Commit

Permalink
fix(docz-core): mdx loader options
Browse files Browse the repository at this point in the history
  • Loading branch information
@pedronauck
pedronauck committed Jan 21, 2019
1 parent d0c7496 commit 9114f9b
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 32 deletions.
51 changes: 31 additions & 20 deletions core/docz-core/src/bundler/loaders.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import * as path from 'path'
import Config from 'webpack-chain'
import matter from 'remark-frontmatter'
import slug from 'rehype-slug'
import remarkDocz from 'remark-docz'
import rehypeDocz from 'rehype-docz'

import * as paths from '../config/paths'
import { Config as Args } from '../config/argv'
Expand All @@ -26,8 +22,16 @@ export const sourceMaps = (config: Config, args: Args) => {
.enforce('pre')
}

const addScriptLoaders = (rule: Config.Rule, babelrc: BabelRC, args: Args) =>
rule
export interface AddScriptLoaderOpts {
threadLoader?: boolean
rule: Config.Rule
babelrc: BabelRC
args: Args
}

const addScriptLoaders = (opts: AddScriptLoaderOpts) => {
const { rule, threadLoader = true, babelrc, args } = opts
return rule
.when(!args.debug, rule =>
rule
.use('cache-loader')
Expand All @@ -36,16 +40,19 @@ const addScriptLoaders = (rule: Config.Rule, babelrc: BabelRC, args: Args) =>
cacheDirectory: paths.cache,
})
)
.use('thread-loader')
.loader(require.resolve('thread-loader'))
.options({
workers: require('os').cpus().length - 1,
})
.end()
.when(Boolean(threadLoader), rule =>
rule
.use('thread-loader')
.loader(require.resolve('thread-loader'))
.options({
workers: require('os').cpus().length - 1,
})
)
.use('babel-loader')
.loader(require.resolve('babel-loader'))
.options(babelrc)
.end()
}

export const js = (config: Config, args: Args, babelrc: BabelRC) => {
const srcPath = path.resolve(paths.root, args.src)
Expand All @@ -59,7 +66,7 @@ export const js = (config: Config, args: Args, babelrc: BabelRC) => {
.exclude.add(excludeNodeModules)
.end()

addScriptLoaders(rule, babelrc, args)
addScriptLoaders({ rule, babelrc, args })
}

export const ts = (config: Config, args: Args, babelrc: BabelRC) => {
Expand All @@ -74,7 +81,7 @@ export const ts = (config: Config, args: Args, babelrc: BabelRC) => {
.exclude.add(excludeNodeModules)
.end()

addScriptLoaders(rule, babelrc, args)
addScriptLoaders({ rule, babelrc, args })
}

export const mdx = (config: Config, args: Args, babelrc: BabelRC) => {
Expand All @@ -89,16 +96,20 @@ export const mdx = (config: Config, args: Args, babelrc: BabelRC) => {
.exclude.add(excludeNodeModules)
.end()

addScriptLoaders(rule, babelrc, args)
addScriptLoaders({ rule, babelrc, args, threadLoader: false })
.use('mdx-loader')
.loader(require.resolve('@mdx-js/loader'))
.options({
type: 'yaml',
marker: '-',
mdPlugins: mdPlugins.concat([matter, remarkDocz]),
mdPlugins: mdPlugins.concat([
[require('remark-frontmatter'), { type: 'yaml', marker: '-' }],
require('remark-docz'),
]),
hastPlugins: hastPlugins.concat([
rehypeDocz(paths.root, args.codeSandbox),
slug,
[
require('rehype-docz'),
{ root: paths.root, useCodeSandbox: args.codeSandbox },
],
require('rehype-slug'),
]),
})
}
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@types/react": "^16.7.20",
"@types/react-dom": "^16.0.11",
"@types/react-router-dom": "^4.3.1",
"@types/jest": "^23.3.13",
"all-contributors-cli": "^5.10.2",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-module-resolver": "^3.1.2",
Expand All @@ -55,12 +56,14 @@
"cross-env": "^5.2.0",
"docz-rollup": "0.13.3",
"husky": "^1.3.1",
"jest": "^23.6.0",
"lerna": "3.10.6",
"lint-staged": "^8.1.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.16.0",
"rollup": "^1.1.2",
"trash-cli": "^1.4.0",
"ts-jest": "^23.10.5",
"tslint": "^5.12.1",
"tslint-config-prettier": "^1.17.0",
"typescript": "^3.2.4"
Expand Down
56 changes: 44 additions & 12 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2152,6 +2152,11 @@
"@types/events" "*"
"@types/node" "*"

"@types/jest@^23.3.13":
version "23.3.13"
resolved "https://registry.npmjs.org/@types/jest/-/jest-23.3.13.tgz#c81484b6f4ca007bb09887ed15ecb3286d58f928"
integrity sha512-ePl4l+7dLLmCucIwgQHAgjiepY++qcI6nb8eAwGNkB6OxmTe3Z9rQU3rSpomqu42PCCnlThZbOoxsf+qylJsLA==

"@types/lodash.flatten@^4.4.4":
version "4.4.4"
resolved "https://registry.npmjs.org/@types/lodash.flatten/-/lodash.flatten-4.4.4.tgz#7f28009ef57c8d2b1d8463c3e53fdccf780120a5"
Expand Down Expand Up @@ -3581,6 +3586,13 @@ browserslist@^4.3.4:
electron-to-chromium "^1.3.86"
node-releases "^1.0.5"

[email protected]:
version "0.2.6"
resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
dependencies:
fast-json-stable-stringify "2.x"

bser@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
Expand All @@ -3605,7 +3617,7 @@ buble@^0.19.3:
regexpu-core "^4.2.0"
vlq "^1.0.0"

buffer-from@^1.0.0:
buffer-from@1.x, buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
Expand Down Expand Up @@ -5997,7 +6009,7 @@ fast-glob@^2.2.6:
merge2 "^1.2.3"
micromatch "^3.1.10"

fast-json-stable-stringify@^2.0.0:
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
Expand Down Expand Up @@ -8412,18 +8424,18 @@ json3@^3.3.2:
resolved "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=

json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=

json5@^2.1.0:
[email protected], json5@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
dependencies:
minimist "^1.2.0"

json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=

jsonfile@^2.1.0:
version "2.4.0"
resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
Expand Down Expand Up @@ -9099,6 +9111,11 @@ make-dir@^1.0.0:
dependencies:
pify "^3.0.0"

[email protected]:
version "1.3.5"
resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==

make-fetch-happen@^4.0.1:
version "4.0.1"
resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
Expand Down Expand Up @@ -9559,7 +9576,7 @@ mixin-object@^2.0.1:
for-in "^0.1.3"
is-extendable "^0.1.1"

[email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
[email protected], [email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
Expand Down Expand Up @@ -11891,7 +11908,7 @@ [email protected]:
resolved "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=

[email protected], resolve@^1.4.0, resolve@^1.9.0:
[email protected], resolve@1.x, resolve@^1.4.0, resolve@^1.9.0:
version "1.9.0"
resolved "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
Expand Down Expand Up @@ -12103,7 +12120,7 @@ semver-diff@^2.0.0:
dependencies:
semver "^5.0.3"

"semver@2 || 3 || 4 || 5", "[email protected] || 3.x || 4 || 5", [email protected], semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
"semver@2 || 3 || 4 || 5", "[email protected] || 3.x || 4 || 5", [email protected], semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
version "5.6.0"
resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
Expand Down Expand Up @@ -13252,6 +13269,21 @@ tryer@^1.0.0:
resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==

ts-jest@^23.10.5:
version "23.10.5"
resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5"
integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A==
dependencies:
bs-logger "0.x"
buffer-from "1.x"
fast-json-stable-stringify "2.x"
json5 "2.x"
make-error "1.x"
mkdirp "0.x"
resolve "1.x"
semver "^5.5"
yargs-parser "10.x"

[email protected], tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.9.3"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
Expand Down Expand Up @@ -14310,7 +14342,7 @@ yallist@^3.0.0, yallist@^3.0.2:
resolved "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==

yargs-parser@^10.0.0, yargs-parser@^10.1.0:
yargs-parser@10.x, yargs-parser@^10.0.0, yargs-parser@^10.1.0:
version "10.1.0"
resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
Expand Down

0 comments on commit 9114f9b

Please sign in to comment.