Skip to content

Commit

Permalink
Merge pull request #1604 from camptocamp/update-prod-2-9-advance
Browse files Browse the repository at this point in the history
Update branch prod-2-9-advance
  • Loading branch information
sbrunner authored Feb 21, 2025
2 parents 6f52e60 + c242a99 commit 501c192
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 30 deletions.
9 changes: 9 additions & 0 deletions .github/publish.yaml
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
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

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
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
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
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

0 comments on commit 501c192

Please sign in to comment.