Merge pull request #70 from actions/dependabot/npm_and_yarn/axios-1.3.3

Bump axios from 1.3.0 to 1.3.3

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/rebuild-dependabot-prs.yml

@@ -0,0 +1,48 @@
+name: Rebuild distributables for Dependabot PRs
+
+on:
+  push:
+    branches:
+      - 'dependabot/npm**'
+
+permissions:
+  contents: write
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  rebuild-dist:
+    if: ${{ github.event.sender.login == 'dependabot[bot]' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAGES_AUTOMATION_PAT }}
+
+      - name: Setup Node.JS
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Rebuild the dist/ directory
+        run: npm run prepare
+
+      - name: Commit any differences present in the dist/ directory
+        run: |
+          if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
+            echo "Detected uncommitted changes after rebuild in dist folder. Committing..."
+            git add dist/
+            git config --local user.name "github-actions[bot]"
+            git config --local user.email "github-actions[bot]@users.noreply.github.com"
+            git commit -m "Update distributables after Dependabot 🤖"
+            echo "Pushing branch ${{ github.ref_name }}"
+            git push origin ${{ github.ref_name }}
+          fi

dist/licenses.txt

@@ -110,25 +110,13 @@ SOFTWARE.
 
 axios
 MIT
-Copyright (c) 2014-present Matt Zabriskie
+# Copyright (c) 2014-present Matt Zabriskie & Collaborators
 
-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
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+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 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 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.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE 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.
+THE SOFTWARE 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.
 
 
 combined-stream
@@ -572,6 +560,30 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+proxy-from-env
+MIT
+The MIT License
+
+Copyright (C) 2016-2018 Rob Wu <rob@robwu.nl>
+
+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 to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software 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.
+
+THE SOFTWARE 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.
+
+
 supports-color
 MIT
 MIT License

package.json

@@ -25,15 +25,15 @@
   "homepage": "https://github.com/actions/configure-pages#readme",
   "dependencies": {
     "@actions/core": "^1.10.0",
-    "axios": "^0.27.2",
-    "espree": "^9.3.2"
+    "axios": "^1.3.3",
+    "espree": "^9.4.1"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.34.0",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-github": "^4.3.7",
-    "jest": "^28.1.1",
-    "prettier": "^2.7.1"
+    "@vercel/ncc": "^0.36.1",
+    "eslint": "^8.34.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-github": "^4.6.0",
+    "jest": "^29.4.1",
+    "prettier": "^2.8.4"
   }
 }

src/set-pages-config.test.js

@@ -2,8 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const core = require('@actions/core')
 
-const { getConfigParserSettings } = require('./set-pages-config')
-const { ConfigParser } = require('./config-parser')
+const { setPagesConfig } = require('./set-pages-config')
 const { getTempFolder, compareFiles } = require('./test-helpers')
 
 // Get the temp folder
@@ -57,12 +56,12 @@ describe('configParser', () => {
             fs.rmSync(fixtureTargetFile)
           }
 
-          // Get settings for the static site generator
-          const settings = getConfigParserSettings({ staticSiteGenerator, siteUrl })
-          // Update the settings
-          settings.configurationFile = fixtureTargetFile
-          // Do the injection
-          new ConfigParser(settings).injectAll()
+          // Do the injections for the static site generator
+          setPagesConfig({
+            staticSiteGenerator,
+            generatorConfigFile: fixtureTargetFile,
+            siteUrl
+          })
 
           // Read the expected file
           const expectedFile = `${fixtureFolder}/${path.basename(
@@ -71,7 +70,7 @@ describe('configParser', () => {
           )}.expected${defaultFileExtension}`
 
           // Compare the actual and expected files
-          compareFiles(settings.configurationFile, expectedFile)
+          compareFiles(fixtureTargetFile, expectedFile)
         })
       })
 
@@ -90,16 +89,13 @@ describe('configParser', () => {
               fs.rmSync(fixtureTargetFile)
             }
 
-            // Get settings for the static site generator
-            const settings = getConfigParserSettings({
+            // Do the injections for the static site generator
+            setPagesConfig({
               staticSiteGenerator,
               generatorConfigFile: fixtureTargetFile,
               siteUrl
             })
 
-            // Do the injection
-            new ConfigParser(settings).injectAll()
-
             // Read the expected file
             const expectedFile = `${fixtureFolder}/${path.basename(
               configurationFile,
@@ -107,7 +103,7 @@ describe('configParser', () => {
             )}.expected${fileExtension}`
 
             // Compare the actual and expected files
-            compareFiles(settings.configurationFile, expectedFile)
+            compareFiles(fixtureTargetFile, expectedFile)
           })
         })
     })