Merge pull request #672 from kalcifer/proselint-fix

bebraw · web-flow · commit 71feaa8e2ba1 · 2017-01-18T16:06:05.000+02:00
Fix: Enable proselint and jslint for PRs.
diff --git a/.proselintrc b/.proselintrc
@@ -1,9 +1,8 @@
 {
     "max_errors": 1000,
     "checks": {
-				"phrasal_adjectives.ly"  				: false,
-				"preferred_form"								: false,
-				"symbols.curly_quotes"					: false,
+        "phrasal_adjectives.ly"         : false,
+        "preferred_forms"               : false,
         "airlinese.misc"                : true,
         "annotations.misc"              : false,
         "archaism.misc"                 : true,
@@ -18,7 +17,7 @@
         "dates_times.am_pm"             : true,
         "dates_times.dates"             : true,
         "hedging.misc"                  : true,
-        "hyperbole.misc"                : true,
+        "hyperbole.misc"                : false,
         "jargon.misc"                   : true,
         "lexical_illusions.misc"        : true,
         "links.broken"                  : false,
@@ -42,8 +41,8 @@
         "misc.metadiscourse"            : true,
         "misc.narcissism"               : true,
         "misc.not_guilty"               : true,
-        "misc.phrasal_adjectives"       : true,
-        "misc.preferred_forms"          : true,
+        "misc.phrasal_adjectives"       : false,
+        "misc.preferred_forms"          : false,
         "misc.pretension"               : true,
         "misc.professions"              : true,
         "misc.punctuation"              : true,
@@ -76,8 +75,8 @@
         "terms.eponymous_adjectives"    : true,
         "terms.venery"                  : true,
         "typography.diacritical_marks"  : true,
-        "typography.exclamation"        : true,
-        "typography.symbols"            : true,
+        "typography.exclamation"        : false,
+        "typography.symbols"            : false,
         "uncomparables.misc"            : true,
         "weasel_words.misc"             : true,
         "weasel_words.very"             : true
diff --git a/content/concepts/configuration.md b/content/concepts/configuration.md
@@ -21,7 +21,7 @@ Use these features when appropriate.
 
 * Access CLI arguments, when using the webpack CLI (instead write your own CLI, or use `--env`)
 * Export non-deterministic values (calling webpack twice should result in the same output files)
-* Write very long configurations (instead split the configuration into multiple files)
+* Write long configurations (instead split the configuration into multiple files)
 
 The following examples below describe how webpack's configuration object can be both expressive and configurable because _it is code_:
 
diff --git a/content/concepts/entry-points.md b/content/concepts/entry-points.md
@@ -52,7 +52,7 @@ const config = {
 
 The object syntax is more verbose. However, this is the most scalable way of defining entry/entries in your application.
 
-T> **"Scalable webpack configurations"** are ones that can be reused and combined with other partial configurations. This is a popular technique used to separate concerns by environment, build target and runtime. They are then merged together using specialized tools like [webpack-merge](https://github.com/survivejs/webpack-merge).
+T> **"Scalable webpack configurations"** are ones that can be reused and combined with other partial configurations. This is a popular technique used to separate concerns by environment, build target and runtime. They are then merged using specialized tools like [webpack-merge](https://github.com/survivejs/webpack-merge).
 
 ## Scenarios
 
diff --git a/content/configuration/dev-server.md b/content/configuration/dev-server.md
@@ -266,7 +266,7 @@ port: 8080
 
 Proxying some URLs can be useful when you have a separate API backend development server and you want to send API requests on the same domain.
 
-The dev-server makes use of the very powerful [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) package. Checkout its [documentation](https://github.com/chimurai/http-proxy-middleware#options) for more advanced usages.
+The dev-server makes use of the powerful [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) package. Checkout its [documentation](https://github.com/chimurai/http-proxy-middleware#options) for more advanced usages.
 
 With a backend on `localhost:3000`, you can use this to enable proxying:
 
diff --git a/content/configuration/devtool.md b/content/configuration/devtool.md
@@ -26,13 +26,13 @@ Choose a style of [source mapping](http://blog.teamtreehouse.com/introduction-so
  source-map                   | --    | --      | yes        | original source
  nosources-source-map         | --    | --      | yes        | without source content
 
-Some of these values are suited for development and some for production. For development you typically want very fast Source Maps at the cost of bundle size, but for production you want separate Source Maps that are accurate.
+Some of these values are suited for development and some for production. For development you typically want fast Source Maps at the cost of bundle size, but for production you want separate Source Maps that are accurate.
 
 W> There are some issues with Source Maps in Chrome. [We need your help!](https://github.com/webpack/webpack/issues/3165).
 
 ### For development
 
-`eval` - Each module is executed with `eval()` and `//@ sourceURL`. This is very fast. The main disadvantage is that it doesn't display line numbers correctly since it gets mapped to transpiled code instead of the original code.
+`eval` - Each module is executed with `eval()` and `//@ sourceURL`. This is pretty fast. The main disadvantage is that it doesn't display line numbers correctly since it gets mapped to transpiled code instead of the original code.
 
 `inline-source-map` - A SourceMap is added as DataUrl to the bundle.
 
diff --git a/content/configuration/output.md b/content/configuration/output.md
@@ -191,7 +191,7 @@ Only used when [`target`](/configuration/target) is web, which uses JSONP for lo
 
 A JSONP function name used to asynchronously load chunks or join multiple initial chunks (CommonsChunkPlugin, AggressiveSplittingPlugin).
 
-It's required to change it if multiple webpack runtimes (from different compilation) are used on the same page.
+This needs to be changed if multiple webpack runtimes (from different compilation) are used on the same webpage.
 
 If using the [`output.library`](#output-library) option, the library name is automatically appended.
 
diff --git a/content/get-started/index.md b/content/get-started/index.md
@@ -118,7 +118,7 @@ You should see a page with the following text: 'Hello webpack'.
 
 ## Using webpack with a config
 
-For more complex configuration, we can use a configuration file that webpack can reference to bundle your code.  After you create a `webpack.config.js` file, represent the CLI command above
+For more complex configuration, we can use a configuration file that webpack can reference to bundle your code. After you create a `webpack.config.js` file, represent the CLI command above
 with the following config settings -
 
 __webpack.config.js__
diff --git a/content/get-started/install-webpack.md b/content/get-started/install-webpack.md
@@ -10,7 +10,7 @@ sort: 1
 
 Before getting started, make sure you have a fresh version of [Node.js](https://nodejs.org/en/) installed. The current LTS is an ideal starting point. You may run into a variety of issues with the older versions as they may be missing functionality webpack or related packages might need.
 
-Note that this documentation is for webpack 2, for which there is not yet a stable release.  You can get the most recent beta by installing with the `beta` tag (see below).
+Note that this documentation is for webpack 2, for which there is not yet a stable release. You can get the most recent beta by installing with the `beta` tag (see below).
 
 ### Global Installation
 
diff --git a/content/guides/code-splitting-require.md b/content/guides/code-splitting-require.md
@@ -24,7 +24,7 @@ This is an array of strings where we can declare all the modules that need to be
 This is the callback function that webpack will execute once the dependencies are loaded. An implementation of the require object is sent as a parameter to this function. This is so that, we can further `require()` the dependencies and any other modules for execution.
 
 #### chunkName
-The chunkName is the name given to the chunk created by this particular `require.ensure()`. By giving the same name at various different split points of `require.ensure()`, we can make sure all the dependencies are collectively put in the same bundle.
+The chunkName is the name given to the chunk created by this particular `require.ensure()`. By giving the same name at different split points of `require.ensure()`, we can make sure all the dependencies are collectively put in the same bundle.
 
 Let us consider the following project
 
diff --git a/content/guides/code-splitting.md b/content/guides/code-splitting.md
@@ -14,7 +14,7 @@ There are mainly two kinds of code splitting that can be accomplished with webpa
 
 ### Vendor code splitting
 
-A typical application can depend on many third party libraries for framework/functionality needs. Unlike application code, code present in these libraries does not change very often. 
+A typical application can depend on many third party libraries for framework/functionality needs. Unlike application code, code present in these libraries does not change often.
 
 If we keep code from these libraries in its own bundle, separate from the application code, we can leverage the browser's caching mechanism to cache these files for longer durations on the end user's machine. 
 
diff --git a/content/guides/migrating.md b/content/guides/migrating.md
@@ -324,7 +324,7 @@ See [CLI](/api/cli).
 
 These functions are now always asynchronous instead of calling their callback sync if the chunk is already loaded.
 
-**nb `require.ensure` now depends upon native `Promise`s.  If using `require.ensure` in an environment that lacks them then you will need a polyfill. **
+**nb `require.ensure` now depends upon native `Promise`s. If using `require.ensure` in an environment that lacks them then you will need a polyfill. **
 
 ## Loader configuration is through `options`
 
diff --git a/content/guides/public-path.md b/content/guides/public-path.md
@@ -5,7 +5,7 @@ contributors:
   - rafaelrinaldi
 ---
 
-Webpack has a very useful configuration that let you specify the base path for
+Webpack has a highly useful configuration that let you specify the base path for
 all the assets on your application. It's called `publicPath`.
 
 ## Use cases
diff --git a/content/guides/shimming.md b/content/guides/shimming.md
@@ -83,7 +83,7 @@ module.exports = {
     rules: [{
       test: require.resolve("some-module"), 
       use: 'exports-loader?file,parse=helpers.parse'
-      // adds below code the the file's source:
+      // adds below code the file's source:
       //  exports["file"] = file;
       //  exports["parse"] = helpers.parse;
     }]
diff --git a/content/plugins/define-plugin.md b/content/plugins/define-plugin.md
@@ -6,7 +6,7 @@ title: define-plugin
 new webpack.DefinePlugin(definitions)
 ```
 
-The `DefinePlugin` allows you to create global constants which can be configured at **compile** time. This can be very useful for allowing different behaviour between development builds and release builds. For example, you might use a global constant to determine whether logging takes place; perhaps you perform logging in your development build but not in the release build. That's the sort of scenario the `DefinePlugin` facilitates.
+The `DefinePlugin` allows you to create global constants which can be configured at **compile** time. This can be useful for allowing different behaviour between development builds and release builds. For example, you might use a global constant to determine whether logging takes place; perhaps you perform logging in your development build but not in the release build. That's the sort of scenario the `DefinePlugin` facilitates.
 
 **Example:**
 
diff --git a/content/pluginsapi/compiler.md b/content/pluginsapi/compiler.md
@@ -7,7 +7,7 @@ The `Compiler` module of webpack is the main engine that creates a compilation i
 
 It is exported by `webpack` api under `webpack.Compiler`.
 
-The compiler is used by webpack by instantiating it and then calling the `run` method. Below is a trivial example of how one might use the `Compiler`. In fact, this is very close to how webpack itself uses it.
+The compiler is used by webpack by instantiating it and then calling the `run` method. Below is a trivial example of how one might use the `Compiler`. In fact, this is really close to how webpack itself uses it.
 
 [__compiler-example__](https://github.com/pksjce/webpack-internal-examples/blob/master/compiler-example.js)
 
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "lint:md": "eslint . --ext .md",
     "lint:markdown": "markdownlint --config ./.markdownlintrc **/*.md *.md ./content/**/*.md",
     "lint:social": "alex ./**/*.md",
-    "lint:prose": "ncp .proselintrc ~/ && proselint",
+    "lint:prose": "cp .proselintrc ~/ && proselint content",
     "test": "npm run lint ",
     "sitemap": "cd build && sitemap-static --prefix=https://webpack.js.org/ > sitemap.xml"
   },
@@ -76,6 +76,7 @@
     "mkdirp": "^0.5.1",
     "modularscale-sass": "^2.1.1",
     "moment": "^2.15.1",
+    "ncp": "^2.0.0",
     "node-sass": "^3.9.3",
     "npm-run-all": "^3.1.0",
     "postcss-loader": "^0.13.0",
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -6,9 +6,11 @@ SOURCE_BRANCH="master"
 
 # Pull requests and commits to other branches shouldn't try to deploy, just build to verify
 if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
-    echo "Skipping deploy; just doing a build and linting links."
+    echo "Skipping deploy; just doing a build and linting links/prose/js."
     npm run build
     # npm run fetch - Relies on third party files, disabled for now
+    npm run lint:js
+    npm run lint:prose
     npm run lint:links
     exit 0
 fi
