Skip to content

Commit

Permalink
Merge remote-tracking branch 'node-aws-lambda-sapling/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mdnorman committed Jul 28, 2021
2 parents 5afb4f3 + 3505cc1 commit 9de60ec
Show file tree
Hide file tree
Showing 6 changed files with 9,050 additions and 6,198 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.16.1
14.17.3
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Many popular IDEs and editors support this out of the box or with a plugin.
2. Change the base `custom.baseDomainName` property in `serverless.yml` to the zone name, eg `whatever.com`
3. Then run:
```
npx serverless create_domain
npx serverless create_domain --stage test
```

## Development
Expand Down Expand Up @@ -89,18 +89,10 @@ Many IDEs and editors support TSLint.

This project uses [Jest](https://jestjs.io/) for testing. Run tests before checking in.

### Unit Tests

```
npm test
```

### Integration Tests

```
npm run test:integration
```

## Building

```
Expand Down
23 changes: 12 additions & 11 deletions licenses/sapling-license
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
Copyright (c) 2018 Michael D. Norman, deNormans
Copyright (c) 2020 Michael D. Norman

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
of the Base Sapling (original at https://github.com/mdnorman/base-sapling),
and associated documentation files (the "Base Sapling"), to deal
in the Base Sapling without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Base Sapling, and to permit persons to whom the Base Sapling is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
copies or substantial portions of the Base Sapling.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
THE BASE SAPLING IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
OUT OF OR IN CONNECTION WITH THE BASE SAPLING OR THE USE OR OTHER DEALINGS IN THE
BASE SAPLING.

Except as contained in this notice, the name(s) of the above copyright holders
shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization.
Except as contained in this notice, the name(s) of the above copyright holders
shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Base Sapling without prior written authorization.
Loading

0 comments on commit 9de60ec

Please sign in to comment.