Skip to content
Permalink
Browse files
Merge branch 'master' into bugfix/namespace-object
# Conflicts:
#	lib/RuntimeTemplate.js
  • Loading branch information
sokra committed May 28, 2018
2 parents d4a04b8 + 1f2584e commit 770847171ddf2172bc42a00df01e0a731242adde
Show file tree
Hide file tree
Showing 250 changed files with 3,849 additions and 1,467 deletions.
@@ -1,4 +1,9 @@
<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
<!-- Try to link to an open issue for more information. -->


<!-- In addition to that please answer these questions: -->

**What kind of change does this PR introduce?**

@@ -8,17 +13,11 @@

<!-- Note that we won't merge your changes if you don't add tests -->

**If relevant, link to documentation update:**

<!-- Link PR from webpack/webpack.js.org here, or N/A -->

**Summary**

<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
<!-- Try to link to an open issue for more information. -->

**Does this PR introduce a breaking change?**

<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->

**Other information**
**What needs to be documented once your changes are merged?**

<!-- List all the information that needs to be added to the documentation after merge -->
<!-- When your changes are merged you will be asked to contribute this to the documentation -->
@@ -10,4 +10,5 @@
*.log
.idea
.vscode
.eslintcache
package-lock.json
@@ -0,0 +1,14 @@
# Ignore all paths.
**/*.*

# Enable prettier for the following paths.
!setup/**/*.js
!lib/**/*.js
!bin/*.js
!hot/*.js
!buildin/*.js
!test/*.js
!test/**/webpack.config.js
!examples/**/webpack.config.js
!schemas/**/*.js
!declarations.d.ts
@@ -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:
147 README.md

Large diffs are not rendered by default.

@@ -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
@@ -1,8 +1,16 @@
#!/usr/bin/env node
function runCommand(command, options) {

process.exitCode = 0;

/**
* @param {string} command process to run
* @param {string[]} args commandline arguments
* @returns {Promise<void>} promise
*/
const runCommand = (command, args) => {
const cp = require("child_process");
return new Promise((resolve, reject) => {
const executedCommand = cp.spawn(command, options, {
const executedCommand = cp.spawn(command, args, {
stdio: "inherit",
shell: true
});
@@ -13,69 +21,146 @@ function runCommand(command, options) {

executedCommand.on("exit", code => {
if (code === 0) {