update master #404
Merged
update master #404
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/content/plugins/module-concatenation-plugin.md
# Conflicts: # antwar.config.js # src/components/Footer/Footer.jsx # src/components/Navigation/Navigation.jsx # src/components/Site/Site.jsx # src/components/Splash/Splash.jsx # src/content/analyze.md # src/content/api/cli.md # src/content/api/compilation.md # src/content/api/compiler.md # src/content/api/index.md # src/content/api/loaders.md # src/content/api/module-factories.md # src/content/api/plugins.md # src/content/api/plugins/dependency.md # src/content/api/plugins/tapable.md # src/content/api/plugins/template.md # src/content/api/stats.md # src/content/comparison.md # src/content/configuration/dev-server.md # src/content/configuration/module.md # src/content/configuration/stats.md # src/content/contribute/plugin-patterns.md # src/content/contribute/release-process.md # src/content/contribute/writing-a-loader.md # src/content/contribute/writing-a-plugin.md # src/content/development/index.md # src/content/glossary.md # src/content/guides/code-splitting.md # src/content/guides/development.md # src/content/guides/getting-started.md # src/content/guides/production.md # src/content/license.md # src/content/support/index.md # template.ejs
# Conflicts: # src/content/loaders/babel-loader.md # src/content/loaders/bundle-loader.md # src/content/loaders/cache-loader.md # src/content/loaders/coffee-loader.md # src/content/loaders/css-loader.md # src/content/loaders/file-loader.md # src/content/loaders/imports-loader.md # src/content/loaders/istanbul-instrumenter-loader.md # src/content/loaders/json5-loader.md # src/content/loaders/mocha-loader.md # src/content/loaders/node-loader.md # src/content/loaders/raw-loader.md # src/content/loaders/react-proxy-loader.md # src/content/loaders/sass-loader.md # src/content/loaders/script-loader.md # src/content/loaders/source-map-loader.md # src/content/loaders/style-loader.md # src/content/loaders/val-loader.md # src/content/loaders/worker-loader.md # src/content/loaders/yaml-frontmatter-loader.md # src/content/plugins/babel-minify-webpack-plugin.md # src/content/plugins/component-webpack-plugin.md # src/content/plugins/compression-webpack-plugin.md # src/content/plugins/extract-text-webpack-plugin.md
# Conflicts: # src/components/Navigation/Links.json
# Conflicts: # src/components/Site/Site.jsx # src/content/api/compilation.md # src/content/api/compiler.md # src/content/api/loaders.md # src/content/api/module-factories.md # src/content/api/plugins.md # src/content/configuration/output.md # src/content/contribute/plugin-patterns.md # src/content/contribute/release-process.md # src/content/contribute/writing-a-loader.md # src/content/plugins/module-concatenation-plugin.md
Make the `index` page more beginner friendly with less technical lingo and complex details. Resolves #1416
…gin (#1684) This adds a link between “concatenation behavior” and “scope hoisting”. Without this, a new person might be confused what exactly “scope hoisting” is (because it appears without any visible connection to the previous content).
In actual fact the parameters passed to `emitWarning` / `emitError` must be an instance of Error.
Document the new `--concatenate-modules` flag in both the CLI documentation and production guide. Add section on the `ModuleConcatenationPlugin` in the production guide (as we include this plugin under `-p`, it also makes sense to mention it in this guide.
Rename plugin identifier and require webpack when it is used in the configuration examples.
# Conflicts: # src/content/guides/development.md
|
@biqing |
# Conflicts: # src/content/api/cli.md # src/content/guides/production.md
aladdin-add
approved these changes
Nov 6, 2017
# Conflicts: # src/content/loaders/babel-loader.md # src/content/loaders/coffee-loader.md # src/content/loaders/i18n-loader.md # src/content/loaders/json-loader.md # src/content/loaders/raw-loader.md # src/content/loaders/script-loader.md # src/content/loaders/style-loader.md # src/content/loaders/url-loader.md # src/content/loaders/worker-loader.md # src/content/plugins/babel-minify-webpack-plugin.md # src/content/plugins/uglifyjs-webpack-plugin.md
biqing
suggested changes
Nov 7, 2017
src/content/concepts/index.md
Outdated
| --- | ||
|
|
||
| *webpack* 是一个现代 JavaScript 应用程序的_模块打包器(module bundler)_。当 webpack 处理应用程序时，它会递归地构建一个_依赖关系图(dependency graph)_，其中包含应用程序需要的每个模块，然后将所有这些模块打包成少量的 _bundle_ - 通常只有一个，由浏览器加载。 | ||
| 从其提供的核心功能来看，*webpack* 是一个现代 JavaScript 应用程序的_模块打包器(module bundler)_。当 webpack 处理应用程序时，它会递归地构建一个_依赖关系图(dependency graph)_，其中包含应用程序需要的每个模块，然后将所有这些模块打包成一个或多个 _bundle_。 |
src/content/concepts/index.md
Outdated
|
|
||
| 在 webpack 中，我们使用 [webpack 配置对象(webpack configuration object)](/configuration) 中的 `entry` 属性来定义_入口_。 | ||
| 然后，处理每个依赖，并将其输出到名为 *bundles* 的文件中，我们将在下一章节详细讨论这个过程。 |
There was a problem hiding this comment.
然后，处理每个依赖，并将其输出到名为 bundles 的文件中
这里的错误比较明显，应译为
每个依赖项随即被处理，最后输出到称之为“包（bundles）”的文件中
src/content/concepts/index.md
Outdated
| `output` 属性还有[更多可配置的特性](/configuration/output)，但让我们花一些时间先了解一些 `output` 属性最常见的用例。 | ||
|
|
||
| [了解更多！](/concepts/output) | ||
| `output` 属性还有[更多可配置的特性](/configuration/output)，如果你想要了解更多关于 `output` 属性的概念，你可以通过[阅读核心章节]more in the concepts section](/concepts/output)来了解更多。 |
src/content/concepts/index.md
Outdated
|
|
||
| 然而由于 loader 仅在每个文件的基础上执行转换，而 `插件(plugins)` 更常用于（但不限于）在打包模块的 “compilation” 和 “chunk” 生命周期执行操作和自定义功能[（查看更多）](/concepts/plugins)。webpack 的插件系统[极其强大和可定制化](/api/plugins)。 | ||
| loader 习惯用于转换某些类型的模块，而插件则可以用于执行范围更广的任务。插件的范围包括，从打包优化和压缩，一直到重新定义环境中的变量。[插件接口](/api/plugins)功能极其强大，可以用来处理各种各样的任务。 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.