Skip to content

Commit

Permalink
Merge branch 'develop' into release/v2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dylankelly authored Jul 18, 2024
2 parents 7e00be2 + 70e172a commit 256ce1e
Show file tree
Hide file tree
Showing 109 changed files with 1,988 additions and 449 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
- name: Install Dependencies
Expand All @@ -37,16 +37,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 9.0.6
run_install: true
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand All @@ -60,16 +60,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
with:
version: 9.0.6
run_install: true
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
Docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ jobs:
Test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nuxt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
TestNuxt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand All @@ -45,10 +45,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
packages: write
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
registry-url: 'https://npm.pkg.github.com/'
node-version: 20
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
packages: write
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false
- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
registry-url: 'https://npm.pkg.github.com/'
node-version: 20
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
with:
version: 9.0.6

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
version: ${{ matrix.node }}
cache: ${{ steps.pkgman.outputs.cache }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
Examples:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/webcomponents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
Examples:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: 9.0.6
run_install: false

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
Expand Down
21 changes: 21 additions & 0 deletions examples/nuxt-app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,27 @@ export default defineAppConfig({
// `dynamicValue` is used in a cypress test to ensure fallbackValues function are called
dynamicValue: () => ['blue']
},
suggestionsFunctions: {
exampleSuggestionsFn: async (query, args) => {
return [
{
id: '1',
name: `Test location - ${args.testArg} - 1`,
center: [144.9631, -37.8136]
},
{
id: '2',
name: `Test location - ${args.testArg} - 2`,
center: [-33.8688, 151.2093]
},
{
id: '2',
name: `With magic key`,
arcGISMagicKey: 'fake1234'
}
]
}
},
filterFunctions: {
// `dummyFunctionFilter` is used in a cypress test to check that the correct parameters are passed to custom filter functions
dummyFunctionFilter: (filterConfig, values) => {
Expand Down
1 change: 0 additions & 1 deletion examples/nuxt-app/cypress.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default defineConfig({
baseUrl: 'http://localhost:3000',
specPattern: '**/*.{feature,feature.ts}',
supportFile: false,
supportFolder: './test',
downloadsFolder: './test/downloads',
fixturesFolder: './test/fixtures',
videosFolder: './test/videos',
Expand Down
Loading

0 comments on commit 256ce1e

Please sign in to comment.