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

update master #377

Merged
merged 26 commits into from
Oct 10, 2017
Merged

update master #377

merged 26 commits into from
Oct 10, 2017

Conversation

dear-lizhihua
Copy link

No description provided.

skipjack and others added 24 commits September 7, 2017 23:38
Make minor fix in the CLI documentation to reflect this comment:

webpack#1577 (comment)
)

Try to resolve the confusion from #1556. Also update the options
section to clean things up a bit both for readability and grammar.

Resolves #1556
Changed example to declare the plugin within `plugins` property.
Rewrite the main sections of the guide to synchronize it with
the other core guides. Briefly mention the other utilities that
don't require full on examples (details can be found via links).

Closes #1258
OpenCollective's structure changed a bit. This address that
and makes a few other notable changes:

- add additional sponsors
- allow to merge additional sponsors to existing sponsors
- limit width of logos to 3 x height to disallow very wide logos
- format money values with commas
Remove local type def from TypeScript snippet. The @types/node type 
definition module already declares `__dirname` type:

https://git.io/v5Dr9
Add an example to demonstrate using hot module replacement with 
`webpack-dev-server`'s Node.js API instead of within a normal
configuration file.
The article was missing references to `clean-webpack-plugin`
in the `webpack.config.js` file and `package.json` files.
As a conclusion, I thought it would be a good idea to show case 
a high-level explanation of why it's called tree shaking. Once the 
user reads the guide and ends up with a high-level explanation 
the word tree shaking will stick to the user's head.
Suggest solutions to the problem right away seems to be a 
better approach. Use similar text as was used here:

https://webpack.js.org/api/module-methods/#import-
Add more information about optimization bailouts. Attempt to transfer 
content from the blog post to the official docs. I want to follow up with 
a PR for better bailout reasons. The hope is that the reasons will match 
those listed in the table.
Clarify interactions between `libraryTarget` and `library`. The 
interactions between the two and how some of the sections were not
well explained, in some cases were incorrect, misleading or missing
information.
Add documentation about setting environment variables in CLI with 
`--env`. Link to webpack _CLI Environment_ section. Add additional 
usage to `--env` CLI docs.
`pre` loaders run at the beginning, `post` loaders run at the end.
@aladdin-add
Copy link
Member

有冲突。 @dear-lizhihua

# Conflicts:
#	src/content/plugins/module-concatenation-plugin.md
@dear-lizhihua
Copy link
Author

@aladdin-add 解决了

@aladdin-add aladdin-add merged commit 5f9fd20 into docschina:cn Oct 10, 2017
TyreeZhao pushed a commit to TyreeZhao/webpack.js.org that referenced this pull request Oct 11, 2017
aladdin-add pushed a commit that referenced this pull request Oct 18, 2017
* translated ModuleConcatenationPlugin

* formate

* added spaces.

* formate

* code review

* optimized

* updated

* updated

* Update module-concatenation-plugin.md

* updated /content/plugins/module-concatenation-plugin.md(#377)

* improved

捆绑失败优化 => 捆绑失败的优化

* scope: 范围 => 作用域

* updated

模型 => 模块
捆绑=> 绑定

* trans review

* Update module-concatenation-plugin.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.