Skip to content

Commit

Permalink
v1.5.0. Fix #3.
Browse files Browse the repository at this point in the history
v1.5.0 2018 January 24

- Use awesome-travis commit instead of master
    - Closes [issue #3](#3)
- Fix `coffee-script` dep (when needed) always being moved to devDeps
    - Closes [issue #11](#11)
- Delete legacy `directories` field
    - Closes [issue #9](#9)
- Don't fail when using a SSH git remote
- Support Auth Tokens for NPM instead of the Email, Username, and Password combination
- Updated supported node versions for travis
- Output travis environment variables
- Updated base files
  • Loading branch information
balupton committed Jan 24, 2018
1 parent 46d5c7a commit 7ccc213
Show file tree
Hide file tree
Showing 9 changed files with 155 additions and 92 deletions.
14 changes: 7 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 2017 March 3
# 2017 August 2
# https://github.com/bevry/base

root = true
Expand All @@ -10,14 +10,14 @@ trim_trailing_whitespace = true
insert_final_newline = false
indent_style = tab

[*.json]
indent_style = space
indent_size = 2
[{*.mk,*.py}]
indent_style = tab
indent_size = 4

[*.yml]
[*.md]
indent_style = space
indent_size = 2
indent_size = 4

[*.md]
[{*.json,*.yml,*.bowerrc,*.babelrc}]
indent_style = space
indent_size = 2
11 changes: 3 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 2017 February 22
// 2017 April 17
// https://github.com/bevry/base
// http://eslint.org
// This code must be able to run on Node 0.10
Expand Down Expand Up @@ -815,7 +815,6 @@ const config = {
// Plugins

// Not sure why, but okay
'babel/no-await-in-loop': WARN,
'flow-vars/define-flow-type': WARN,
'flow-vars/use-flow-type': WARN
}
Expand Down Expand Up @@ -847,7 +846,7 @@ if ( data.editions ) {
break
}
}
config.parserOptions.ecmaFeatures.sourceType = sourceEdition.syntaxes.indexOf('import') !== -1 ? 'module' : 'script'
config.parserOptions.sourceType = sourceEdition.syntaxes.indexOf('import') !== -1 ? 'module' : 'script'
config.parserOptions.ecmaFeatures.jsx = sourceEdition.syntaxes.indexOf('jsx') !== -1
}
else {
Expand Down Expand Up @@ -888,12 +887,8 @@ if ( devDeps.indexOf('eslint-plugin-babel') !== -1 ) {
// Remove rules that babel rules replace
config.plugins.push('babel')
const replacements = [
'array-bracket-spacing',
'new-cap',
'object-curly-spacing',
'arrow-parens',
'generator-star-spacing',
'object-shorthand'
'object-curly-spacing'
]
replacements.forEach(function (key) {
if ( rules.indexOf(key) !== -1 ) {
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# 2017 January 27
# 2017 April 12
# https://github.com/bevry/base

# System Files
**/.DS_Store

# Temp Files
yarn.lock
**/.docpad.db
Expand All @@ -25,6 +28,7 @@ docs/

# Editor Caches
.c9/
.vscode/

# Private Files
.env
Expand Down
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 2016 October 17
# 2017 April 3
# https://github.com/bevry/base

# Temp Files
Expand All @@ -9,6 +9,10 @@ yarn.lock
**/*.cpuprofile
**/*.heapsnapshot

# Editor Files
.c9/
.vscode/

# Build Files
build/
components/
Expand Down
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@ sudo: false
language: node_js
node_js:
- '8'
- '9'
matrix:
fast_finish: true
allow_failures:
- node_js: '9'
cache:
directories:
- "$HOME/.npm"
- "$HOME/.yarn-cache"
install:
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/master/scripts/node-install.bash)"
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/0f51e553b3cbf235cd15e2b80951212b5682036d/scripts/node-install.bash)"
before_script:
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/master/scripts/node-verify.bash)"
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/0f51e553b3cbf235cd15e2b80951212b5682036d/scripts/node-verify.bash)"
after_success:
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/master/scripts/node-publish.bash)"
- eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/0f51e553b3cbf235cd15e2b80951212b5682036d/scripts/node-publish.bash)"
notifications:
slack:
secure: lg3fXMql4yUPxF+uTW8Uf5RwnbAnI0Lz/VkviLfAy9izmKnskG79aoW+Fu2ckj+ZDWRImAJtE4MScf4nCDs0r4vT4XfV6rTMSwreajU6Zl2UF+2QoIq2yud0zZ9tqY1nsXKGPXsWpLixasozA1fiAnXA0W71/VlCizTH97UpVpRB81EcwUQDcBBOYs5TOm6Rmt9HzGWHXVMJ58YDcsvodlXSEw2CUM9APmPXQz5xCrBKJrBEdFbFDN5R6qmjcFm9n73zpUIaXl84tX5/I480DsZknVx0zhkYiThjIVTEIgcJ9HwSAYVHvm/VVChLJmHedpK56IADDjfH5O4gqsBIxpckIWml181miXwttS/Ed6EgxNpaTUpoNE9YvASRtdacHkoOnWz+4XSQvWY3XkLkS8Y6sOdIMDf/S+7FGSd63Pxngh+5kknNJxtx0qWk+YR/xaP7TKMBwTyzKg0S1S0kpIMcsxCbbADzpGzlyb9thzrgCwzNVV2u/aWC/YAs2NayqIwn7CML/BgmlMQf7sq1piCwlRPpPYdDp6t+Gt1RhxMcn/pY7YXEbItg6YqIAdBjDY9W13mKx/iVuN91t9402+6c3Mbg5yMUm0RNrvsdNIg2jHQpe+Ha6Zj/Ha0oqFElnoAsa91L+cRWY4M7/ZkwLICZM0OltloNZ3ygGPMbI3k=
secure: nxk20vZLdV7iHrqQH3AuTBjHgeOZXkcjXYUUrbXl2iNLQv9zItKufYCV6EbKhZAgZ3sbXsJd+IfI0JinW3wKb/XcW0c0hMzouQYtwrseCrYjQECiZoQGPwtQ3PN56BrGL5B5jGOa6SAkEf1HT5rZEW++pRRxCbXmjTdojhVIyKgEAxKT4Nq6ylJj1EuiKWeElH6LEWincuDWqG7JFup4FRrpeTYptFsznFGixUUgHLaNdhfcbskXfCDdTO7pFLpiCE3WMpxGIr7Jt/MMuB9wkZ9yJBnI6Soci7lmHYXtL2e/SL10Y5/zdhzv/UJNKU81J1tk8ZUiPbaM2CT8V6g1X2+cy5TsaRsy949w1aQM0kqBxbH5+oeW9ur8zcFP0eLVfCqxbBOMmyug8VEjAZudQ7veZO9zqB1iXBA2XPMAIdX3RI1VgDyLVzIU5qiFnp+0QHmIH46C3088zuGjj/GXoz5d6Kjht9t/4wUlLlVbXp5DfZkNOv/KMmlKDleYEQXVBP+FD2CPlTilaFiXJ3BiL+0OTqotAoBimxDPqoSMSwCeTkUgcGZFnI3LbgZz80XhqTFJELhPdLc/CYizzAG/FTWuUR1M8SdMH6OxOtHQYdI5fWhNYaQhri1Pxx3SqlF/pRKwOBa0JNnqNgKqe8c2K/eC2tHkdPWvjhdV6RvM+iU=
email:
recipients:
secure: lh02wY+JpP3UbRll8+DMmv7+w0Fb9MsYI4X1R+Wcs7bCJl5v6gIihuu7SDsgaG5S6+oJCqCOBasmkZHTlfC8aXnANrEmpzFEympIKgLtW4/+EXzNX75YIRTLOvuKTlToP4YsuIMfm44a39t+3hpg/QtQEyBpQmbVAxXe9UTgVe4MrSmopTBbvC90SJpNoTF6piejQ+6QbB+1rJ5aX0yyWUYrO6skKkar/uweQEkYZ0kBA+wfLh2t4vawM092/5wx85wuusUGqDEXiZh8CGJgP9wcUejyXBVX44sG4LoQ3ZJ0u/jekZYXIm0BXNJfpP1jXx6xVERNNYxHj3Oq6a6dMkhEWSyt7Kug157LO7RF5i6oa3f+ANh47OdB14wEr8WgmPq34NGgXYNIg/y6QB1ByWEqx5UZebU+0njwjxYFo6Bz18n5cVowEkAzjGmv22Lm+uieCLo1Yqkdsu15+zmkadoK4dNJtyQneHBu2+manb8ZRP731stYStpF1DAfvjYnJt6mq8ycbw5S1Uv0yRomUSXNf+hea3vkJ8SnbobtvXJZavGA/gygOhQfwUchBY0kUWoN8eBYCzCzMrkRLmk8owMoLVlQUb+D9ltaUABIqCG5fjpOqzDFqlb9xc5ktSOVf90qdLchhpoBLypxU7/IjpD6XbTEA7M+T0vXWlKsgpc=
secure: dz/0n4TvXWY/2Kh0CMyI6NCub6L5dIB6KZmyz0xrMLLHEGHma7rWcoUeoGF1q2XzSR4jQYrR57+CED7OX573GNDVXcf8PcplIk/bdxbzolL18knLan2LP4E4v3KzSdFfQ0ctSEdUWSpVOoDAPYvHWN1iiCAfW7VLyjiFVJ72ngfuJUN45K3cjKG7VwVnjjZO2h1fpPJBbb/XVJmkNfcBo61a6tZFW+CP2hU4IsWG8ulwJ9G0vrbYX6Oi64m7O1rk52BApcbcfqN+qsNUQcjj3Etk+Ww2nY+JEhEV2rmm75q0f6Y+5PH+JkGFlKhRNTfnKNKwMqCSgjj7BGVKs82KyJnf3kmrQNJeJ1dn+yzPDdDwq81zVNcz5A3LyCW657V0NkYH4e2QW065NHz4ezmHtyyfRpykp/CDUtBNpMkk+l01kvlYYbdZEdmhWP+DpAlZMn7p1lGmTu+6cGTTkpyobLeUlbUsDBCpaE5FHQ1ixJvV0pTFZGQiezguhOWjfGqPbHWuhJuJ4UFWKK60us0YRRlDuRjjvliI6+BOIaqzFhMPUjIxTnY+heDDYzODNpXpRtZ6TBjLuvM9DAJMuK4klGG/RjsGWZOUvzqxhumk1GI2tRFhOWDZbrikLJrW6cJXL0TbVLidlNIQzRF4QuYuCPh7/PQpml3UKzzn6BSIkKk=
82 changes: 41 additions & 41 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
2017 January 27
2017 August 25
https://github.com/bevry/base
-->

Expand All @@ -12,7 +12,7 @@ We offer support through our [Official Support Channels](https://bevry.me/suppor

## Contribute

Our [Contributing Guide](https://learn.bevry.me/community/contribute) contains useful tips and suggestions for how to contribute to this project, it's worth the read.
Our [Contributing Guide](https://bevry.me/contribute) contains useful tips and suggestions for how to contribute to this project, it's worth the read.


## Development
Expand All @@ -25,24 +25,24 @@ Our [Contributing Guide](https://learn.bevry.me/community/contribute) contains u

1. Setup the project for development

``` bash
npm run our:setup
```
``` bash
npm run our:setup
```


### Developing

1. Compile changes

``` bash
npm run our:compile
```
``` bash
npm run our:compile
```

1. Run tests

``` bash
npm test
```
``` bash
npm test
```


### Publishing
Expand All @@ -53,31 +53,31 @@ Follow these steps in order to implement your changes/improvements into your des
#### Preparation

1. Make sure your changes are on their own branch that is branched off from master.
1. You can do this by: `git checkout master; git checkout -b your-new-branch`
1. And push the changes up by: `git push origin your-new-branch`
1. You can do this by: `git checkout master; git checkout -b your-new-branch`
1. And push the changes up by: `git push origin your-new-branch`

1. Ensure all tests pass:

``` bash
npm test
```
``` bash
npm test
```

> If possible, add tests for your change, if you don't know how, mention this in your pull request
> If possible, add tests for your change, if you don't know how, mention this in your pull request

1. Ensure the project is ready for publishing:

```
npm run our:release:prepare
```
```
npm run our:release:prepare
```


#### Pull Request

To send your changes for the project owner to merge in:

1. Submit your pull request
1. When submitting, if the original project has a `dev` or `integrate` branch, use that as the target branch for your pull request instead of the default `master`
1. By submitting a pull request you agree for your changes to have the same license as the original plugin
1. When submitting, if the original project has a `dev` or `integrate` branch, use that as the target branch for your pull request instead of the default `master`
1. By submitting a pull request you agree for your changes to have the same license as the original plugin


#### Publish
Expand All @@ -86,39 +86,39 @@ To publish your changes as the project owner:

1. Switch to the master branch:

``` bash
git checkout master
```
``` bash
git checkout master
```

1. Merge in the changes of the feature branch (if applicable)

1. Increment the version number in the `package.json` file according to the [semantic versioning](http://semver.org) standard, that is:
1. `x.0.0` MAJOR version when you make incompatible API changes (note: DocPad plugins must use v2 as the major version, as v2 corresponds to the current DocPad v6.x releases)
1. `x.y.0` MINOR version when you add functionality in a backwards-compatible manner
1. `x.y.z` PATCH version when you make backwards-compatible bug fixes
1. `x.0.0` MAJOR version when you make incompatible API changes (note: DocPad plugins must use v2 as the major version, as v2 corresponds to the current DocPad v6.x releases)
1. `x.y.0` MINOR version when you add functionality in a backwards-compatible manner
1. `x.y.z` PATCH version when you make backwards-compatible bug fixes

1. Add an entry to the changelog following the format of the previous entries, an example of this is:

``` markdown
## v6.29.0 2013 April 1
- Progress on [issue #474](https://github.com/bevry/docpad/issues/474)
- DocPad will now set permissions based on the process's ability
- Thanks to [Avi Deitcher](https://github.com/deitch), [Stephan Lough](https://github.com/stephanlough) for [issue #165](https://github.com/bevry/docpad/issues/165)
- Updated dependencies
```
``` markdown
## v6.29.0 2013 April 1
- Progress on [issue #474](https://github.com/bevry/docpad/issues/474)
- DocPad will now set permissions based on the process's ability
- Thanks to [Avi Deitcher](https://github.com/deitch), [Stephan Lough](https://github.com/stephanlough) for [issue #165](https://github.com/bevry/docpad/issues/165)
- Updated dependencies
```
1. Commit the changes with the commit title set to something like `v6.29.0. Bugfix. Improvement.` and commit description set to the changelog entry
1. Ensure the project is ready for publishing:
```
npm run our:release:prepare
```
```
npm run our:release:prepare
```
1. Prepare the release and publish it to npm and git:
``` bash
npm run our:release
```
``` bash
npm run our:release
```
19 changes: 16 additions & 3 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
# History

## v1.5.0 2018 January 24
- Use awesome-travis commit instead of master
- Closes [issue #3](https://github.com/bevry/based/issues/3)
- Fix `coffee-script` dep (when needed) always being moved to devDeps
- Closes [issue #11](https://github.com/bevry/based/issues/11)
- Delete legacy `directories` field
- Closes [issue #9](https://github.com/bevry/based/issues/9)
- Don't fail when using a SSH git remote
- Support Auth Tokens for NPM instead of the Email, Username, and Password combination
- Updated supported node versions for travis
- Output travis environment variables
- Updated base files

## v1.4.4 2017 May 12
- Convert edition v1.0 standard to edition v1.1+
- Closes [issue #12](https://github.com/bevry/based/issues/12)
- Closes [issue #12](https://github.com/bevry/based/issues/12)

## v1.4.3 2017 April 16
- Delete old `nakeConfiguration` property
- Closes [issue #8](https://github.com/bevry/based/issues/8)
- Closes [issue #8](https://github.com/bevry/based/issues/8)

## v1.4.2 2017 April 16
- Fixed busted `docs` npm script due to typo
Expand All @@ -16,7 +29,7 @@

## v1.4.0 2017 April 1
- Update history file standard
- Closes [issue #4](https://github.com/bevry/based/issues/4)
- Closes [issue #4](https://github.com/bevry/based/issues/4)
- Fixed `mkdir: source: File exists` regression from v1.3.0

## v1.3.1 2017 April 1
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bevry-base",
"version": "1.4.4",
"version": "1.5.0",
"description": "Automatic application of the Bevry base files /bevry/base",
"homepage": "https://github.com/bevry/based",
"license": "MIT",
Expand Down
Loading

0 comments on commit 7ccc213

Please sign in to comment.