Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rename v2 project back to Docusaurus #975

Merged
merged 3 commits into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion v2/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Munseo
# Docusaurus 2

## Development Server

Expand Down
File renamed without changes.
5 changes: 4 additions & 1 deletion v2/lib/webpack/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions v2/lib/webpack/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
43 changes: 24 additions & 19 deletions v2/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -79,7 +84,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"
},
Expand Down
2 changes: 1 addition & 1 deletion v2/test/load/__fixtures__/bad-site/siteConfig.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
title: 'Munseo',
title: 'docusaurus',
baseUrl: '/',
};
2 changes: 0 additions & 2 deletions v2/test/webpack/utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ describe('extending generated webpack config', () => {
},
});
const errors = validate(config);

console.log(errors);
expect(errors.length).toBe(0);
});

Expand Down
6 changes: 3 additions & 3 deletions v2/website/package.json
Original file line number Diff line number Diff line change
@@ -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/"
}
}
6 changes: 3 additions & 3 deletions v2/website/siteConfig.js
Original file line number Diff line number Diff line change
@@ -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: '/',
};
6 changes: 3 additions & 3 deletions v2/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down