diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5c9d734d5..0a615c442 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,2 @@ -ARG VARIANT=14 +ARG VARIANT=18 FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT} \ No newline at end of file diff --git a/.devcontainer/base.Dockerfile b/.devcontainer/base.Dockerfile deleted file mode 100644 index c1b624cea..000000000 --- a/.devcontainer/base.Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG VARIANT=14-buster -FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT} - -# Install tslint, typescript. eslint is installed by javascript image -ARG NODE_MODULES="tslint-to-eslint-config typescript" -RUN su node -c "umask 0002 && npm install -g ${NODE_MODULES}" \ - && npm cache clean --force > /dev/null 2>&1 \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3a3b67107..3ad063332 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,12 +4,19 @@ "build": { "dockerfile": "Dockerfile", "args": { - "VARIANT": "14" + "VARIANT": "18" } }, - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" + "customizations": { + "env": { + "PATH": "/usr/local/share/.config/yarn/global/node_modules/.bin:$PATH" + }, + "vscode": { + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + "extensions": ["dbaeumer.vscode-eslint"] + } }, - "extensions": ["dbaeumer.vscode-eslint"], "remoteUser": "node" } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdeceed54..6ab0e9997 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,11 +14,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://registry.npmjs.org' - name: Install Yarn @@ -40,11 +40,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://registry.npmjs.org' - name: Install Yarn @@ -78,13 +78,13 @@ jobs: max-parallel: 1 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://registry.npmjs.org' - name: Download artifact diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9940382c8..c826799fb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index daa2363ec..59e987447 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Workflow dispatch event that pushes the current version to the release branch. # From here the secondary production deployment workflow will trigger to build the dependencies. diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index dc34e194a..c7e94dbfb 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -25,7 +25,7 @@ jobs: apt-get update && apt-get install -y rsync - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build and Deploy uses: JamesIves/github-pages-deploy-action@v4 @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build and Deploy uses: JamesIves/github-pages-deploy-action@v4 @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -95,7 +95,7 @@ jobs: LANG: C.UTF-8 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -122,7 +122,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -146,7 +146,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -173,12 +173,12 @@ jobs: needs: integration-ssh-third-party-client runs-on: ubuntu-latest steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -218,7 +218,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false @@ -272,7 +272,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create random file run: echo $RANDOM > integration/1 @@ -294,7 +294,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Create random file run: echo $RANDOM > integration/2 diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index daa59d5d9..fae02f553 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -13,11 +13,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://registry.npmjs.org' - name: Install Yarn diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 29dcb5ead..eda5f569b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,14 +10,14 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: dev # Setup .npmrc file to publish to npm - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://registry.npmjs.org' scope: '@jamesives' @@ -41,9 +41,9 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # Setup .npmrc file to publish to GitHub Packages - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 'v16.13.2' + node-version: 'v20.10.0' registry-url: 'https://npm.pkg.github.com' scope: '@jamesives' diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml index 98ac62d6c..2fdfba3cd 100644 --- a/.github/workflows/sponsors.yml +++ b/.github/workflows/sponsors.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate Sponsors 💖 uses: JamesIves/github-sponsors-readme-action@v1 @@ -17,14 +17,14 @@ jobs: token: ${{ secrets.PAT }} file: 'README.md' template: '{{{ login }}}  ' - maximum: 9999 + maximum: 4999 - name: Generate Sponsors 💖 uses: JamesIves/github-sponsors-readme-action@v1 with: token: ${{ secrets.PAT }} file: 'README.md' - minimum: 10000 + minimum: 5000 template: '{{{ login }}}  ' marker: 'premium' diff --git a/.nvmrc b/.nvmrc index 53a42214a..016efd8a0 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.13.2 +v20.10.0 \ No newline at end of file diff --git a/README.md b/README.md index 62c5068b6..f42f9d31e 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Maintenance of this project is made possible by all the -Chooksta69  robjtede  hadley  kevinchalet  sckott   +Chooksta69  robjtede  hadley  kevinchalet  sckott  electrovir  

## Getting Started :airplane: @@ -105,9 +105,9 @@ The `with` portion of the workflow **must** be configured before the action will The following options must be configured in order to make a deployment. -| Key | Value Information | Type | Required | -| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- | -| `folder` | The folder in your repository that you want to deploy. If your build script compiles into a directory named `build` you'd put it here. If you wish to deploy the root directory you can place a `.` here. You can also utilize absolute file paths by prepending `~` to your folder path. | `with` | **Yes** | +| Key | Value Information | Type | Required | +| -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | -------- | +| `folder` | The folder in your repository that you want to deploy. If your build script compiles into a directory named `build` you'd put it here. If you wish to deploy the root directory you can place a `.` here. You can also utilize absolute file paths by prepending `~` to your folder path. Note that any files/folders matching `.gitignore` entries will not be deployed. Some tools auto-generate a `.gitignore` file for build output. | `with` | **Yes** | By default, the action does not need any token configuration and uses the provided repository scoped GitHub token to make the deployment. If you require more customization you can modify the deployment type using the following options. diff --git a/action.yml b/action.yml index 5cb3af676..23348871b 100644 --- a/action.yml +++ b/action.yml @@ -2,7 +2,7 @@ name: 'Deploy to GitHub Pages' description: 'This action will handle the deployment process of your project to GitHub Pages.' author: 'James Ives ' runs: - using: 'node16' + using: 'node20' main: 'lib/main.js' branding: icon: 'git-commit' diff --git a/package.json b/package.json index 55fa445f0..ccaa6ec04 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@jamesives/github-pages-deploy-action", "description": "GitHub action for building a project and deploying it to GitHub pages.", "author": "James Ives (https://jamesiv.es)", - "version": "4.4.2", + "version": "4.4.3", "license": "MIT", "main": "lib/lib.js", "types": "lib/lib.d.ts", @@ -42,12 +42,12 @@ }, "devDependencies": { "@types/jest": "27.5.0", - "@types/node": "20.4.1", + "@types/node": "20.10.0", "@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/parser": "4.33.0", "eslint": "7.32.0", - "eslint-config-prettier": "8.8.0", - "eslint-plugin-jest": "27.2.2", + "eslint-config-prettier": "9.0.0", + "eslint-plugin-jest": "27.2.3", "eslint-plugin-prettier": "4.2.1", "jest": "26.6.3", "jest-circus": "27.5.1", diff --git a/yarn.lock b/yarn.lock index 85e940048..826a51cd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1277,10 +1277,12 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== -"@types/node@*", "@types/node@20.4.1", "@types/node@>= 8": - version "20.4.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.1.tgz#a6033a8718653c50ac4962977e14d0f984d9527d" - integrity sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg== +"@types/node@*", "@types/node@20.10.0", "@types/node@>= 8": + version "20.10.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617" + integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ== + dependencies: + undici-types "~5.26.4" "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2145,15 +2147,15 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" - integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== +eslint-config-prettier@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f" + integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw== -eslint-plugin-jest@27.2.2: - version "27.2.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.2.2.tgz#be4ded5f91905d9ec89aa8968d39c71f3b072c0c" - integrity sha512-euzbp06F934Z7UDl5ZUaRPLAc9MKjh0rMPERrHT7UhlCEwgb25kBj37TvMgWeHZVkR5I9CayswrpoaqZU1RImw== +eslint-plugin-jest@27.2.3: + version "27.2.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.2.3.tgz#6f8a4bb2ca82c0c5d481d1b3be256ab001f5a3ec" + integrity sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ== dependencies: "@typescript-eslint/utils" "^5.10.0" @@ -4760,6 +4762,11 @@ typescript@4.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -4930,8 +4937,9 @@ windows-release@^3.1.0: execa "^1.0.0" word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + version "1.2.4" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" + integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== wrap-ansi@^6.2.0: version "6.2.0"