Skip to content

Commit

Permalink
Merge branch 'watergis:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JinIgarashi authored Jul 14, 2023
2 parents 94f1f5d + 16394bf commit efd255e
Show file tree
Hide file tree
Showing 5 changed files with 450 additions and 230 deletions.
28 changes: 19 additions & 9 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
module.exports = {
root: true,
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:svelte/recommended',
'prettier'
],
parser: '@typescript-eslint/parser',
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
plugins: ['svelte3', '@typescript-eslint'],
ignorePatterns: ['*.cjs'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
settings: {
'svelte3/typescript': () => require('typescript')
},
plugins: ['@typescript-eslint'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
ecmaVersion: 2020,
extraFileExtensions: ['.svelte']
},
env: {
browser: true,
es2017: true,
node: true
}
},
overrides: [
{
files: ['*.svelte'],
parser: 'svelte-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser'
}
}
]
};
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@
"@sveltejs/kit": "^1.22.3",
"@types/events": "^3.0.0",
"@types/node": "^20.4.2",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@watergis/maplibre-center-icon": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@watergis/maplibre-center-icon": "^2.0.0",
"@watergis/maplibre-gl-area-switcher": "^1.0.0",
"@watergis/svelte-collapsible-panel": "^0.0.16",
"@watergis/svelte-maplibre-attribute-popup": "^1.0.0",
"@watergis/svelte-maplibre-attribute-table": "^0.0.8",
"@watergis/svelte-maplibre-export": "^1.0.1",
"@watergis/svelte-maplibre-legend": "^1.0.0",
"@watergis/svelte-maplibre-measure": "^1.0.0",
"@watergis/svelte-maplibre-menu": "^1.0.2",
"@watergis/svelte-maplibre-share": "^1.0.0",
"@watergis/svelte-maplibre-style-switcher": "^1.0.0",
"@watergis/svelte-maplibre-valhalla": "^1.0.0",
"@watergis/svelte-collapsible-panel": "^1.0.0",
"@watergis/svelte-maplibre-attribute-popup": "^2.0.0",
"@watergis/svelte-maplibre-attribute-table": "^1.0.0",
"@watergis/svelte-maplibre-export": "^2.0.0",
"@watergis/svelte-maplibre-legend": "^2.0.0",
"@watergis/svelte-maplibre-measure": "^2.0.0",
"@watergis/svelte-maplibre-menu": "^2.0.0",
"@watergis/svelte-maplibre-share": "^2.0.0",
"@watergis/svelte-maplibre-style-switcher": "^2.0.0",
"@watergis/svelte-maplibre-valhalla": "^2.0.0",
"buffer": "^6.0.3",
"bulma": "^0.9.4",
"eslint": "^8.44.0",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-svelte3": "^4.0.0",
"eslint-plugin-svelte": "^2.32.2",
"events": "^3.3.0",
"maplibre-gl": "^3.2.0",
"prettier": "^2.8.8",
"prettier-plugin-svelte": "^2.10.1",
"rimraf": "^5.0.1",
"sass": "^1.63.6",
"svelte": "^3.59.2",
"svelte": "^4.0.5",
"svelte-check": "^3.4.6",
"svelte-fa": "^3.0.4",
"svelte-preprocess": "^5.0.4",
Expand Down
Loading

0 comments on commit efd255e

Please sign in to comment.