Merge branch 'master' into bugfix/fix-service-worker

Author: chenxsan

.travis.yml

@@ -10,46 +10,12 @@ cache:
     - repositories
 
 stages:
-  - Lint
-  - Test
   - Build
 
 jobs:
   fast_finish: true
 
   include:
-    - stage: Lint
-      name: Lint
-      env: CACHE_TYPE=lint
-      script:
-        - yarn lint:js || travis_terminate 1
-        - yarn lint:markdown || travis_terminate 1
-        - yarn lint:social || travis_terminate 1
-
-    - stage: Lint
-      name: Proselint
-      language: python
-      env: CACHE_TYPE=proselint
-      python: 3.6
-      cache:
-        yarn: false
-        npm: false
-        pip: true
-        directories:
-          - $HOME/.cache
-      install: pip install -r requirements.txt
-      script: cp .proselintrc ~/ && proselint src/content
-
-    - stage: Build
-      name: Build and Test
-      if: branch != master OR type NOT IN (push, cron)
-      env: CACHE_TYPE=build
-      script:
-        # run cypress against production site
-        - yarn cypress:ci || travis_terminate 1
-        # make sure links are not broken
-        - yarn lint:links || travis_terminate 1
-
     - stage: Build
       name: Build and Deploy
       if: branch = master AND type IN (push, cron)

src/content/configuration/watch.md

@@ -70,9 +70,9 @@ module.exports = {
 
 ## `watchOptions.ignored`
 
-`RegExp` [`anymatch`](https://github.com/micromatch/anymatch)
+`RegExp` `string` `[string]`
 
-For some systems, watching many file systems can result in a lot of CPU or memory usage. It is possible to exclude a huge folder like `node_modules`:
+For some systems, watching many files can result in a lot of CPU or memory usage. It is possible to exclude a huge folder like `node_modules` using a regular expression:
 
 __webpack.config.js__
 
@@ -85,7 +85,20 @@ module.exports = {
 };
 ```
 
-It is also possible to have and use multiple [anymatch](https://github.com/micromatch/anymatch) patterns:
+Alternatively, a glob pattern may be used:
+
+__webpack.config.js__
+
+```javascript
+module.exports = {
+  //...
+  watchOptions: {
+    ignored: 'node_modules/**'
+  }
+};
+```
+
+It is also possible to use multiple glob patterns:
 
 __webpack.config.js__
 

src/content/guides/typescript.md

@@ -118,6 +118,9 @@ T> To make imports do this by default and keep `import _ from 'lodash';` syntax
 
 We use `ts-loader` in this guide as it makes enabling additional webpack features, such as importing other web assets, a bit easier.
 
+W> `ts-loader` uses `tsc`, the TypeScript compiler, and relies on your `tsconfig.json` configuration. Make sure to avoid setting [`module`](https://www.typescriptlang.org/tsconfig#module) to "CommonJS", or webpack won't be able to [tree-shake your code](/guides/tree-shaking).
+
+Note that if you're already using [`babel-loader`](https://github.com/babel/babel-loader) to transpile your code, you can use [`@babel/preset-typescript`](https://babeljs.io/docs/en/babel-preset-typescript) and let Babel handle both your JavaScript and TypeScript files instead of using an additional loader. Keep in mind that, contrary to `ts-loader`, the underlying [`@babel/plugin-transform-typescript`](https://babeljs.io/docs/en/babel-plugin-transform-typescript) plugin does not perform any type checking.
 
 ## Source Maps