diff --git a/actions/locale.js b/actions/locale.js index cbfac582b..a24aaa1f5 100644 --- a/actions/locale.js +++ b/actions/locale.js @@ -12,7 +12,7 @@ import localeReducer from '../reducers/locale'; ReducerIndex.register("locale", localeReducer); import axios from 'axios'; -import {getLanguageCountries} from 'country-language'; +import {getLanguageCountries} from '@ladjs/country-language'; import ConfigUtils from '../utils/ConfigUtils'; import {UrlParams} from '../utils/PermaLinkUtils'; import deepmerge from 'deepmerge'; diff --git a/package.json b/package.json index 49df24a51..4e9997fb0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "qwc2", - "version": "2023.11.14-master", + "version": "2023.11.15-master", "description": "QGIS Web Client 2 core", "author": "Sourcepole AG", "license": "BSD-2-Clause", @@ -14,7 +14,7 @@ "chart.js": "^4.4.0", "classnames": "^2.3.2", "clone": "^2.1.2", - "country-language": "^0.1.7", + "@ladjs/country-language": "^1.0.3", "dayjs": "^1.11.7", "deepcopy": "^2.1.0", "deepmerge": "^4.2.2", @@ -34,8 +34,9 @@ "lodash.sortby": "^4.7.0", "mime-to-extensions": "^1.0.2", "mousetrap": "^1.6.5", - "ol": "^7.2.2", + "ol": "^8.2.0", "ol-ext": "^4.0.4", + "ol-mapbox-style": "^12.1.0", "painterro": "^1.2.78", "path-browserify": "^1.0.1", "proj4": "^2.8.1", @@ -63,7 +64,8 @@ "svgpath": "^2.6.0", "timers-browserify": "^2.0.12", "url": "^0.11.0", - "uuid": "^8.3.2" + "uuid": "^8.3.2", + "xml2js": "^0.6.2" }, "devDependencies": { "@babel/core": "^7.23.2", @@ -76,11 +78,10 @@ "@redux-devtools/dock-monitor": "^3.0.1", "@redux-devtools/log-monitor": "^4.0.2", "@types/react": "^18.0.27", - "@vusion/webfonts-generator": "^0.8.0", + "@furkot/webfonts-generator": "^2.0.0", "mkdirp": "^2.1.3", "object-path": "^0.11.8", - "redux-immutable-state-invariant": "^2.1.0", - "xml2js": "^0.4.23" + "redux-immutable-state-invariant": "^2.1.0" }, "babel": { "plugins": [ diff --git a/scripts/makeIconkit.js b/scripts/makeIconkit.js index 2f24e92ba..c6b250de6 100644 --- a/scripts/makeIconkit.js +++ b/scripts/makeIconkit.js @@ -1,4 +1,4 @@ -const webfontsGenerator = require('@vusion/webfonts-generator'); +const webfontsGenerator = require('@furkot/webfonts-generator'); const glob = require('glob'); const mkdirp = require('mkdirp'); const fs = require('fs');