Merge branch 'master' into use-local

This commit is contained in:
Bryan MacFarlane 2019-09-22 06:48:39 -04:00 committed by GitHub
commit 88e04bee23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions

6
.gitignore vendored
View File

@ -1,3 +1,6 @@
# comment this out distribution branches
node_modules/
# Logs
logs
*.log
@ -32,8 +35,7 @@ bower_components
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules/
# Other Dependency directories
jspm_packages/
# TypeScript v1 declaration files

View File

@ -65,7 +65,7 @@ Actions are run from GitHub repos. We will create a releases branch and only ch
Comment out node_modules in .gitignore and create a releases/v1 branch
```bash
# Dependency directories
# comment this out distribution branches
# node_modules/
```

6
package-lock.json generated
View File

@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@actions/core": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@actions/core/-/core-1.1.0.tgz",
"integrity": "sha512-KKpo3xzo0Zsikni9tbOsEQkxZBGDsYSJZNkTvmo0gPSXrc98TBOcdTvKwwjitjkjHkreTggWdB1ACiAFVgsuzA=="
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@actions/core/-/core-1.1.1.tgz",
"integrity": "sha512-O5G6EmlzTVsng7VSpNtszIoQq6kOgMGNTFB/hmwKNNA4V71JyxImCIrL27vVHCt2Cb3ImkaCr6o27C2MV9Ylwg=="
},
"@babel/code-frame": {
"version": "7.5.5",

View File

@ -23,7 +23,7 @@
},
"homepage": "https://github.com/actions/javascript-action#readme",
"dependencies": {
"@actions/core": "^1.1.0"
"@actions/core": "^1.1.1"
},
"devDependencies": {
"eslint": "^6.3.0",