Merge pull request #31 from rentziass/rentziass/update-actions-core

Update @actions/core to 1.10.0

.eslintrc.json

@@ -0,0 +1,17 @@
+{
+  "env": {
+    "commonjs": true,
+    "es2021": true,
+    "node": true,
+    "jest": true
+  },
+  "plugins": ["github"],
+  "extends": ["eslint:recommended", "prettier", "plugin:github/internal"],
+  "parserOptions": {
+    "ecmaVersion": 12
+  },
+  "rules": {
+    "semi": ["error", "never"]
+  },
+  "ignorePatterns": ["/dist/", "/src/fixtures/", "/src/blank-configurations/"]
+}

.github/release-drafter.yml

@@ -1,6 +1,6 @@
 ---
-name-template: "v$RESOLVED_VERSION"
-tag-template: "v$RESOLVED_VERSION"
+name-template: 'v$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
 template: |
   # Changelog
 
@@ -8,33 +8,33 @@ template: |
 
   See details of [all code changes](https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION) since previous release.
 categories:
-  - title: "🚀 Features"
+  - title: '🚀 Features'
     labels:
-      - "feature"
-      - "enhancement"
-  - title: "🐛 Bug Fixes"
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
     labels:
-      - "fix"
-      - "bugfix"
-      - "bug"
-  - title: "🧰 Maintenance"
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
     labels:
-      - "infrastructure"
-      - "automation"
-      - "documentation"
-  - title: "🏎 Performance"
-    label: "performance"
-change-template: "- $TITLE @$AUTHOR (#$NUMBER)"
+      - 'infrastructure'
+      - 'automation'
+      - 'documentation'
+  - title: '🏎 Performance'
+    label: 'performance'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 version-resolver:
   major:
     labels:
-      - "type: breaking"
+      - 'type: breaking'
   minor:
     labels:
-      - "type: enhancement"
+      - 'type: enhancement'
   patch:
     labels:
-      - "type: bug"
-      - "type: maintenance"
-      - "type: documentation"
+      - 'type: bug'
+      - 'type: maintenance'
+      - 'type: documentation'
   default: patch

.github/workflows/check-dist.yml

@@ -18,6 +18,11 @@ on:
 permissions:
   contents: read
 
+# 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:
   check-dist:
     runs-on: ubuntu-latest

.github/workflows/check-formatting.yml

@@ -0,0 +1,35 @@
+name: Check formatting
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+# 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:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Verify formatting
+        run: npm run format:check

.github/workflows/draft-release.yml

@@ -4,6 +4,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+
 jobs:
   draft-release:
     runs-on: ubuntu-latest

.github/workflows/lint.yml

@@ -0,0 +1,35 @@
+name: Lint code
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+# 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:
+  lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run linter
+        run: npm run lint:check

.github/workflows/release.yml

@@ -1,11 +1,11 @@
 name: Release
 on:
   release:
-    types: [published]
+    types: [released]
   workflow_dispatch:
     inputs:
       TAG_NAME:
-        description: "Tag name that the major tag will point to"
+        description: 'Tag name that the major tag will point to'
         required: true
 
 env:

.github/workflows/test.yml

@@ -6,6 +6,14 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
+# 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:
   test:
     runs-on: ubuntu-latest

.prettierignore

@@ -0,0 +1,5 @@
+# Ignore build artifacts
+/dist/
+
+# Ignore all Markdown files
+*.md

.prettierrc.yml

@@ -1,10 +1,10 @@
 # Prettier (formatter) configuration
 ---
-printWidth: 80
+printWidth: 120
 tabWidth: 2
 useTabs: false
 semi: false
 singleQuote: true
 trailingComma: none
-bracketSpacing: false
+bracketSpacing: true
 arrowParens: avoid

README.md

@@ -1,8 +1,8 @@
-# Configure-Pages
+# configure-pages
 
-An action to enable Pages and extract various metadata about a site. It can also be used to configure various static site generators we support as [starter workflows][starter-workflows].
+A GitHub Action to enable Pages and extract various metadata about a site. It can also be used to configure various static site generators we support as [starter workflows][starter-workflows].
 
-See [`set-pages-path.js`](./src/set-pages-path.js) for more details on how we configure static site generators to work "out of the box" with GitHub Pages.
+See [`set-pages-config.js`](src/set-pages-config.js) for more details on how we configure static site generators to work "out of the box" with GitHub Pages.
 
 # Usage
 
@@ -12,18 +12,13 @@ See [action.yml](action.yml) and the [Pages starter workflows][starter-workflows
 
 In order to release a new version of this Action:
 
-1. Locate the semantic version of the upcoming release (a draft is maintained by the [`draft-release` workflow][draft-release])
+1. Locate the semantic version of the [upcoming release][release-list] (a draft is maintained by the [`draft-release` workflow][draft-release]).
 
-2. Push a matching tag, for instance for `v0.1.0`:
+2. Publish the draft release from the `main` branch with semantic version as the tag name, _with_ the checkbox to publish to the GitHub Marketplace checked. :ballot_box_with_check:
 
-   ```bash
-   git tag v0.1.0
-   git push origin v0.1.0
-   ```
+3. After publishing the release, the [`release` workflow][release] will automatically run to create/update the corresponding the major version tag such as `v0`.
 
-3. Publish the draft release (the major tag such as `v0` will be created/updated by the [`release` workflow][release])
-
-   ⚠️ Environment approval is required.
+   ⚠️ Environment approval is required. Check the [Release workflow run list][release-workflow-runs].
 
 # License
 
@@ -31,5 +26,7 @@ The scripts and documentation in this project are released under the [MIT Licens
 
 <!-- references -->
 [starter-workflows]: https://github.com/actions/starter-workflows/tree/main/pages
+[release-list]: https://github.com/actions/configure-pages/releases
 [draft-release]: .github/workflows/draft-release.yml
-[release]: .github/workflows/release.yml
+[release]: .github/workflows/release.yml
+[release-workflow-runs]: https://github.com/actions/configure-pages/actions/workflows/release.yml

action.yml

@@ -1,4 +1,4 @@
-name: 'Configure Pages'
+name: 'Configure GitHub Pages'
 description: 'A GitHub Action to enable Pages, extract various metadata about a site, and configure some supported static site generators.'
 author: 'GitHub'
 runs:
@@ -6,7 +6,10 @@ runs:
   main: 'dist/index.js'
 inputs:
   static_site_generator:
-    description: 'Optional static site generator to attempt to configure (nuxt, next or gatsby)'
+    description: 'Optional static site generator to attempt to configure: "nuxt", "next", "gatsby", or "sveltekit"'
+    required: false
+  generator_config_file:
+    description: 'Optional file path to static site generator configuration file'
     required: false
   token:
     description: 'GitHub token'
@@ -18,10 +21,10 @@ inputs:
     required: false
 outputs:
   base_url:
-    description: 'GitHub Pages site full base URL. Examples: "https://octocat.github.io/my-repo/", "https://octocat.github.io/", "https://www.example.com/"'
+    description: 'GitHub Pages site full base URL. Examples: "https://octocat.github.io/my-repo", "https://octocat.github.io", "https://www.example.com"'
   origin:
     description: 'GitHub Pages site origin. Examples: "https://octocat.github.io", "https://www.example.com"'
   host:
     description: 'GitHub Pages site host. Examples: "octocat.github.io", "www.example.com"'
   base_path:
-    description: 'GitHub Pages site full base path. Examples: "/my-repo/" or "/"'
+    description: 'GitHub Pages site full base path. Examples: "/my-repo" or ""'

dist/licenses.txt

@@ -608,3 +608,16 @@ 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.
+
+
+uuid
+MIT
+The MIT License (MIT)
+
+Copyright (c) 2010-2020 Robert Kieffer and other contributors
+
+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.

dist/sveltekit.js

@@ -0,0 +1,8 @@
+// Default Pages configuration for SvelteKit
+import adapter from '@sveltejs/adapter-auto'
+
+export default {
+  kit: {
+    adapter: adapter()
+  }
+}

package.json

@@ -5,6 +5,11 @@
   "description": "A GitHub Action to enable Pages and extract various metadata about a site. It can also be used to configure various static site generators we support as starter workflows.",
   "main": "./dist/index.js",
   "scripts": {
+    "all": "npm run format && npm run lint && npm run prepare && npm run test",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "lint": "DEBUG=eslint:cli-engine eslint --fix .",
+    "lint:check": "DEBUG=eslint:cli-engine eslint .",
     "prepare": "ncc build src/index.js -o dist --source-map --license licenses.txt",
     "test": "jest"
   },
@@ -19,14 +24,15 @@
   },
   "homepage": "https://github.com/actions/configure-pages#readme",
   "dependencies": {
-    "@actions/core": "^1.8.2",
+    "@actions/core": "^1.10.0",
     "axios": "^0.27.2",
-    "axios-retry": "^3.2.5",
-    "espree": "^9.3.2",
-    "string-format": "^1.0.0"
+    "espree": "^9.3.2"
   },
   "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"
   }

src/api-client.js

@@ -33,21 +33,17 @@ async function enablePagesSite({ repositoryNwo, githubToken }) {
 }
 
 async function getPagesSite({ repositoryNwo, githubToken }) {
-  try {
-    const pagesEndpoint = `${getApiBaseUrl()}/repos/${repositoryNwo}/pages`
+  const pagesEndpoint = `${getApiBaseUrl()}/repos/${repositoryNwo}/pages`
 
-    const response = await axios.get(pagesEndpoint, {
-      headers: {
-        Accept: 'application/vnd.github.v3+json',
-        Authorization: `Bearer ${githubToken}`
-      }
-    })
+  const response = await axios.get(pagesEndpoint, {
+    headers: {
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${githubToken}`
+    }
+  })
 
-    const pageObject = response.data
-    return pageObject
-  } catch (error) {
-    throw error
-  }
+  const pageObject = response.data
+  return pageObject
 }
 
 async function findOrCreatePagesSite({ repositoryNwo, githubToken, enablement = true }) {

src/api-client.test.js

@@ -53,9 +53,7 @@ describe('apiClient', () => {
     })
 
     it('handles a 409 response when the page already exists', async () => {
-      jest
-        .spyOn(axios, 'post')
-        .mockImplementationOnce(() => Promise.reject({ response: { status: 409 } }))
+      jest.spyOn(axios, 'post').mockImplementationOnce(() => Promise.reject({ response: { status: 409 } }))
 
       // Simply assert that no error is raised
       const result = await apiClient.enablePagesSite({
@@ -67,9 +65,7 @@ describe('apiClient', () => {
     })
 
     it('re-raises errors on failure status codes', async () => {
-      jest
-        .spyOn(axios, 'post')
-        .mockImplementationOnce(() => Promise.reject({ response: { status: 404 } }))
+      jest.spyOn(axios, 'post').mockImplementationOnce(() => Promise.reject({ response: { status: 404 } }))
 
       let erred = false
       try {
@@ -98,9 +94,7 @@ describe('apiClient', () => {
     })
 
     it('re-raises errors on failure status codes', async () => {
-      jest
-        .spyOn(axios, 'get')
-        .mockImplementationOnce(() => Promise.reject({ response: { status: 404 } }))
+      jest.spyOn(axios, 'get').mockImplementationOnce(() => Promise.reject({ response: { status: 404 } }))
 
       let erred = false
       try {
@@ -203,7 +197,8 @@ describe('apiClient', () => {
 
     it('makes second request to get page if create fails because of existence', async () => {
       const PAGE_OBJECT = { html_url: 'https://actions.github.io/is-awesome/' }
-      jest.spyOn(axios, 'get')
+      jest
+        .spyOn(axios, 'get')
         .mockImplementationOnce(() => Promise.reject({ response: { status: 404 } }))
         .mockImplementationOnce(() => Promise.resolve({ status: 200, data: PAGE_OBJECT }))
       jest.spyOn(axios, 'post').mockImplementationOnce(() => Promise.reject({ response: { status: 409 } }))
@@ -217,5 +212,4 @@ describe('apiClient', () => {
       expect(axios.post).toHaveBeenCalledTimes(1)
     })
   })
-
 })

src/blank-configurations/sveltekit.js

@@ -0,0 +1,8 @@
+// Default Pages configuration for SvelteKit
+import adapter from '@sveltejs/adapter-auto'
+
+export default {
+  kit: {
+    adapter: adapter()
+  }
+}

src/config-parser.js

@@ -31,7 +31,7 @@ class ConfigParser {
   // Ctor
   // - configurationFile: path to the configuration file
   // - blankConfigurationFile: a blank configuration file to use if non was previously found
-  constructor({configurationFile, blankConfigurationFile, properties}) {
+  constructor({ configurationFile, blankConfigurationFile, properties }) {
     // Save field
     this.configurationFile = configurationFile
     this.properties = properties
@@ -56,16 +56,32 @@ class ConfigParser {
   // Return the configuration object or null.
   findConfigurationObject(ast) {
     // Try to find a default export
-    var defaultExport = ast.body.find(
-      node =>
-        node.type === 'ExportDefaultDeclaration' &&
-        node.declaration.type === 'ObjectExpression'
-    )
-    if (defaultExport) {
-      core.info('Found configuration object in default export declaration')
+    var defaultExport = ast.body.find(node => node.type === 'ExportDefaultDeclaration')
+
+    // Direct default export
+    if (defaultExport && defaultExport.declaration.type === 'ObjectExpression') {
+      core.info('Found configuration object in direct default export declaration')
       return defaultExport.declaration
     }
 
+    // Indirect default export
+    else if (defaultExport && defaultExport.declaration.type === 'Identifier') {
+      const identifierName = defaultExport.declaration.name
+      const identifierDefinition = ast.body.find(
+        node =>
+          node.type === 'VariableDeclaration' &&
+          node.declarations.length == 1 &&
+          node.declarations[0].type === 'VariableDeclarator' &&
+          node.declarations[0].id.type === 'Identifier' &&
+          node.declarations[0].id.name === identifierName &&
+          node.declarations[0].init.type === 'ObjectExpression'
+      )
+      if (identifierDefinition) {
+        core.info('Found configuration object in indirect default export declaration')
+        return identifierDefinition.declarations[0].init
+      }
+    }
+
     // Try to find a module export
     var moduleExport = ast.body.find(
       node =>
@@ -80,19 +96,13 @@ class ConfigParser {
     )
 
     // Direct module export
-    if (
-      moduleExport &&
-      moduleExport.expression.right.type === 'ObjectExpression'
-    ) {
+    if (moduleExport && moduleExport.expression.right.type === 'ObjectExpression') {
       core.info('Found configuration object in direct module export')
       return moduleExport.expression.right
     }
 
     // Indirect module export
-    else if (
-      moduleExport &&
-      moduleExport.expression.right.type === 'Identifier'
-    ) {
+    else if (moduleExport && moduleExport.expression.right.type === 'Identifier') {
       const identifierName = moduleExport && moduleExport.expression.right.name
       const identifierDefinition = ast.body.find(
         node =>
@@ -120,9 +130,7 @@ class ConfigParser {
     // Try to find a property matching a given name
     const property =
       object.type === 'ObjectExpression' &&
-      object.properties.find(
-        node => node.key.type === 'Identifier' && node.key.name === name
-      )
+      object.properties.find(node => node.key.type === 'Identifier' && node.key.name === name)
 
     // Return the property's value (if found) or null
     if (property) {
@@ -142,9 +150,7 @@ class ConfigParser {
       return `${properties[startIndex]}: ${JSON.stringify(propertyValue)}`
     } else {
       return (
-        `${properties[startIndex]}: {` +
-        this.getPropertyDeclaration(properties, startIndex + 1, propertyValue) +
-        '}'
+        `${properties[startIndex]}: {` + this.getPropertyDeclaration(properties, startIndex + 1, propertyValue) + '}'
       )
     }
   }
@@ -178,12 +184,13 @@ class ConfigParser {
       throw 'Could not find a configuration object in the configuration file'
     }
 
-    // A property may be nested in the configuration file. Split the property name with `.`
+    // A property may be nested in the configuration file. Split the property name with '.'
     // then walk the configuration object one property at a time.
     var depth = 0
     const properties = propertyName.split('.')
     var lastNode = configurationObject
-    while (1) {
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
       // Find the node for the current property
       var propertyNode = this.findProperty(lastNode, properties[depth])
 
@@ -222,11 +229,7 @@ class ConfigParser {
     // Create nested properties in the configuration file
     else {
       // Build the declaration to inject
-      const declaration = this.getPropertyDeclaration(
-        properties,
-        depth,
-        propertyValue
-      )
+      const declaration = this.getPropertyDeclaration(properties, depth, propertyValue)
 
       // The last node identified is an object expression, so do the assignment
       if (lastNode.type === 'ObjectExpression') {
@@ -263,7 +266,7 @@ class ConfigParser {
     }
 
     // Logging
-    core.info(`Injection successful, new configuration:`)
+    core.info('Injection successful, new configuration:')
     core.info(this.configuration)
 
     // Finally write the new configuration in the file
@@ -273,4 +276,4 @@ class ConfigParser {
   }
 }
 
-module.exports = {ConfigParser}
+module.exports = { ConfigParser }

src/config-parser.test.js

@@ -1,7 +1,8 @@
 const fs = require('fs')
+const core = require('@actions/core')
 
-const {ConfigParser} = require('./config-parser')
-const {getTempFolder, compareFiles} = require('./test-helpers')
+const { ConfigParser } = require('./config-parser')
+const { getTempFolder, compareFiles } = require('./test-helpers')
 
 // Get the temp folder
 const tempFolder = getTempFolder()
@@ -11,82 +12,105 @@ const cases = [
   //
   // Default export
   //
-
   {
     property: 'property',
-    source: `export default {}`,
-    expected: `export default { property: "value" }`
+    source: 'export default {}',
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: 0 }`, // property exists and is a number
-    expected: `export default { property: "value" }`
+    source: 'export default { property: 0 }', // property exists and is a number
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: false }`, // property exists and is a boolean
-    expected: `export default { property: "value" }`
+    source: 'export default { property: false }', // property exists and is a boolean
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: "test" }`, // property exists and is a string
-    expected: `export default { property: "value" }`
+    source: 'export default { property: "test" }', // property exists and is a string
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: [1,2] }`, // property exists and is an array
-    expected: `export default { property: "value" }`
+    source: 'export default { property: [1,2] }', // property exists and is an array
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: null }`, // property exists and is null
-    expected: `export default { property: "value" }`
+    source: 'export default { property: null }', // property exists and is null
+    expected: 'export default { property: "value" }'
   },
   {
     property: 'property',
-    source: `export default { property: {}}`, // property exists and is an object
-    expected: `export default { property: "value" }`
+    source: 'export default { property: { } }', // property exists and is an object
+    expected: 'export default { property: "value" }'
   },
 
   // Deep properties (injection 1)
   {
     property: 'property.b.c',
-    source: `export default {}`,
-    expected: `export default { property: { b: { c: "value" }}}`
+    source: 'export default {}',
+    expected: 'export default { property: { b: { c: "value"  } } }'
   },
   {
     property: 'property.b.c',
-    source: `export default { property: 0 }`, // property exists and is a number
-    expected: `export default { property: { b: { c: "value" }}}`
+    source: 'export default { property: 0 }', // property exists and is a number
+    expected: 'export default { property: { b: { c: "value"  } } }'
   },
   {
     property: 'property.b.c',
-    source: `export default { property: {}}`, // property exists and is an object
-    expected: `export default { property: { b: { c: "value" }}}`
+    source: 'export default { property: { } }', // property exists and is an object
+    expected: 'export default { property: { b: { c: "value"  } } }'
   },
 
   // Deep properties (injection 2)
   {
     property: 'property.b.c',
-    source: `export default { property: { b: 0 }}`, // property exists and is a number
-    expected: `export default { property: { b: { c: "value" }}}`
+    source: 'export default { property: { b: 0  } }', // property exists and is a number
+    expected: 'export default { property: { b: { c: "value"  } } }'
   },
   {
     property: 'property.b.c',
-    source: `export default { property: { b: {}}}`, // property exists and is an object
-    expected: `export default { property: { b: { c: "value" }}}`
+    source: 'export default { property: { b: { } } }', // property exists and is an object
+    expected: 'export default { property: { b: { c: "value"  } } }'
   },
   {
     property: 'property.b.c',
-    source: `export default { property: { b: { hello: 123}}}`, // property exists and is a non-empty object
-    expected: `export default { property: { b: { c: "value", hello: 123 }}}`
+    source: 'export default { property: { b: { hello: 123 } } }', // property exists and is a non-empty object
+    expected: 'export default { property: { b: { c: "value", hello: 123  } } }'
   },
 
   // Deep properties (existing properties)
   {
     property: 'a1.a2',
-    source: `export default { a2: false, a1: { a3: [12]}}`, // property exists and is a non-empty object
-    expected: `export default { a2: false, a1: { a2: "value", a3: [12]}}`
+    source: 'export default { a2: false, a1: { a3: [12] } }', // property exists and is a non-empty object
+    expected: 'export default { a2: false, a1: { a2: "value", a3: [12] } }'
+  },
+
+  //
+  // Indirect default export
+  //
+  {
+    property: 'property',
+    source: 'const config = {}; export default config',
+    expected: 'const config = { property: "value"}; export default config'
+  },
+  {
+    property: 'property',
+    source: 'var config = {}; export default config',
+    expected: 'var config = { property: "value"}; export default config'
+  },
+  {
+    property: 'a.b.c',
+    source: 'var config = {}; export default config',
+    expected: 'var config = { a: { b: { c: "value" } } }; export default config'
+  },
+  {
+    property: 'a.b.c',
+    source: 'var config = { a: { b: [], c: "hello" } }; export default config',
+    expected: 'var config = { a: { b: { c: "value"}, c: "hello" } }; export default config'
   },
 
   //
@@ -94,18 +118,18 @@ const cases = [
   //
   {
     property: 'property',
-    source: `module.exports = {}`,
-    expected: `module.exports = { property: "value"}`
+    source: 'module.exports = {}',
+    expected: 'module.exports = { property: "value"}'
   },
   {
     property: 'property',
-    source: `module.exports = { p1: 0}`,
-    expected: `module.exports = { property: "value", p1: 0}`
+    source: 'module.exports = { p1: 0}',
+    expected: 'module.exports = { property: "value", p1: 0}'
   },
   {
     property: 'a.b.c',
-    source: `module.exports = { p1: 0}`,
-    expected: `module.exports = { a: { b: { c: "value" }}, p1: 0}`
+    source: 'module.exports = { p1: 0}',
+    expected: 'module.exports = { a: { b: { c: "value"  } }, p1: 0}'
   },
 
   //
@@ -113,36 +137,46 @@ const cases = [
   //
   {
     property: 'property',
-    source: `const config = {}; module.exports = config`,
-    expected: `const config = { property: "value"}; module.exports = config`
+    source: 'const config = {}; module.exports = config',
+    expected: 'const config = { property: "value"}; module.exports = config'
   },
   {
     property: 'property',
-    source: `var config = {}; module.exports = config`,
-    expected: `var config = { property: "value"}; module.exports = config`
+    source: 'var config = {}; module.exports = config',
+    expected: 'var config = { property: "value"}; module.exports = config'
   },
   {
     property: 'a.b.c',
-    source: `var config = {}; module.exports = config`,
-    expected: `var config = { a: { b: { c: "value"}}}; module.exports = config`
+    source: 'var config = {}; module.exports = config',
+    expected: 'var config = { a: { b: { c: "value" } } }; module.exports = config'
   },
   {
     property: 'a.b.c',
-    source: `var config = { a: { b: [], c: "hello"}}; module.exports = config`,
-    expected: `var config = { a: { b: { c: "value"}, c: "hello"}}; module.exports = config`
+    source: 'var config = { a: { b: [], c: "hello" } }; module.exports = config',
+    expected: 'var config = { a: { b: { c: "value"}, c: "hello" } }; module.exports = config'
   }
 ]
 
 describe('config-parser', () => {
-  cases.forEach(({property, source, expected}, index) => {
-    it(`Inject path properly for case #${index}`, () => {
+  beforeEach(() => {
+    jest.restoreAllMocks()
+
+    // Mock error/warning/info/debug to silence their output
+    jest.spyOn(core, 'error').mockImplementation(jest.fn())
+    jest.spyOn(core, 'warning').mockImplementation(jest.fn())
+    jest.spyOn(core, 'info').mockImplementation(jest.fn())
+    jest.spyOn(core, 'debug').mockImplementation(jest.fn())
+  })
+
+  cases.forEach(({ property, source, expected }, index) => {
+    it(`injects path properly for case #${index}`, () => {
       // Write the source file
       const sourceFile = `${tempFolder}/source.js`
-      fs.writeFileSync(sourceFile, source, {encoding: 'utf8'})
+      fs.writeFileSync(sourceFile, source, { encoding: 'utf8' })
 
       // Write the expected file
       const expectedFile = `${tempFolder}/expected.js`
-      fs.writeFileSync(expectedFile, expected, {encoding: 'utf8'})
+      fs.writeFileSync(expectedFile, expected, { encoding: 'utf8' })
 
       // Update the settings and do the injection
       new ConfigParser({

src/context.js

@@ -6,6 +6,7 @@ function getRequiredVars() {
     repositoryNwo: process.env.GITHUB_REPOSITORY,
     githubToken: core.getInput('token'),
     staticSiteGenerator: core.getInput('static_site_generator'),
+    generatorConfigFile: core.getInput('generator_config_file'),
     enablement: core.getInput('enablement') !== 'false'
   }
 }
@@ -22,4 +23,4 @@ function getContext() {
   return requiredVars
 }
 
-module.exports = {getContext}
+module.exports = { getContext }

src/fixtures/gatsby/blank.expected.js

@@ -1,2 +1,2 @@
 // Default Pages configuration for Gatsby
-module.exports = { pathPrefix: "/docs/" }
+module.exports = { siteMetadata: { siteUrl: 'https://configure-pages.github.io' }, pathPrefix: '/docs/' }

src/fixtures/gatsby/blank.js

@@ -1 +1 @@
-// This file is not read by the test suite
+// This file is not read by the test suite

src/fixtures/gatsby/default.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+  siteMetadata: {
+    title: 'My Gatsby Site'
+  },
+  plugins: []
+}

src/fixtures/gatsby/default.expected.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+  pathPrefix: '/docs/',
+  siteMetadata: {
+    siteUrl: 'https://configure-pages.github.io',
+    title: 'My Gatsby Site'
+  },
+  plugins: []
+}

src/fixtures/gatsby/default.expected.js

@@ -1,8 +1,8 @@
 module.exports = {
-  pathPrefix: "/docs/",
+  pathPrefix: '/docs/',
   siteMetadata: {
-    title: `My Gatsby Site`,
-    siteUrl: `https://www.yourdomain.tld`,
+    siteUrl: 'https://configure-pages.github.io',
+    title: 'My Gatsby Site'
   },
-  plugins: [],
-}
+  plugins: []
+}

src/fixtures/gatsby/default.expected.mjs

@@ -0,0 +1,8 @@
+export default {
+  pathPrefix: '/docs/',
+  siteMetadata: {
+    siteUrl: 'https://configure-pages.github.io',
+    title: 'My Gatsby Site'
+  },
+  plugins: []
+}

src/fixtures/gatsby/default.js

@@ -1,7 +1,6 @@
 module.exports = {
   siteMetadata: {
-    title: `My Gatsby Site`,
-    siteUrl: `https://www.yourdomain.tld`,
+    title: 'My Gatsby Site'
   },
-  plugins: [],
-}
+  plugins: []
+}

src/fixtures/gatsby/default.mjs

@@ -0,0 +1,6 @@
+export default {
+  siteMetadata: {
+    title: 'My Gatsby Site'
+  },
+  plugins: []
+}

src/fixtures/next/blank.expected.js

@@ -1,6 +1,3 @@
 // Default Pages configuration for Next
-const nextConfig = {
-  experimental: {images: {unoptimized: true}},
-  basePath: '/docs'
-}
+const nextConfig = { experimental: { images: { unoptimized: true } }, basePath: '/docs' }
 module.exports = nextConfig

src/fixtures/next/blank.js

@@ -1 +1 @@
-// This file is not read by the test suite
+// This file is not read by the test suite

src/fixtures/next/default.cjs

@@ -0,0 +1,7 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+  swcMinify: true
+}
+
+module.exports = nextConfig

src/fixtures/next/default.expected.cjs

@@ -0,0 +1,9 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  experimental: { images: { unoptimized: true } },
+  basePath: '/docs',
+  reactStrictMode: true,
+  swcMinify: true
+}
+
+module.exports = nextConfig

src/fixtures/next/default.expected.js

@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {images: {unoptimized: true}},
+  experimental: { images: { unoptimized: true } },
   basePath: '/docs',
   reactStrictMode: true,
   swcMinify: true

src/fixtures/next/default.expected.mjs

@@ -0,0 +1,9 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  experimental: { images: { unoptimized: true } },
+  basePath: '/docs',
+  reactStrictMode: true,
+  swcMinify: true
+}
+
+export default nextConfig

src/fixtures/next/default.js

@@ -1,7 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  swcMinify: true,
+  swcMinify: true
 }
 
-module.exports = nextConfig
+module.exports = nextConfig

src/fixtures/next/default.mjs

@@ -0,0 +1,7 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+  swcMinify: true
+}
+
+export default nextConfig

src/fixtures/nuxt/async.cjs

@@ -0,0 +1,15 @@
+const getAllDynamicRoute = async function () {
+  const routes = await (async () => {
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
+
+module.exports = {
+  mode: 'universal',
+  generate: {
+    async routes() {
+      return getAllDynamicRoute()
+    }
+  }
+}

src/fixtures/nuxt/async.expected.cjs

@@ -0,0 +1,17 @@
+const getAllDynamicRoute = async function () {
+  const routes = await (async () => {
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
+
+module.exports = {
+  target: 'static',
+  router: { base: '/docs/' },
+  mode: 'universal',
+  generate: {
+    async routes() {
+      return getAllDynamicRoute()
+    }
+  }
+}

src/fixtures/nuxt/async.expected.js

@@ -1,17 +1,17 @@
-const getAllDynamicRoute = async function() {
+const getAllDynamicRoute = async function () {
   const routes = await (async () => {
-    return ['/posts/hello-world', '/posts/hello-again'];
-  })();
-  return routes;
-};
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
 
 export default {
   target: 'static',
-  router: {base: '/docs/'},
+  router: { base: '/docs/' },
   mode: 'universal',
   generate: {
-    async routes () {
-      return getAllDynamicRoute();
+    async routes() {
+      return getAllDynamicRoute()
     }
   }
-};
+}

src/fixtures/nuxt/async.expected.mjs

@@ -0,0 +1,17 @@
+const getAllDynamicRoute = async function () {
+  const routes = await (async () => {
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
+
+export default {
+  target: 'static',
+  router: { base: '/docs/' },
+  mode: 'universal',
+  generate: {
+    async routes() {
+      return getAllDynamicRoute()
+    }
+  }
+}

src/fixtures/nuxt/async.js

@@ -1,15 +1,15 @@
-const getAllDynamicRoute = async function() {
+const getAllDynamicRoute = async function () {
   const routes = await (async () => {
-    return ['/posts/hello-world', '/posts/hello-again'];
-  })();
-  return routes;
-};
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
 
 export default {
   mode: 'universal',
   generate: {
-    async routes () {
-      return getAllDynamicRoute();
+    async routes() {
+      return getAllDynamicRoute()
     }
   }
-};
+}

src/fixtures/nuxt/async.mjs

@@ -0,0 +1,15 @@
+const getAllDynamicRoute = async function () {
+  const routes = await (async () => {
+    return ['/posts/hello-world', '/posts/hello-again']
+  })()
+  return routes
+}
+
+export default {
+  mode: 'universal',
+  generate: {
+    async routes() {
+      return getAllDynamicRoute()
+    }
+  }
+}

src/fixtures/nuxt/blank.expected.js

@@ -1,2 +1,2 @@
 // Default Pages configuration for Nuxt
-export default {target: 'static', router: {base: '/docs/'}}
+export default { target: 'static', router: { base: '/docs/' } }

src/fixtures/nuxt/blank.js

@@ -1 +1 @@
-// This file is not read by the test suite
+// This file is not read by the test suite

src/fixtures/nuxt/default.cjs

@@ -0,0 +1,37 @@
+module.exports = {
+  // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
+  ssr: false,
+
+  // Global page headers: https://go.nuxtjs.dev/config-head
+  head: {
+    title: 'nuxt',
+    htmlAttrs: {
+      lang: 'en'
+    },
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: '' },
+      { name: 'format-detection', content: 'telephone=no' }
+    ],
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
+  },
+
+  // Global CSS: https://go.nuxtjs.dev/config-css
+  css: [],
+
+  // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
+  plugins: [],
+
+  // Auto import components: https://go.nuxtjs.dev/config-components
+  components: true,
+
+  // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
+  buildModules: [],
+
+  // Modules: https://go.nuxtjs.dev/config-modules
+  modules: [],
+
+  // Build Configuration: https://go.nuxtjs.dev/config-build
+  build: {}
+}

src/fixtures/nuxt/default.expected.cjs

@@ -0,0 +1,39 @@
+module.exports = {
+  // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
+  target: 'static',
+  router: { base: '/docs/' },
+  ssr: false,
+
+  // Global page headers: https://go.nuxtjs.dev/config-head
+  head: {
+    title: 'nuxt',
+    htmlAttrs: {
+      lang: 'en'
+    },
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: '' },
+      { name: 'format-detection', content: 'telephone=no' }
+    ],
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
+  },
+
+  // Global CSS: https://go.nuxtjs.dev/config-css
+  css: [],
+
+  // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
+  plugins: [],
+
+  // Auto import components: https://go.nuxtjs.dev/config-components
+  components: true,
+
+  // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
+  buildModules: [],
+
+  // Modules: https://go.nuxtjs.dev/config-modules
+  modules: [],
+
+  // Build Configuration: https://go.nuxtjs.dev/config-build
+  build: {}
+}

src/fixtures/nuxt/default.expected.js

@@ -1,7 +1,7 @@
 export default {
   // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
   target: 'static',
-  router: { base: "/docs/" },
+  router: { base: '/docs/' },
   ssr: false,
 
   // Global page headers: https://go.nuxtjs.dev/config-head
@@ -16,31 +16,24 @@ export default {
       { hid: 'description', name: 'description', content: '' },
       { name: 'format-detection', content: 'telephone=no' }
     ],
-    link: [
-      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
-    ]
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
 
   // Global CSS: https://go.nuxtjs.dev/config-css
-  css: [
-  ],
+  css: [],
 
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
-  plugins: [
-  ],
+  plugins: [],
 
   // Auto import components: https://go.nuxtjs.dev/config-components
   components: true,
 
   // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
-  buildModules: [
-  ],
+  buildModules: [],
 
   // Modules: https://go.nuxtjs.dev/config-modules
-  modules: [
-  ],
+  modules: [],
 
   // Build Configuration: https://go.nuxtjs.dev/config-build
-  build: {
-  }
-}
+  build: {}
+}

src/fixtures/nuxt/default.expected.mjs

@@ -0,0 +1,39 @@
+export default {
+  // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
+  target: 'static',
+  router: { base: '/docs/' },
+  ssr: false,
+
+  // Global page headers: https://go.nuxtjs.dev/config-head
+  head: {
+    title: 'nuxt',
+    htmlAttrs: {
+      lang: 'en'
+    },
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: '' },
+      { name: 'format-detection', content: 'telephone=no' }
+    ],
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
+  },
+
+  // Global CSS: https://go.nuxtjs.dev/config-css
+  css: [],
+
+  // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
+  plugins: [],
+
+  // Auto import components: https://go.nuxtjs.dev/config-components
+  components: true,
+
+  // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
+  buildModules: [],
+
+  // Modules: https://go.nuxtjs.dev/config-modules
+  modules: [],
+
+  // Build Configuration: https://go.nuxtjs.dev/config-build
+  build: {}
+}

src/fixtures/nuxt/default.js

@@ -14,31 +14,24 @@ export default {
       { hid: 'description', name: 'description', content: '' },
       { name: 'format-detection', content: 'telephone=no' }
     ],
-    link: [
-      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
-    ]
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
 
   // Global CSS: https://go.nuxtjs.dev/config-css
-  css: [
-  ],
+  css: [],
 
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
-  plugins: [
-  ],
+  plugins: [],
 
   // Auto import components: https://go.nuxtjs.dev/config-components
   components: true,
 
   // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
-  buildModules: [
-  ],
+  buildModules: [],
 
   // Modules: https://go.nuxtjs.dev/config-modules
-  modules: [
-  ],
+  modules: [],
 
   // Build Configuration: https://go.nuxtjs.dev/config-build
-  build: {
-  }
-}
+  build: {}
+}

src/fixtures/nuxt/default.mjs

@@ -0,0 +1,37 @@
+export default {
+  // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
+  ssr: false,
+
+  // Global page headers: https://go.nuxtjs.dev/config-head
+  head: {
+    title: 'nuxt',
+    htmlAttrs: {
+      lang: 'en'
+    },
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: '' },
+      { name: 'format-detection', content: 'telephone=no' }
+    ],
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
+  },
+
+  // Global CSS: https://go.nuxtjs.dev/config-css
+  css: [],
+
+  // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
+  plugins: [],
+
+  // Auto import components: https://go.nuxtjs.dev/config-components
+  components: true,
+
+  // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
+  buildModules: [],
+
+  // Modules: https://go.nuxtjs.dev/config-modules
+  modules: [],
+
+  // Build Configuration: https://go.nuxtjs.dev/config-build
+  build: {}
+}

src/fixtures/sveltekit/blank.expected.js

@@ -0,0 +1,10 @@
+// Default Pages configuration for SvelteKit
+import adapter from '@sveltejs/adapter-auto'
+
+export default {
+  kit: {
+    prerender: { origin: 'https://configure-pages.github.io' },
+    paths: { base: '/docs' },
+    adapter: adapter()
+  }
+}

src/fixtures/sveltekit/blank.js

@@ -0,0 +1 @@
+// This file is not read by the test suite

src/fixtures/sveltekit/default.expected.js

@@ -0,0 +1,12 @@
+import adapter from '@sveltejs/adapter-auto'
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+  kit: {
+    prerender: { origin: 'https://configure-pages.github.io' },
+    paths: { base: '/docs' },
+    adapter: adapter()
+  }
+}
+
+export default config

src/fixtures/sveltekit/default.js

@@ -0,0 +1,10 @@
+import adapter from '@sveltejs/adapter-auto'
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+  kit: {
+    adapter: adapter()
+  }
+}
+
+export default config

src/index.js

@@ -4,20 +4,21 @@ const core = require('@actions/core')
 const { getContext } = require('./context')
 
 const { findOrCreatePagesSite } = require('./api-client')
-const { setPagesPath } = require('./set-pages-path')
+const { setPagesConfig } = require('./set-pages-config')
 const outputPagesBaseUrl = require('./output-pages-base-url')
 
 async function main() {
   try {
-    const { repositoryNwo, githubToken, enablement, staticSiteGenerator } = getContext()
+    const { repositoryNwo, githubToken, enablement, staticSiteGenerator, generatorConfigFile } = getContext()
 
     const pageObject = await findOrCreatePagesSite({ repositoryNwo, githubToken, enablement })
     const siteUrl = new URL(pageObject.html_url)
 
     if (staticSiteGenerator) {
-      setPagesPath({ staticSiteGenerator, path: siteUrl.pathname })
+      setPagesConfig({ staticSiteGenerator, generatorConfigFile, siteUrl })
     }
     outputPagesBaseUrl(siteUrl)
+    core.exportVariable('GITHUB_PAGES', 'true')
   } catch (error) {
     core.setFailed(error)
     process.exit(1)

src/output-pages-base-url.js

@@ -1,10 +1,15 @@
 const core = require('@actions/core')
+const removeTrailingSlash = require('./remove-trailing-slash')
 
 function outputPagesBaseUrl(siteUrl) {
-  core.setOutput('base_url', siteUrl.href)
+  // Many static site generators do not want the trailing slash, and it is much easier to add than remove in a workflow
+  const baseUrl = removeTrailingSlash(siteUrl.href)
+  const basePath = removeTrailingSlash(siteUrl.pathname)
+
+  core.setOutput('base_url', baseUrl)
   core.setOutput('origin', siteUrl.origin)
   core.setOutput('host', siteUrl.host)
-  core.setOutput('base_path', siteUrl.pathname)
+  core.setOutput('base_path', basePath)
 }
 
 module.exports = outputPagesBaseUrl

src/output-pages-base-url.test.js

@@ -23,13 +23,10 @@ describe('outputPagesBaseUrl', () => {
 
     outputPagesBaseUrl(new URL(baseUrl))
 
-    expect(core.setOutput).toHaveBeenCalledWith('base_url', baseUrl)
-    expect(core.setOutput).toHaveBeenCalledWith(
-      'origin',
-      'https://octocat.github.io'
-    )
+    expect(core.setOutput).toHaveBeenCalledWith('base_url', 'https://octocat.github.io')
+    expect(core.setOutput).toHaveBeenCalledWith('origin', 'https://octocat.github.io')
     expect(core.setOutput).toHaveBeenCalledWith('host', 'octocat.github.io')
-    expect(core.setOutput).toHaveBeenCalledWith('base_path', '/')
+    expect(core.setOutput).toHaveBeenCalledWith('base_path', '')
   })
 
   it('gets expected outputs for project site', async () => {
@@ -37,13 +34,10 @@ describe('outputPagesBaseUrl', () => {
 
     outputPagesBaseUrl(new URL(baseUrl))
 
-    expect(core.setOutput).toHaveBeenCalledWith('base_url', baseUrl)
-    expect(core.setOutput).toHaveBeenCalledWith(
-      'origin',
-      'https://octocat.github.io'
-    )
+    expect(core.setOutput).toHaveBeenCalledWith('base_url', 'https://octocat.github.io/my-repo')
+    expect(core.setOutput).toHaveBeenCalledWith('origin', 'https://octocat.github.io')
     expect(core.setOutput).toHaveBeenCalledWith('host', 'octocat.github.io')
-    expect(core.setOutput).toHaveBeenCalledWith('base_path', '/my-repo/')
+    expect(core.setOutput).toHaveBeenCalledWith('base_path', '/my-repo')
   })
 
   it('gets expected outputs for site with custom domain name', async () => {
@@ -51,12 +45,9 @@ describe('outputPagesBaseUrl', () => {
 
     outputPagesBaseUrl(new URL(baseUrl))
 
-    expect(core.setOutput).toHaveBeenCalledWith('base_url', baseUrl)
-    expect(core.setOutput).toHaveBeenCalledWith(
-      'origin',
-      'https://www.example.com'
-    )
+    expect(core.setOutput).toHaveBeenCalledWith('base_url', 'https://www.example.com')
+    expect(core.setOutput).toHaveBeenCalledWith('origin', 'https://www.example.com')
     expect(core.setOutput).toHaveBeenCalledWith('host', 'www.example.com')
-    expect(core.setOutput).toHaveBeenCalledWith('base_path', '/')
+    expect(core.setOutput).toHaveBeenCalledWith('base_path', '')
   })
 })

src/remove-trailing-slash.js

@@ -0,0 +1,3 @@
+module.exports = function removeTrailingSlash(str) {
+  return str.endsWith('/') ? str.slice(0, -1) : str
+}

src/set-pages-config.js

@@ -1,13 +1,16 @@
 const core = require('@actions/core')
-const {ConfigParser} = require('./config-parser')
+const { ConfigParser } = require('./config-parser')
+const removeTrailingSlash = require('./remove-trailing-slash')
+
+// Return the settings to be passed to a {ConfigParser} for a given static site generator,
+// optional configuration file path, and a Pages siteUrl value to inject
+function getConfigParserSettings({ staticSiteGenerator, generatorConfigFile, siteUrl }) {
+  let { pathname: path, origin } = siteUrl
 
-// Return the settings to be passed to a {ConfigParser} for a given
-// static site generator and a Pages path value to inject
-function getConfigParserSettings(staticSiteGenerator, path) {
   switch (staticSiteGenerator) {
     case 'nuxt':
       return {
-        configurationFile: './nuxt.config.js',
+        configurationFile: generatorConfigFile || './nuxt.config.js',
         blankConfigurationFile: `${__dirname}/blank-configurations/nuxt.js`,
         properties: {
           // Configure a base path on the router
@@ -20,12 +23,10 @@ function getConfigParserSettings(staticSiteGenerator, path) {
       }
     case 'next':
       // Next does not want a trailing slash
-      if (path.endsWith('/')) {
-        path = path.slice(0, -1)
-      }
+      path = removeTrailingSlash(path)
 
       return {
-        configurationFile: './next.config.js',
+        configurationFile: generatorConfigFile || './next.config.js',
         blankConfigurationFile: `${__dirname}/blank-configurations/next.js`,
         properties: {
           // Configure a base path
@@ -38,11 +39,27 @@ function getConfigParserSettings(staticSiteGenerator, path) {
       }
     case 'gatsby':
       return {
-        configurationFile: './gatsby-config.js',
+        configurationFile: generatorConfigFile || './gatsby-config.js',
         blankConfigurationFile: `${__dirname}/blank-configurations/gatsby.js`,
         properties: {
           // Configure a path prefix
-          pathPrefix: path
+          pathPrefix: path,
+          // Configure a site url
+          'siteMetadata.siteUrl': origin
+        }
+      }
+    case 'sveltekit':
+      // SvelteKit does not want a trailing slash
+      path = removeTrailingSlash(path)
+
+      return {
+        configurationFile: generatorConfigFile || './svelte.config.js',
+        blankConfigurationFile: `${__dirname}/blank-configurations/sveltekit.js`,
+        properties: {
+          // Configure a base path
+          'kit.paths.base': path,
+          // Configure a prerender origin
+          'kit.prerender.origin': origin
         }
       }
     default:
@@ -51,18 +68,18 @@ function getConfigParserSettings(staticSiteGenerator, path) {
 }
 
 // Inject Pages configuration in a given static site generator's configuration file
-function setPagesPath({staticSiteGenerator, path}) {
+function setPagesConfig({ staticSiteGenerator, generatorConfigFile, siteUrl }) {
   try {
     // Parse the configuration file and try to inject the Pages configuration in it
-    const settings = getConfigParserSettings(staticSiteGenerator, path)
+    const settings = getConfigParserSettings({ staticSiteGenerator, generatorConfigFile, siteUrl })
     new ConfigParser(settings).injectAll()
   } catch (error) {
     // Logging
     core.warning(
-      `We were unable to determine how to inject the site metadata into your config. Generated URLs may be incorrect. The base URL for this site should be ${path}. Please ensure your framework is configured to generate relative links appropriately.`,
+      `We were unable to determine how to inject the site metadata into your config. Generated URLs may be incorrect. The base URL for this site should be ${siteUrl}. Please ensure your framework is configured to generate relative links appropriately.`,
       error
     )
   }
 }
 
-module.exports = {getConfigParserSettings, setPagesPath}
+module.exports = { getConfigParserSettings, setPagesConfig }

src/set-pages-config.test.js

@@ -0,0 +1,108 @@
+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 { getTempFolder, compareFiles } = require('./test-helpers')
+
+// Get the temp folder
+const tempFolder = getTempFolder()
+
+const SUPPORTED_GENERATORS = ['next', 'nuxt', 'gatsby', 'sveltekit']
+const SUPPORTED_FILE_EXTENSIONS = ['.js', '.cjs', '.mjs']
+
+// Test suite
+describe('configParser', () => {
+  beforeEach(() => {
+    jest.restoreAllMocks()
+
+    // Mock error/warning/info/debug to silence their output
+    jest.spyOn(core, 'error').mockImplementation(jest.fn())
+    jest.spyOn(core, 'warning').mockImplementation(jest.fn())
+    jest.spyOn(core, 'info').mockImplementation(jest.fn())
+    jest.spyOn(core, 'debug').mockImplementation(jest.fn())
+  })
+
+  // Iterate over the static site generators
+  SUPPORTED_GENERATORS.forEach(staticSiteGenerator => {
+    // Folder containing the fixtures for a given static site generator
+    const fixtureFolder = `${__dirname}/fixtures/${staticSiteGenerator}`
+
+    // Get fixture files, excluding expected results
+    const configurationFiles = fs.readdirSync(fixtureFolder).filter(filename => !filename.includes('.expected.'))
+
+    // Create test siteUrl
+    const siteUrl = new URL('https://configure-pages.github.io/docs/')
+
+    // Iterate over the fixtures, outputting to default configuration file path
+    const defaultFileExtension = '.js'
+    configurationFiles
+      .filter(filename => filename.endsWith(defaultFileExtension))
+      .forEach(configurationFile => {
+        it(`injects path properly for ${staticSiteGenerator} in ${configurationFile} to default configuration file`, async () => {
+          // Copy the source fixture to a temp file
+          const fixtureSourceFile = `${fixtureFolder}/${configurationFile}`
+          const fixtureTargetFile = `${tempFolder}/${configurationFile}`
+          if (configurationFile !== 'blank.js') {
+            fs.copyFileSync(fixtureSourceFile, fixtureTargetFile)
+          } else if (fs.existsSync(fixtureTargetFile)) {
+            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()
+
+          // Read the expected file
+          const expectedFile = `${fixtureFolder}/${path.basename(
+            configurationFile,
+            defaultFileExtension
+          )}.expected${defaultFileExtension}`
+
+          // Compare the actual and expected files
+          compareFiles(settings.configurationFile, expectedFile)
+        })
+      })
+
+    SUPPORTED_FILE_EXTENSIONS.forEach(fileExtension => {
+      // Iterate over the fixtures, outputting to specified configuration file path
+      configurationFiles
+        .filter(filename => filename.endsWith(fileExtension))
+        .forEach(configurationFile => {
+          it(`injects path properly for ${staticSiteGenerator} in ${configurationFile} to specified *${fileExtension} configuration file`, async () => {
+            // Copy the source fixture to a temp file
+            const fixtureSourceFile = `${fixtureFolder}/${configurationFile}`
+            const fixtureTargetFile = `${tempFolder}/${configurationFile}`
+            if (configurationFile !== 'blank.js') {
+              fs.copyFileSync(fixtureSourceFile, fixtureTargetFile)
+            } else if (fs.existsSync(fixtureTargetFile)) {
+              fs.rmSync(fixtureTargetFile)
+            }
+
+            // Get settings for the static site generator
+            const settings = getConfigParserSettings({
+              staticSiteGenerator,
+              generatorConfigFile: fixtureTargetFile,
+              siteUrl
+            })
+
+            // Do the injection
+            new ConfigParser(settings).injectAll()
+
+            // Read the expected file
+            const expectedFile = `${fixtureFolder}/${path.basename(
+              configurationFile,
+              fileExtension
+            )}.expected${fileExtension}`
+
+            // Compare the actual and expected files
+            compareFiles(settings.configurationFile, expectedFile)
+          })
+        })
+    })
+  })
+})

src/set-pages-path.test.js

@@ -1,53 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-const {getConfigParserSettings} = require('./set-pages-path')
-const {ConfigParser} = require('./config-parser')
-const {getTempFolder, compareFiles} = require('./test-helpers')
-
-// Get the temp folder
-const tempFolder = getTempFolder()
-
-// Test suite
-describe('configParser', () => {
-  // Iterate over the static site generators
-  ;['next', 'nuxt', 'gatsby'].forEach(staticSiteGenerator => {
-    // Folder containing the fixtures for a given static site generator
-    const fixtureFolder = `${__dirname}/fixtures/${staticSiteGenerator}`
-
-    // Iterate over the fixtures
-    fs.readdirSync(fixtureFolder).forEach(configurationFile => {
-      // Ignore expectation
-      if (configurationFile.endsWith('.expected.js')) {
-        return
-      }
-
-      it(`Inject path properly for ${staticSiteGenerator} in ${configurationFile}`, async () => {
-        // Get settings for the static site generator
-        const settings = getConfigParserSettings(staticSiteGenerator, '/docs/')
-
-        // Copy the source fixture to a temp file
-        const fixtureSourceFile = `${fixtureFolder}/${configurationFile}`
-        const fixtureTargetFile = `${tempFolder}/${configurationFile}`
-        if (configurationFile != 'blank.js') {
-          fs.copyFileSync(fixtureSourceFile, fixtureTargetFile)
-        } else if (fs.existsSync(fixtureTargetFile)) {
-          fs.rmSync(fixtureTargetFile)
-        }
-
-        // Update the settings and do the injection
-        settings.configurationFile = fixtureTargetFile
-        new ConfigParser(settings).injectAll()
-
-        // Read the expected file
-        const expectedFile = `${fixtureFolder}/${path.basename(
-          configurationFile,
-          '.js'
-        )}.expected.js`
-
-        // Compare the actual and expected files
-        compareFiles(settings.configurationFile, expectedFile)
-      })
-    })
-  })
-})

src/test-helpers.js

@@ -6,7 +6,7 @@ const assert = require('assert')
 function getTempFolder() {
   const tmpFolder = `${__dirname}/fixtures/tmp`
   if (!fs.existsSync(tmpFolder)) {
-    fs.mkdirSync(tmpFolder, {recursive: true})
+    fs.mkdirSync(tmpFolder, { recursive: true })
   }
   return tmpFolder
 }
@@ -14,19 +14,21 @@ function getTempFolder() {
 // Read a JavaScript file and return it formatted
 function formatFile(file) {
   const fileContent = fs.readFileSync(file, 'utf8')
-  return prettier.format(fileContent, {
-    parser: 'espree',
+  return prettier
+    .format(fileContent, {
+      parser: 'espree',
 
-    // Prettier options
-    printWidth: 80,
-    tabWidth: 2,
-    useTabs: false,
-    semi: false,
-    singleQuote: true,
-    trailingComma: 'none',
-    bracketSpacing: false,
-    arrowParens: 'avoid'
-  }).trim()
+      // Prettier options
+      printWidth: 120,
+      tabWidth: 2,
+      useTabs: false,
+      semi: false,
+      singleQuote: true,
+      trailingComma: 'none',
+      bracketSpacing: true,
+      arrowParens: 'avoid'
+    })
+    .trim()
 }
 
 // Compare two JavaScript files
@@ -34,4 +36,4 @@ function compareFiles(actualFile, expectedFile) {
   assert.equal(formatFile(actualFile), formatFile(expectedFile))
 }
 
-module.exports = {getTempFolder, formatFile, compareFiles}
+module.exports = { getTempFolder, formatFile, compareFiles }