Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update branch prod-2-9-advance #1604

Merged
merged 2 commits into from
Feb 21, 2025
Merged

Update branch prod-2-9-advance #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf7b8a7
Sync versions from prod-2-9
sbrunner Feb 21, 2025
c242a99
Update from base branch
geo-ghci-int[bot] Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tag-publish/0.13.3/tag_publish/schema.json

docker:
images:
- name: camptocamp/geomapfishdemo-config
- name: camptocamp/geomapfishdemo-custom

dispatch:
- {}
7 changes: 6 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,12 @@ repos:
rev: 0.1.0
hooks:
- id: jsonschema-validator
files: ^ci/config\.yaml$
files: |-
(?x)^(
\.github/publish\.yaml
|\.github/ghci\.yaml
|CONST_create_template/ci/config\.yaml
)$
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 37.428.1
hooks:
Expand Down
25 changes: 5 additions & 20 deletions ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
},
"devDependencies": {
"@rollup/plugin-inject": "5.0.5",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-basic-ssl": "1.2.0",
"sass-embedded": "1.83.4",
"typescript": "5.7.3",
"vite": "6.0.11"
},
"dependencies": {
"ngeo": "2.9.0-version-2.9-latest.20250212T103831Z.543fd60da.2.9"
"ngeo": "2.9.0-version-2.9-latest.20250217T102837Z.71410b4b6.2.9"
},
"alias": {
"ngeo/": "ngeo/distlib/src/",
Expand Down
3 changes: 1 addition & 2 deletions ui/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"ngeo/*": ["node_modules/ngeo/distlib/src"],
"gmf/*": ["node_modules/ngeo/distlib/src"],
"gmfapi/*": ["node_modules/ngeo/distlib/srcapi"],
"api/*": ["node_modules/ngeo/distlib/api"],
"jquery-ui/datepicker": ["node_modules/jquery-ui/ui/widgets/datepicker"] // For angular-ui-date
"api/*": ["node_modules/ngeo/distlib/api"]
},

"target": "ES2020",
Expand Down
5 changes: 0 additions & 5 deletions ui/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export default defineConfig({
'gmf': path.resolve(__dirname, 'node_modules/ngeo/distlib/src'),
'gmfapi': path.resolve(__dirname, 'node_modules/ngeo/distlib/srcapi'),
'api': path.resolve(__dirname, 'node_modules/ngeo/distlib/api'),
'jquery-ui/datepicker': path.resolve(__dirname, 'empty.js'), // For angular-ui-date
// Save about of 45k os bandwidth (gzipped) by unworking ignoring import done by a script downloaded from a CDN.
'jquery-datetimepicker/jquery.datetimepicker': path.resolve(__dirname, 'empty.js'),
'bootstrap/js/src/popover': path.resolve(__dirname, 'empty.js'),
Expand All @@ -62,10 +61,6 @@ export default defineConfig({
'jquery-ui/ui/widgets/resizable': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/widgets/slider': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/widgets/sortable': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/i18n/datepicker-fr': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/i18n/datepicker-en-GB': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/i18n/datepicker-de': path.resolve(__dirname, 'empty.js'),
'jquery-ui/ui/i18n/datepicker-it': path.resolve(__dirname, 'empty.js'),
'jquery-ui': path.resolve(__dirname, 'empty.js'),
},
},
Expand Down
Loading