Merge branch 'main' into dependabot/npm_and_yarn/sites/upsun/multi-6b…

…c014718a

.github/actions/redirection-verification/index.js

@@ -94,11 +94,16 @@ const verify = async () => {
         core.debug(`Response for our check of ${path} is ${response.status}`)
         return response
       } catch (reqerr) {
-        //core.warning(`issue encountered with path ${path}!!! Returned status is ${reqerr.status}`)
         // core.debug(`issue encountered with path ${path}!!! Returned status is ${reqerr.status}. More info: `)
-        // core.debug(reqerr.toJSON())
         core.info(`issue encountered with path ${path}!!! Returned status is ${reqerr.status}. More info: `)
-        core.info(reqerr.toJSON())
+        if(axios.isAxiosError(reqerr)) {
+          // core.debug(reqerr.toJSON())
+          core.info(reqerr.toJSON())
+        } else {
+          console.log(reqerr)
+          core.info(JSON.stringify(reqerr))
+        }
+
         let row = [{data: linkify(path, axios.defaults.baseURL)},{data: linkify( anchors[path].to, axios.defaults.baseURL) }]
         tableData.push(row)
       }
@@ -107,11 +112,8 @@ const verify = async () => {
 
     Promise.all(validateRedirects).then(() => {
       if(tableData.length > 1) {
-
         core.error('There was an error with one or more redirects.')
-
         core.summary.addTable(tableData)
-
         core.summary.write()
         core.setFailed('There was an error with one or more contracted redirects.')
       } else  {

.github/workflows/linting.yaml

@@ -54,7 +54,7 @@ jobs:
           # check the markdown from the PR itself. Plus, we're only running this job if a PR from fork has been approved
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: ./.github/actions/redirection-verification
+
       - name: Vale
         uses: errata-ai/vale-action@reviewdog
         with:

sites/upsun/src/get-started/stacks/nextjs.md

@@ -203,10 +203,12 @@ applications:
         npm run build
     web:
       commands:
-        start: npm run start -p $PORT
+        start: "npx next start -p $PORT"
+      upstream:
+        socket_family: tcp
       locations:
         "/":
-          passthru: true 
+          passthru: true
 routes:
   "https://{default}/": { type: upstream, upstream: "myapp:http" }
   "http://{default}/": { type: redirect, to: "https://{default}/" }