Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Webpack Defaults 2.x merge #88

Merged
merged 38 commits into from
Mar 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c64d846
refactor: Prettier & CircleCI initial conversion (#86)
joshwiens Dec 15, 2017
ac33c43
fix: Add eslintrc to files array
joshwiens Dec 15, 2017
ca86566
fix: Remove appveyor template from config
joshwiens Dec 15, 2017
3a84802
refactor: Negative testing is overkill for an example
joshwiens Dec 15, 2017
2a4e2c6
chore(release): 2.0.0-alpha.0
joshwiens Dec 15, 2017
8258ad5
fix: incorrect eslint config name
joshwiens Dec 15, 2017
d1bb56e
fix: Update readme template with CircleCI badge
joshwiens Dec 15, 2017
ead2b33
fix: Readme template badge file extension
joshwiens Dec 15, 2017
14ac5ac
feat: Adds commit lint configuration
joshwiens Dec 15, 2017
05d122a
fix: Run coverage in CircleCI
joshwiens Dec 15, 2017
3713134
chore(release): 2.0.0-alpha.1
joshwiens Dec 15, 2017
2896b57
fix: Limit commit linting range
joshwiens Dec 15, 2017
ed5e000
fix: Limit branch validation range
joshwiens Dec 15, 2017
6438a40
chore(release): 2.0.0-alpha.2
joshwiens Dec 15, 2017
f4bcc3e
fix: Do no initialize test example if directory exists
joshwiens Dec 15, 2017
abcb430
chore(release): 2.0.0-beta.0
joshwiens Dec 15, 2017
4aed82b
refactor: Use node naming conventions for versions
joshwiens Dec 15, 2017
f4b3502
chore: Removes unused nodemon devDep
joshwiens Dec 15, 2017
8966c78
fix: Type in package
joshwiens Dec 15, 2017
30a2e3b
feat: Adds codeowners template (#89)
joshwiens Dec 15, 2017
bd2ab29
chore(release): 2.0.0-beta.1
joshwiens Dec 15, 2017
194be38
config: Update codecov template
joshwiens Dec 16, 2017
7ac432a
refactor(templates/README): standardize (#50)
michael-ciniawsky Dec 19, 2017
cd1ee48
refactor: Consistent package template generation (#92)
joshwiens Dec 19, 2017
36d7e09
fix: Update demo options property
joshwiens Dec 19, 2017
2737a41
style: Fix template formatting
joshwiens Dec 19, 2017
b23257c
chore(release): 2.0.0-rc.0
joshwiens Dec 19, 2017
8f06faf
ci(travis): Arange validations to minimize container usage
joshwiens Dec 20, 2017
fcb49e2
fix(templates): Fix test generation condition
joshwiens Dec 20, 2017
008ff45
chore(release): 2.0.0-rc.1
joshwiens Dec 20, 2017
e0bad7c
fix(templates): Generate cache from lock file
joshwiens Dec 20, 2017
14a9cb9
chore(release): 2.0.0-rc.2
joshwiens Dec 20, 2017
79f71f2
fix: Set correct script on post-install
joshwiens Dec 21, 2017
763b7a5
chore: Update npm script name
joshwiens Dec 21, 2017
17d0eed
chore(release): 2.0.0-rc.3
joshwiens Dec 21, 2017
214b4e5
fix: Post install set script incorrect
joshwiens Dec 22, 2017
f05533b
feat: Adds vscode Jest debug configuration
joshwiens Dec 22, 2017
0d4b3ab
chore(release): 2.0.0-rc.4
joshwiens Dec 22, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,17 @@
{
"useBuiltIns": true,
"targets": {
"node": "4.3"
"node": "6.9.0"
},
"exclude": [
"transform-async-to-generator",
"transform-regenerator"
]
"exclude": ["transform-async-to-generator", "transform-regenerator"]
}
]
],
"plugins": [
["transform-object-rest-spread", { "useBuiltIns": true }]
],
"plugins": [["transform-object-rest-spread", { "useBuiltIns": true }]],
"env": {
"test": {
"presets": [
"env"
],
"plugins": [
"transform-object-rest-spread"
]
"presets": ["env"],
"plugins": ["transform-object-rest-spread"]
}
}
}
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/node_modules
/dist
/dist
/templates/test/*
/templates/src/*
3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
root: true,
plugins: ['prettier'],
extends: ['@webpack-contrib/eslint-config-webpack'],
rules: {
'prettier/prettier': [
'error',
{ singleQuote: true, trailingComma: 'es5', arrowParens: 'always' },
],
},
};
7 changes: 7 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# These are the default owners for everything in
# webpack-contrib
@webpack-contrib/org-maintainers

# Add repository specific users / groups
# below here for libs that are not maintained by the org.
@sapegin
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ npm-debug.log*
.DS_Store
Thumbs.db
.idea
.vscode
*.sublime-project
*.sublime-workspace
137 changes: 137 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,143 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="2.0.0-rc.4"></a>
# [2.0.0-rc.4](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-rc.3...v2.0.0-rc.4) (2017-12-22)


### Bug Fixes

* Post install set script incorrect ([214b4e5](https://github.com/webpack-contrib/webpack-defaults/commit/214b4e5))


### Features

* Adds vscode Jest debug configuration ([f05533b](https://github.com/webpack-contrib/webpack-defaults/commit/f05533b))



<a name="2.0.0-rc.3"></a>
# [2.0.0-rc.3](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-rc.2...v2.0.0-rc.3) (2017-12-21)


### Bug Fixes

* Set correct script on post-install ([79f71f2](https://github.com/webpack-contrib/webpack-defaults/commit/79f71f2))



<a name="2.0.0-rc.2"></a>
# [2.0.0-rc.2](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2017-12-20)


### Bug Fixes

* **templates:** Generate cache from lock file ([e0bad7c](https://github.com/webpack-contrib/webpack-defaults/commit/e0bad7c))



<a name="2.0.0-rc.1"></a>
# [2.0.0-rc.1](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2017-12-20)


### Bug Fixes

* **templates:** Fix test generation condition ([fcb49e2](https://github.com/webpack-contrib/webpack-defaults/commit/fcb49e2))



<a name="2.0.0-rc.0"></a>
# [2.0.0-rc.0](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-beta.1...v2.0.0-rc.0) (2017-12-19)


### Bug Fixes

* Update demo options property ([36d7e09](https://github.com/webpack-contrib/webpack-defaults/commit/36d7e09))



<a name="2.0.0-beta.1"></a>
# [2.0.0-beta.1](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-beta.0...v2.0.0-beta.1) (2017-12-15)


### Bug Fixes

* Type in package ([8966c78](https://github.com/webpack-contrib/webpack-defaults/commit/8966c78))


### Features

* Adds codeowners template ([#89](https://github.com/webpack-contrib/webpack-defaults/issues/89)) ([30a2e3b](https://github.com/webpack-contrib/webpack-defaults/commit/30a2e3b))



<a name="2.0.0-beta.0"></a>
# [2.0.0-beta.0](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-alpha.2...v2.0.0-beta.0) (2017-12-15)


### Bug Fixes

* Do no initialize test example if directory exists ([f4bcc3e](https://github.com/webpack-contrib/webpack-defaults/commit/f4bcc3e))



<a name="2.0.0-alpha.2"></a>
# [2.0.0-alpha.2](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-alpha.1...v2.0.0-alpha.2) (2017-12-15)


### Bug Fixes

* Limit branch validation range ([ed5e000](https://github.com/webpack-contrib/webpack-defaults/commit/ed5e000))
* Limit commit linting range ([2896b57](https://github.com/webpack-contrib/webpack-defaults/commit/2896b57))



<a name="2.0.0-alpha.1"></a>
# [2.0.0-alpha.1](https://github.com/webpack-contrib/webpack-defaults/compare/v2.0.0-alpha.0...v2.0.0-alpha.1) (2017-12-15)


### Bug Fixes

* incorrect eslint config name ([8258ad5](https://github.com/webpack-contrib/webpack-defaults/commit/8258ad5))
* Readme template badge file extension ([ead2b33](https://github.com/webpack-contrib/webpack-defaults/commit/ead2b33))
* Run coverage in CircleCI ([05d122a](https://github.com/webpack-contrib/webpack-defaults/commit/05d122a))
* Update readme template with CircleCI badge ([d1bb56e](https://github.com/webpack-contrib/webpack-defaults/commit/d1bb56e))


### Features

* Adds commit lint configuration ([14ac5ac](https://github.com/webpack-contrib/webpack-defaults/commit/14ac5ac))



<a name="2.0.0-alpha.0"></a>
# [2.0.0-alpha.0](https://github.com/webpack-contrib/webpack-defaults/compare/v1.6.0...v2.0.0-alpha.0) (2017-12-15)


* refactor: Prettier & CircleCI initial conversion (#86) ([c64d846](https://github.com/webpack-contrib/webpack-defaults/commit/c64d846)), closes [#86](https://github.com/webpack-contrib/webpack-defaults/issues/86)


### Bug Fixes

* Add eslintrc to files array ([ac33c43](https://github.com/webpack-contrib/webpack-defaults/commit/ac33c43))
* Remove appveyor template from config ([ca86566](https://github.com/webpack-contrib/webpack-defaults/commit/ca86566))


### Features

* **tasks:** add `codecov.yml` ([#77](https://github.com/webpack-contrib/webpack-defaults/issues/77)) ([66e266b](https://github.com/webpack-contrib/webpack-defaults/commit/66e266b))


### BREAKING CHANGES

* Drops support for NodeJS 4.x
* Implements Prettier & modifies suported Eslint configuration that transfers applicable rule responsibility to Prettier
* Drops TravisCI in favor of CircleCI 2.0
* Drops support for Webpack 2.x
* Enforces existing commit message format in pre-commit as it's required for release automation



<a name="1.6.0"></a>
# [1.6.0](https://github.com/webpack-contrib/webpack-defaults/compare/v1.5.1...v1.6.0) (2017-09-30)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ npm install --save-dev webpack-defaults
This will write a npm script you can run through

```bash
npm run webpack-defaults
npm run defaults
```

Any time you want to sync your project with the defaults, update this dependency and run the command again.
Expand Down
9 changes: 5 additions & 4 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
"editorconfig",
"babel",
"eslint",
"appveyor",
"package",
"codecov"
],
"webpackVersion": "latest",
"minNode": "4.8",
"latestNodeLTS": "6",
"latestNode": "8"
"maintWebpack": "3.0.0",
"activeWebpack": "4.0.0",
"maintLTS": "6.9.0",
"activeLTS": "8.9.0",
"current": "9"
}
4 changes: 2 additions & 2 deletions lib/post_install.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const fs = require('fs');
const path = require('path');
const json = require('mrm-core').json;

const defaultsName = 'webpack-defaults';
const defaultsName = 'defaults';
const distDirectory = 'dist';
const localDir = process.cwd().split('node_modules').shift();

Expand All @@ -19,7 +19,7 @@ function writeScript() {
const scriptPath = ['scripts', defaultsName];
if (!pkg.get(scriptPath)) {
pkg
.set(scriptPath, defaultsName)
.set(scriptPath, 'webpack-defaults')
.save();
}
}
Expand Down
Loading