From 0b88fcb033ec3db8b79264c891122546e036606d Mon Sep 17 00:00:00 2001 From: endiliey Date: Fri, 21 Sep 2018 15:33:36 +0800 Subject: [PATCH 1/3] feat: better log message on build --- v2/lib/webpack/client.js | 5 ++++- v2/lib/webpack/server.js | 7 +++++-- v2/package.json | 2 +- v2/yarn.lock | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/v2/lib/webpack/client.js b/v2/lib/webpack/client.js index c544300df936..e1462ec21ee5 100644 --- a/v2/lib/webpack/client.js +++ b/v2/lib/webpack/client.js @@ -21,7 +21,10 @@ module.exports = function createClientConfig(props) { .use(StatsWriterPlugin, [{filename: 'client.stats.json'}]); // show compilation progress bar and build time - config.plugin('niceLog').use(webpackNiceLog, [{name: 'Client'}]); + const isProd = process.env.NODE_ENV === 'production'; + config + .plugin('niceLog') + .use(webpackNiceLog, [{name: 'Client', skipBuildTime: isProd}]); // user extended webpack-chain config applyChainWebpack(props.siteConfig.chainWebpack, config, false); diff --git a/v2/lib/webpack/server.js b/v2/lib/webpack/server.js index 160413e20c5c..fce92c67fbe7 100644 --- a/v2/lib/webpack/server.js +++ b/v2/lib/webpack/server.js @@ -31,10 +31,13 @@ module.exports = function createServerConfig(props) { }, ]); - // show compilation progress bar and build time + // show compilation progress bar + const isProd = process.env.NODE_ENV === 'production'; config .plugin('niceLog') - .use(webpackNiceLog, [{name: 'Server', color: 'yellow'}]); + .use(webpackNiceLog, [ + {name: 'Server', color: 'yellow', skipBuildTime: isProd}, + ]); // user extended webpack-chain config applyChainWebpack(props.siteConfig.chainWebpack, config, true); diff --git a/v2/package.json b/v2/package.json index 0f70dd57d7f7..66fef709ec1a 100644 --- a/v2/package.json +++ b/v2/package.json @@ -79,7 +79,7 @@ "webpack": "^4.16.3", "webpack-chain": "^4.8.0", "webpack-merge": "^4.1.4", - "webpack-nicelog": "^2.2.1", + "webpack-nicelog": "^2.3.1", "webpack-serve": "^2.0.2", "webpack-stats-plugin": "^0.2.1" }, diff --git a/v2/yarn.lock b/v2/yarn.lock index d2ac6d5e74c9..4a5f18f750ef 100644 --- a/v2/yarn.lock +++ b/v2/yarn.lock @@ -6994,9 +6994,9 @@ webpack-merge@^4.1.4: dependencies: lodash "^4.17.5" -webpack-nicelog@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/webpack-nicelog/-/webpack-nicelog-2.2.1.tgz#e3458003ce0d98966e930657176fb4eb6f536b85" +webpack-nicelog@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-nicelog/-/webpack-nicelog-2.3.1.tgz#35141251ad959df0c39069021de39b47b55cf65b" dependencies: chalk "^2.4.1" react-dev-utils "^5.0.1" From e38c8ff617d73b16a4d05f4274259bb21c28e0fb Mon Sep 17 00:00:00 2001 From: endiliey Date: Fri, 21 Sep 2018 15:52:37 +0800 Subject: [PATCH 2/3] feat: rename any 'endiliey|munseo' to 'facebook|docusaurus' --- v2/README.md | 2 +- v2/bin/{munseo.js => docusaurus.js} | 0 v2/package.json | 41 +++++++++++-------- .../load/__fixtures__/bad-site/siteConfig.js | 2 +- v2/website/package.json | 6 +-- v2/website/siteConfig.js | 6 +-- 6 files changed, 31 insertions(+), 26 deletions(-) rename v2/bin/{munseo.js => docusaurus.js} (100%) diff --git a/v2/README.md b/v2/README.md index 88425d6b7d76..76fcc7504a1c 100644 --- a/v2/README.md +++ b/v2/README.md @@ -1,4 +1,4 @@ -# Munseo +# Docusaurus 2 ## Development Server diff --git a/v2/bin/munseo.js b/v2/bin/docusaurus.js similarity index 100% rename from v2/bin/munseo.js rename to v2/bin/docusaurus.js diff --git a/v2/package.json b/v2/package.json index 66fef709ec1a..10efc309e9ef 100644 --- a/v2/package.json +++ b/v2/package.json @@ -1,30 +1,35 @@ { - "name": "munseo", - "version": "0.0.1", - "description": "📝⚡️ Transform your document (문서) to a website", - "main": "lib/index.js", + "name": "docusaurus", + "description": "Easy to Maintain Open Source Documentation Websites", + "version": "2.0.0", + "license": "MIT", + "keywords": [ + "react", + "static site generator", + "webpack", + "documentation", + "websites", + "open source", + "docusaurus" + ], + "repository": { + "type": "git", + "url": "https://github.com/facebook/Docusaurus.git" + }, "bin": { - "munseo": "bin/munseo.js" + "docusaurus": "bin/docusaurus.js" }, "scripts": { - "munseo": "node bin/munseo", - "start": "node bin/munseo start website", - "build": "node bin/munseo build website", - "eject": "node bin/munseo eject website", + "docusaurus": "node bin/docusaurus", + "start": "node bin/docusaurus start website", + "build": "node bin/docusaurus build website", + "eject": "node bin/docusaurus eject website", "lint": "eslint --cache \"lib/**/*.js\" \"bin/**/*.js\" \"test/**/*.js\"", "test": "jest --config test/jest.config.js" }, - "repository": { - "type": "git", - "url": "git+https://github.com/endiliey/munseo.git" - }, - "keywords": ["blog", "generator", "react"], - "author": "endiliey", - "license": "MIT", "bugs": { - "url": "https://github.com/endiliey/munseo/issues" + "url": "https://github.com/facebook/Docusaurus/issues" }, - "homepage": "https://github.com/endiliey/munseo#readme", "devDependencies": { "eslint": "^4.19.1", "eslint-config-airbnb": "17.0.0", diff --git a/v2/test/load/__fixtures__/bad-site/siteConfig.js b/v2/test/load/__fixtures__/bad-site/siteConfig.js index ab2a89fa2a10..5994a0e2038a 100644 --- a/v2/test/load/__fixtures__/bad-site/siteConfig.js +++ b/v2/test/load/__fixtures__/bad-site/siteConfig.js @@ -1,4 +1,4 @@ module.exports = { - title: 'Munseo', + title: 'docusaurus', baseUrl: '/', }; diff --git a/v2/website/package.json b/v2/website/package.json index 677e2ef3ffef..6d175d742453 100644 --- a/v2/website/package.json +++ b/v2/website/package.json @@ -1,9 +1,9 @@ { "scripts": { - "start": "node ../bin/munseo start", - "build": "node ../bin/munseo build" + "start": "node ../bin/docusaurus start", + "build": "node ../bin/docusaurus build" }, "dependencies": { - "munseo": "../../munseo/" + "docusaurus": "../../docusaurus/" } } \ No newline at end of file diff --git a/v2/website/siteConfig.js b/v2/website/siteConfig.js index c23875116425..4c1f06bce3a7 100644 --- a/v2/website/siteConfig.js +++ b/v2/website/siteConfig.js @@ -1,7 +1,7 @@ module.exports = { - title: 'Munseo', + title: 'docusaurus', tagline: '📝⚡️ Transform your document (문서) to a website', - organizationName: 'endiliey', - projectName: 'munseo', + organizationName: 'facebook', + projectName: 'docusaurus', baseUrl: '/', }; From 7da37603a3311179f7e93109d789a9c83008543a Mon Sep 17 00:00:00 2001 From: endiliey Date: Fri, 21 Sep 2018 18:04:31 +0800 Subject: [PATCH 3/3] test: remove unwanted console.log --- v2/test/webpack/utils.test.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/v2/test/webpack/utils.test.js b/v2/test/webpack/utils.test.js index 87bf0277e200..2c44fab794e1 100644 --- a/v2/test/webpack/utils.test.js +++ b/v2/test/webpack/utils.test.js @@ -35,8 +35,6 @@ describe('extending generated webpack config', () => { }, }); const errors = validate(config); - - console.log(errors); expect(errors.length).toBe(0); });