3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-08-06 10:20:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(v2): fix babel transpilation include/exclude logic (#1868)

Browse source 
* fix(v2): fix babel transpilation include/exclude logic

* nits

* optimize

* docs migration before alpha.30 hotfix
This commit is contained in:
Endi 2019-10-22 12:17:00 +07:00 • committed by GitHub
parent b56adb7ca1
commit 4c4e6ad773
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG-2.x.md
View file

@ -1,5 +1,8 @@
# Docusaurus 2 Changelog
## 2.0.0-alpha.30
- Fix babel transpilation include/exclude logic to be more efficient. This also fix a very weird bug `TypeError: Cannot assign to read only property 'exports' of object '#<Object>'` if your website path contains `docusaurus` word in it.
## 2.0.0-alpha.29
**HOTFIX for 2.0.0-alpha.28**.

10
packages/docusaurus/src/webpack/base.ts
View file

@ -24,6 +24,7 @@ export function createBaseConfig(
): Configuration {
const {outDir, siteDir, baseUrl, generatedFilesDir, routesPaths} = props;
const clientDir = path.join(__dirname, '..', 'client');
const totalPages = routesPaths.length;
const isProd = process.env.NODE_ENV === 'production';
return {
@ -115,9 +116,14 @@ export function createBaseConfig(
{
test: /\.jsx?$/,
exclude: modulePath => {
// Don't transpile node_modules except any docusaurus package
// always transpile client dir
if (modulePath.startsWith(clientDir)) {
return false;
}
// Don't transpile node_modules except any docusaurus npm package
return (
/node_modules/.test(modulePath) && !/docusaurus/.test(modulePath)
/node_modules/.test(modulePath) &&
!/(docusaurus)((?!node_modules).)*\.jsx?$/.test(modulePath)
);
},
use: [getCacheLoader(isServer), getBabelLoader(isServer)].filter(

6
packages/docusaurus/src/webpack/plugins/LogPlugin.js
View file

@ -16,10 +16,14 @@ class LogPlugin extends WebpackBar {
super.apply(compiler);
compiler.hooks.done.tap('WebpackNiceLog', stats => {
const messages = formatWebpackMessages(stats.toJson('errors-only', true));
if (stats.hasErrors()) {
const messages = formatWebpackMessages(
stats.toJson('errors-only', true),
);
if (messages.errors.length) {
showError(messages.errors);
}
}
});
}
}

9
packages/docusaurus/src/webpack/utils.ts
View file

@ -90,7 +90,14 @@ export function getBabelLoader(isServer: boolean, babelOptions?: {}): Loader {
configFile: false,
presets: [
isServer
? '@babel/env'
? [
'@babel/env',
{
targets: {
node: 'current',
},
},
]
: [
'@babel/env',
{

8
website/docs/migrating-from-v1-to-v2.md
View file

@ -37,8 +37,8 @@ Meanwhile, the default doc site functionalities provided by Docusaurus 1 are now
{
dependencies: {
- "docusaurus": "^1.x.x",
+ "@docusaurus/core": "^2.0.0-alpha.29",
+ "@docusaurus/preset-classic": "^2.0.0-alpha.29",
+ "@docusaurus/core": "^2.0.0-alpha.30",
+ "@docusaurus/preset-classic": "^2.0.0-alpha.30",
}
}
```
@ -71,8 +71,8 @@ A typical Docusaurus 2 `package.json` may look like this:
"deploy": "docusaurus deploy"
},
"dependencies": {
"@docusaurus/core": "^2.0.0-alpha.29",
"@docusaurus/preset-classic": "^2.0.0-alpha.29",
"@docusaurus/core": "^2.0.0-alpha.30",
"@docusaurus/preset-classic": "^2.0.0-alpha.30",
"classnames": "^2.2.6",
"react": "^16.10.2",
"react-dom": "^16.10.2"

18
yarn.lock
View file

@ -4410,20 +4410,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971:
version "1.0.30000974"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984:
version "1.0.30000984"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
caniuse-lite@^1.0.30000989:
version "1.0.30000989"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30000989:
version "1.0.30001002"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001002.tgz#ba999a737b1abd5bf0fd47efe43a09b9cadbe9b0"
integrity sha512-pRuxPE8wdrWmVPKcDmJJiGBxr6lFJq4ivdSeo9FTmGj5Rb8NX3Mby2pARG57MXF15hYAhZ0nHV5XxT2ig4bz3g==
capture-exit@^2.0.0:
version "2.0.0"