Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob-meacham committed Jul 22, 2019
2 parents 9413a18 + e29e6d2 commit 32d1fbc
Show file tree
Hide file tree
Showing 6 changed files with 2,820 additions and 814 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,5 +1,5 @@
language: node_js
node_js:
- '6'
- "10"
script: npm run build
after_success: npm run ci:coverage
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -86,6 +86,7 @@ __deployment__:
```

## Release Notes
* 1.1.0 - Dependency upgrade (thanks [@ericsorensen](https://github.com/ericsorenson))
* 1.0.2 - Update lodash to fix known security issue (thanks [@brownjava](https://github.com/brownjava))
* 1.0.1 - Fix peer dependency
* 1.0.0 - Fix an incompatibility with serverless 1.12
Expand Down
38 changes: 20 additions & 18 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "serverless-plugin-bind-deployment-id",
"version": "1.0.2",
"version": "1.1.0",
"engines": {
"node": ">=4.0"
},
Expand Down Expand Up @@ -39,29 +39,31 @@
"ci:coverage": "nyc report --reporter=text-lcov | coveralls"
},
"dependencies": {
"lodash": "^4.17.10"
"eslint-plugin-import": "^2.18.1",
"eslint-plugin-node": "^9.1.0",
"lodash": "^4.17.15"
},
"devDependencies": {
"ava": "0.17.0",
"babel-cli": "6.18.0",
"babel-core": "6.21.0",
"babel-eslint": "7.1.1",
"babel-plugin-add-module-exports": "0.2.1",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-eslint": "10.0.2",
"babel-plugin-add-module-exports": "1.0.2",
"babel-preset-node6": "11.0.0",
"babel-preset-stage-1": "6.16.0",
"babel-register": "6.18.0",
"coveralls": "2.11.15",
"cross-env": "3.1.4",
"eslint": "3.13.1",
"eslint-config-standard": "6.2.1",
"eslint-plugin-ava": "4.0.1",
"eslint-plugin-promise": "3.4.0",
"eslint-plugin-standard": "2.0.1",
"nyc": "10.0.0",
"rimraf": "2.5.4"
"babel-preset-stage-1": "6.24.1",
"babel-register": "6.26.0",
"coveralls": "3.0.5",
"cross-env": "5.2.0",
"eslint": "6.0.1",
"eslint-config-standard": "13.0.1",
"eslint-plugin-ava": "7.1.0",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.0.0",
"nyc": "14.1.1",
"rimraf": "2.6.3"
},
"peerDependencies": {
"serverless": ">= 1.12.0"
"serverless": ">=1.48.0"
},
"ava": {
"require": [
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Expand Up @@ -13,7 +13,7 @@ export default class BindDeploymentId {

// Find the deployment resource
let deploymentId
for (let key of Object.keys(template.Resources)) {
for (const key of Object.keys(template.Resources)) {
const resource = template.Resources[key]
if (resource.Type === 'AWS::ApiGateway::Deployment') {
deploymentId = key
Expand Down
8 changes: 4 additions & 4 deletions test/index.spec.js
Expand Up @@ -22,7 +22,7 @@ function defaultCompiledCloudFormation() {
ApiGatewayRestApi: {
Type: 'AWS::ApiGateway::RestApi',
Properties: {
'Name': 'test-api'
Name: 'test-api'
}
},
ApiGatewayDeployment1484416530047: {
Expand Down Expand Up @@ -61,7 +61,7 @@ test('bindDeploymentId#default', t => {
MethodSettings: []
}
},
'__deployment__': {
__deployment__: {
Properties: {
DataTraceEnabled: true,
MetricsEnabled: true
Expand Down Expand Up @@ -90,7 +90,7 @@ test('bindDeploymentId#noCustomStages', t => {

serverless.service.resources = {
Resources: {
'__deployment__': {
__deployment__: {
Properties: {
DataTraceEnabled: true,
MetricsEnabled: true
Expand All @@ -109,7 +109,7 @@ test('replaceDeploymentIdReferences#references', t => {
const plugin = new BindDeploymentId(buildServerless(), {})

const toReplace = {
'__deployment__': {
__deployment__: {
a: [],
b: {
c: ['__deployment__']
Expand Down

0 comments on commit 32d1fbc

Please sign in to comment.