Skip to content

Commit

Permalink
build(defaults): v0.4.5...1.6.0 (webpack#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-ciniawsky authored Oct 28, 2017
1 parent 9f01816 commit b382374
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 4,478 deletions.
33 changes: 8 additions & 25 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
{
"presets": [
"webpack",
"jest",
[
"env",
{
"modules": false,
"useBuiltIns": true,
"targets": {
"node": 4.3
"node": "4.8"
},
"exclude": [
"transform-async-to-generator",
"transform-regenerator"
]
}
],
]
],
"plugins": [
[
"env",
"transform-object-rest-spread",
{
"useBuiltIns": true,
"targets": {
"node": 4.3
},
"exclude": [
"transform-async-to-generator",
"transform-regenerator"
]
"useBuiltIns": true
}
]
],
"ignore": [],
"env": {
"test": {
"presets": [
Expand All @@ -40,13 +31,5 @@
"transform-object-rest-spread"
]
}
},
"plugins": [
[
"transform-object-rest-spread",
{
"useBuiltIns": true
}
]
]
}
}
}
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
yarn.lock -diff
* text=auto
bin/* eol=lf

package-lock.json -diff
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<!--
1. Check the version of package you are using. If it's not the newest version, update and try again (see changelog while updating!).
2. If the issue is still there, write a minimal project showing the problem and expected output.
3. Link to the project and mention Node version and OS in your report.
**IMPORTANT! You should use [Stack Overflow](https://stackoverflow.com/) for support related questions.**
-->
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
46 changes: 31 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,48 @@
sudo: false
dist: trusty
language: node_js
branches:
only:
- master
matrix:
jobs:
fast_finish: true
allow_failures:
- env: WEBPACK_VERSION=canary
include:
- os: linux
node_js: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
- os: linux
node_js: '4.3'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '6'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
- &test-latest
stage: Webpack latest
node_js: 6
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 4.8
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=lint
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=coverage
script: npm run travis:$JOB_PART
after_success: 'bash <(curl -s https://codecov.io/bash)'
- stage: Webpack canary
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
script: npm run travis:$JOB_PART
node_js: 8
env: WEBPACK_VERSION=canary JOB_PART=test
before_install:
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
- nvm --version
- node --version
- npm --version
before_script:
- |-
if [ "$WEBPACK_VERSION" ]; then
yarn add webpack@^$WEBPACK_VERSION
npm i --no-save webpack@$WEBPACK_VERSION
fi
script:
- 'yarn run travis:$JOB_PART'
- 'npm run travis:$JOB_PART'
after_success:
- 'bash <(curl -s https://codecov.io/bash)'
29 changes: 29 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
branches:
only:
- master
init:
- git config --global core.autocrlf input
environment:
matrix:
- nodejs_version: '8'
webpack_version: latest
job_part: test
- nodejs_version: '6'
webpack_version: latest
job_part: test
- nodejs_version: '4.8'
webpack_version: latest
job_part: test
build: 'off'
matrix:
fast_finish: true
install:
- ps: Install-Product node $env:nodejs_version x64
- npm i -g npm@latest
- npm install
before_test:
- cmd: npm install webpack@%webpack_version%
test_script:
- node --version
- npm --version
- cmd: npm run appveyor:%job_part%
86 changes: 37 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,51 @@
"dist"
],
"engines": {
"node": ">= 4.3 < 5.0.0 || >= 5.10"
"node": ">= 4.8 < 5.0.0 || >= 5.10"
},
"scripts": {
"start": "yarn run build -- -w",
"prebuild": "yarn run clean",
"build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js'",
"start": "npm run build -- -w",
"prebuild": "npm run clean",
"build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js' --copy-files",
"clean": "del-cli dist",
"lint": "eslint --cache src test",
"lint-staged": "lint-staged",
"security": "nsp check",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage",
"travis:coverage": "yarn run test:coverage",
"travis:lint": "yarn run lint && yarn run security",
"travis:test": "yarn run test",
"webpack-defaults": "webpack-defaults",
"prepublish": "yarn run build",
"release": "yarn run standard-version"
"travis:lint": "npm run lint && npm run security",
"travis:test": "npm run test -- --runInBand",
"travis:coverage": "npm run test:coverage -- --runInBand",
"appveyor:test": "npm run test",
"prepublish": "npm run build",
"release": "standard-version",
"webpack-defaults": "webpack-defaults"
},
"dependencies": {
"ajv": "^5.0.0",
"ajv-keywords": "^2.1.0"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-jest": "^19.0.0",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"babel-polyfill": "^6.23.0",
"babel-preset-env": "^1.4.0",
"babel-preset-webpack": "^1.0.0",
"codecov": "^2.0.1",
"cross-env": "^4.0.0",
"del-cli": "^0.2.1",
"eslint": "^3.19.0",
"eslint-config-webpack": "^1.2.1",
"eslint-plugin-import": "^2.2.0",
"jest": "^19.0.2",
"lint-staged": "^3.4.0",
"nsp": "^2.6.3",
"pre-commit": "^1.2.2",
"babel-cli": "^6.0.0",
"babel-jest": "^21.0.0",
"babel-plugin-transform-object-rest-spread": "^6.0.0",
"babel-polyfill": "^6.0.0",
"babel-preset-env": "^1.0.0",
"cross-env": "^5.0.0",
"del-cli": "^1.0.0",
"eslint": "^4.0.0",
"eslint-config-webpack": "^1.0.0",
"eslint-plugin-import": "^2.0.0",
"jest": "^21.0.0",
"lint-staged": "^4.0.0",
"nsp": "^2.0.0",
"pre-commit": "^1.0.0",
"standard-version": "^4.0.0",
"webpack-defaults": "^0.4.5"
"webpack-defaults": "^1.6.0"
},
"peerDependencies": {
"webpack": "^2.0.0 || ^3.0.0"
},
"pre-commit": "lint-staged",
"lint-staged": {
Expand All @@ -58,34 +60,20 @@
"git add"
]
},
"eslintConfig": {
"extends": "webpack",
"installedESLint": true
},
"keywords": [
"webpack",
"plugin",
"es2015"
"webpack-plugin",
"schema-utils",
"loader"
],
"author": "Webpack Contrib (https://github.com/webpack-contrib)",
"contributors": [
{
"name": "Juho Vepsäläinen <@bebraw>"
},
{
"name": "Joshua Wiens <@d3viant0ne>"
},
{
"name": "Michael Ciniawsky <@michael-ciniawsky>"
}
"Juho Vepsäläinen <@bebraw>",
"Joshua Wiens <@d3viant0ne>",
"Michael Ciniawsky <@michael-ciniawsky>"
],
"repository": {
"type": "git",
"url": "git+https://github.com/webpack-contrib/schema-utils.git"
},
"bugs": {
"url": "https://github.com/webpack-contrib/schema-utils/issues"
},
"repository": "https://github.com/webpack-contrib/schema-utils.git",
"bugs": "https://github.com/webpack-contrib/schema-utils/issues",
"homepage": "https://github.com/webpack-contrib/schema-utils#readme",
"license": "MIT"
}
Loading

0 comments on commit b382374

Please sign in to comment.