Skip to content

Commit 12f75b8

Browse files
Merge pull request #1390 from geospoc/refactor/use-maplibre-gl-as-base
2 parents 0c53506 + 0cfec0e commit 12f75b8

File tree

81 files changed

+7495
-22107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+7495
-22107
lines changed

.browserslistrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
> 1%
2-
last 2 versions
3-
not ie <= 11
1+
defaults, not IE 11, maintained node versions

.eslintrc.cjs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@ module.exports = {
22
root: true,
33
env: {
44
browser: true,
5-
es6: true,
65
node: true,
6+
es2022: true,
77
},
88
parserOptions: {
99
parser: '@typescript-eslint/parser',
10-
ecmaVersion: 2020,
10+
ecmaVersion: 2022,
1111
sourceType: 'module',
12-
lib: ['es2020'],
12+
lib: ['es2022'],
1313
ecmaFeatures: {
1414
jsx: true,
1515
tsx: true,
1616
},
1717
extraFileExtensions: ['.vue'],
1818
},
19-
plugins: ['vue', 'jsdoc', '@typescript-eslint', 'prettier'],
19+
plugins: ['vue', 'jsdoc', 'security', '@typescript-eslint', 'prettier'],
2020
extends: [
21-
'plugin:vue/recommended',
22-
'plugin:prettier/recommended',
23-
'plugin:@typescript-eslint/eslint-recommended',
2421
'plugin:jsdoc/recommended',
22+
'plugin:@typescript-eslint/eslint-recommended',
23+
'plugin:vue/vue3-recommended',
24+
'plugin:security/recommended',
25+
'plugin:prettier/recommended',
2526
'prettier',
2627
],
27-
// add your custom rules here
2828
rules: {
2929
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
3030
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
31-
'vue/require-render-return': 'off',
3231
},
3332
};

.github/config.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/automerger.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: 'Automerge Dependabot PRs'
2+
3+
on: pull_request_target
4+
5+
permissions:
6+
pull-requests: write
7+
contents: write
8+
9+
jobs:
10+
dependabot:
11+
runs-on: ubuntu-latest
12+
if: ${{ github.actor == 'dependabot[bot]' }}
13+
steps:
14+
- name: Dependabot metadata 🤖
15+
id: metadata
16+
uses: dependabot/fetch-metadata@v1.3.6
17+
with:
18+
alert-lookup: true
19+
compat-lookup: true
20+
github-token: ${{ secrets.DEPENDABOT_TOKEN }}
21+
22+
- name: Authenticate CLI with PAT 🔐
23+
run: echo "${{ secrets.DEPENDABOT_TOKEN }}" | gh auth login --with-token
24+
25+
- name: Approve Dependabot PRs 👍
26+
run: gh pr review --approve "$PR_URL"
27+
env:
28+
PR_URL: ${{ github.event.pull_request.html_url }}
29+
GITHUB_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}
30+
31+
- name: Auto-merge Dependabot PRs 🕺
32+
if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'
33+
run: gh pr merge --auto --merge "$PR_URL"
34+
env:
35+
PR_URL: ${{ github.event.pull_request.html_url }}
36+
GITHUB_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}

.github/workflows/ci.yml

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,56 @@
1-
name: ci
1+
name: 'Continuous Integration'
22

33
on:
44
push:
55
branches:
66
- main
7-
- next
8-
pull_request_target:
7+
pull_request:
98
branches:
109
- main
11-
- next
1210

1311
permissions:
1412
checks: write
1513
contents: read
1614

17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request_target' && github.head_ref || github.ref }}
19-
cancel-in-progress: true
20-
2115
jobs:
2216
ci:
23-
runs-on: ${{ matrix.os }}
24-
25-
strategy:
26-
fail-fast: false
27-
matrix:
28-
os: [ubuntu-latest]
29-
node: [18]
30-
17+
runs-on: ubuntu-latest
3118
steps:
32-
- name: Check out repository ✨
33-
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'pull_request_target' && github.actor != 'dependabot[bot]' }}
19+
- name: Check out repository ✨ (non dependabot)
20+
if: ${{ github.actor != 'dependabot[bot]' }}
3421
uses: actions/checkout@v3
3522

3623
- name: Check out repository 🎉 (dependabot)
37-
if: ${{ github.event_name == 'pull_request_target' }}
24+
if: ${{ github.actor == 'dependabot[bot]' }}
3825
uses: actions/checkout@v3
3926
with:
4027
ref: ${{ github.event.pull_request.head.sha }}
4128

4229
- name: Setup node env 📦
43-
uses: actions/setup-node@v3.5.0
30+
uses: actions/setup-node@v3
4431
with:
45-
node-version: ${{ matrix.node }}
46-
registry-url: https://registry.npmjs.org
32+
node-version-file: 'package.json'
4733
check-latest: true
4834
cache: 'npm'
4935

5036
- name: Install dependencies 🚀
51-
run: npm ci --prefer-offline --no-audit
37+
run: npm ci --prefer-offline --no-audit --omit=optional
5238

5339
- name: Run linter(s) 👀
5440
uses: wearerequired/lint-action@v2
5541
with:
5642
github_token: ${{ secrets.GITHUB_TOKEN }}
57-
continue_on_error: true
5843
git_name: github-actions[bot]
5944
git_email: github-actions[bot]@users.noreply.github.com
6045
auto_fix: false
46+
continue_on_error: false
47+
neutral_check_on_warning: true
48+
stylelint: true
49+
stylelint_extensions: css,scss,vue
6150
eslint: true
6251
eslint_extensions: js,ts,vue
6352
prettier: true
6453
prettier_extensions: js,ts,vue
65-
neutral_check_on_warning: true
6654

67-
- name: Run build 🏁
55+
- name: Build the package 🎉
6856
run: npm run build

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: 'CodeQL'
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
schedule:
9+
- cron: '45 23 * * 2'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: ['javascript']
24+
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v3
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v2
31+
with:
32+
languages: ${{ matrix.language }}
33+
34+
- name: Autobuild
35+
uses: github/codeql-action/autobuild@v2
36+
37+
- name: Perform CodeQL Analysis
38+
uses: github/codeql-action/analyze@v2

.github/workflows/lint-pr.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@ on:
88
- synchronize
99

1010
jobs:
11+
validate-pr-title:
12+
name: Validate PR title
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: amannn/action-semantic-pull-request@v5.1.0
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
1119
check-sign-off:
1220
if: startsWith(github.head_ref, 'releases/v') == false
1321
name: Write comment if unsigned commits found
1422
env:
1523
FORCE_COLOR: 1
1624
runs-on: ubuntu-latest
17-
1825
steps:
1926
- uses: live627/check-pr-signoff-action@v1
2027
with:
2128
token: ${{ secrets.GITHUB_TOKEN }}
22-
semantic-pull-request:
23-
name: Validate PR title
24-
needs: [check-sign-off]
25-
runs-on: ubuntu-latest
26-
steps:
27-
- uses: amannn/action-semantic-pull-request@v4
28-
env:
29-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/shipjs-trigger.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
name: Ship js trigger
1+
name: 'Ship js trigger'
2+
23
on:
34
pull_request:
45
types:
56
- closed
7+
68
jobs:
79
build:
810
name: Release
@@ -15,18 +17,22 @@ jobs:
1517
fetch-depth: 0
1618
ref: main
1719

18-
- name: Setup node env 🏗
19-
uses: actions/setup-node@v3.5.0
20+
- name: Setup GitHub Actor
21+
run: |
22+
git config --global user.email "action@github.com"
23+
git config --global user.name "GitHub Action"
24+
25+
- name: Setup node environment 📦
26+
uses: actions/setup-node@v3
2027
with:
21-
node-version: 18
22-
registry-url: https://registry.npmjs.org
28+
node-version-file: 'package.json'
2329
check-latest: true
2430
cache: 'npm'
2531

2632
- name: Install dependencies 🚀
27-
run: npm ci --prefer-offline --no-audit
33+
run: npm ci --prefer-offline --no-audit --omit=optional
2834

29-
- name: Release new version to registry 🎉
35+
- name: Trigger a release 🥳
3036
run: npx shipjs trigger
3137
env:
3238
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ dist
105105
.DS_Store
106106
.temp
107107

108-
types/build
108+
cache/

0 commit comments

Comments
 (0)