Merge branch 'master' into feature/wasm-mangling

# Conflicts:
#	yarn.lock

.travis.yml

@@ -9,42 +9,56 @@ branches:
 
 cache:
   yarn: true
+  directories:
+    - ".jest-cache"
+    - ".eslintcache"
+
+stages:
+ - basic
+ - advanced
+ - versions
 
 matrix:
   include:
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JOB_PART=lint
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
+      stage: basic
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
-    - os: linux
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
+      stage: advanced
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JOB_PART=unit
-    - os: linux
-      node_js: "6"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: advanced
     - os: osx
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+    - os: linux
+      node_js: "6"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+  fast_finish: true
   allow_failures:
     - os: osx
-  fast_finish: true
 
 install:
   - yarn --frozen-lockfile
   - yarn link --frozen-lockfile || true
   - yarn link webpack --frozen-lockfile
 
-script: npm run travis:$JOB_PART
+script: yarn travis:$JOB_PART
 
 after_success:
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
   - bash <(curl -s https://codecov.io/bash) -F $JOB_PART -X gcov
-  - rm -rf ./coverage
+  - rm -f .jest-cache/haste-map* .jest-cache/perf-cache*
 
 notifications:
   slack:

appveyor.yml

@@ -9,24 +9,28 @@ branches:
 init:
   - git config --global core.autocrlf input
 
+cache:
+  - "..\\.yarn-cache"
+  - ".jest-cache"
+
 # what combinations to test
 environment:
   matrix:
-    - nodejs_version: 8
+    - nodejs_version: 10
       job_part: unit
-    - nodejs_version: 8
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
+    - nodejs_version: 10
       job_part: integration
-      jest: --maxWorkers=2
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
     - nodejs_version: 6
       job_part: integration
-      jest: --maxWorkers=2
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
-  - npm install yarn -g
-  - yarn install --frozen-lockfile
-  - yarn link --frozen-lockfile || yarn link --frozen-lockfile
-  - yarn link webpack --frozen-lockfile
+  - yarn --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
+  - yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache || yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
+  - yarn link webpack --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
 
 build: off
 
@@ -38,5 +42,7 @@ test_script:
   - yarn --version
   - cmd: set JEST=%jest%
   - cmd: yarn appveyor:%job_part%
+  - cmd: yarn istanbul report --report lcovonly
   - cmd: yarn unlink webpack
   - cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
+  - cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null

codecov.yml

@@ -7,6 +7,9 @@ coverage:
   status:
     project:
       default: off
+      basic:
+        flags: basic
+        target: auto
       integration:
         flags: integration
         target: auto
@@ -15,6 +18,10 @@ coverage:
         target: 0%
     patch:
       default: off
+      integration:
+        flags: integration
+        target: 90%
+        base: pr
       integration:
         flags: integration
         target: 90%
@@ -25,10 +32,18 @@ coverage:
         base: pr
     changes:
       default: off
+      basic:
+        flags: basic
+        target: 0%
       integration:
         flags: integration
         target: 0%
       unit:
         flags: unit
         target: 0%
 comment: off
+flags:
+  basic:
+    joined: false
+  unit:
+    joined: false