Skip to content

Commit

Permalink
Merge branch 'dev' into releases/v4
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Apr 4, 2021
2 parents 3dbacc7 + 34bd9b9 commit 8e80bb1
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 181 deletions.
5 changes: 2 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 10, 12, 14
"args": {
"VARIANT": "14"
"VARIANT": "12"
}
},
"settings": {
Expand All @@ -15,4 +14,4 @@
"dbaeumer.vscode-eslint"
],
"remoteUser": "node"
}
}
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "@jamesives/github-pages-deploy-action",
"description": "GitHub action for building a project and deploying it to GitHub pages.",
"author": "James Ives <[email protected]> (https://jamesiv.es)",
"version": "4.0.0",
"version": "4.1.0",
"license": "MIT",
"main": "lib/lib.js",
"types": "lib/lib.d.ts",
"scripts": {
"build": "rimraf lib && tsc --declaration",
"test": "jest",
"lint": "eslint src/**/*.ts __tests__/**/*.ts",
"format": "prettier --write './**/*.ts'"
"lint:format": "prettier --write './**/*.ts'"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -39,17 +39,17 @@
"@actions/io": "1.0.2"
},
"devDependencies": {
"@types/jest": "26.0.20",
"@types/node": "14.14.31",
"eslint": "7.20.0",
"eslint-plugin-github": "4.1.1",
"eslint-plugin-jest": "24.1.5",
"eslint-plugin-prettier": "^3.1.2",
"@types/jest": "26.0.22",
"@types/node": "14.14.37",
"eslint": "7.23.0",
"eslint-plugin-github": "4.1.2",
"eslint-plugin-jest": "24.3.2",
"eslint-plugin-prettier": "3.1.2",
"jest": "26.6.3",
"jest-circus": "26.6.3",
"prettier": "2.2.1",
"rimraf": "^3.0.2",
"ts-jest": "26.5.2",
"typescript": "4.2.2"
"rimraf": "3.0.2",
"ts-jest": "26.5.4",
"typescript": "4.2.3"
}
}
Loading

0 comments on commit 8e80bb1

Please sign in to comment.