Skip to content

Commit

Permalink
Update to 2024-lts
Browse files Browse the repository at this point in the history
  • Loading branch information
manisandro committed Jan 16, 2024
1 parent 9b48fc9 commit bfd5969
Show file tree
Hide file tree
Showing 12 changed files with 3,072 additions and 3,648 deletions.
4 changes: 2 additions & 2 deletions .babelrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread"
"@babel/plugin-transform-class-properties",
"@babel/plugin-transform-object-rest-spread"
],
"presets": [
[
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM sourcepole/qwc-map-viewer-base:v2023.10-lts
FROM sourcepole/qwc-map-viewer-base:latest-2024-lts

COPY prod/ /qwc2
2 changes: 1 addition & 1 deletion js/appConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default {
EditingPlugin: EditingPlugin(),
MapComparePlugin: MapComparePlugin,
HeightProfilePlugin: HeightProfilePlugin,
MapInfoTooltipPlugin: MapInfoTooltipPlugin,
MapInfoTooltipPlugin: MapInfoTooltipPlugin(),
AuthenticationPlugin: AuthenticationPlugin,
PlotInfoToolPlugin: PlotInfoToolPlugin,
LandRegisterExtractPlugin: LandRegisterExtractPlugin,
Expand Down
4 changes: 2 additions & 2 deletions js/plugins/CCCEditSupport.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {connect} from 'react-redux';
import uuid from 'uuid';
import {v4 as uuidv4} from 'uuid';
import ol from 'openlayers';

import {changeCCCState} from './actions/ccc';
Expand Down Expand Up @@ -99,7 +99,7 @@ class CCCEditSupport extends React.Component {
});
drawInteraction.on('drawstart', (evt) => {
this.currentFeature = evt.feature;
this.currentFeature.setId(uuid.v4());
this.currentFeature.setId(uuidv4());
}, this);
drawInteraction.on('drawend', () => {
const feature = this.currentFeature;
Expand Down
6 changes: 3 additions & 3 deletions js/plugins/CCCInterface.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
import {connect} from 'react-redux';
import assign from 'object-assign';
import axios from 'axios';
import uuid from 'uuid';
import {v4 as uuidv4} from 'uuid';
import ol from 'openlayers';
import ConfigUtils from 'qwc2/utils/ConfigUtils';
import CoordinatesUtils from 'qwc2/utils/CoordinatesUtils';
Expand Down Expand Up @@ -163,7 +163,7 @@ class CCCInterface extends React.Component {
this.stopEdit();
const feature = {
type: "Feature",
id: uuid.v4(),
id: uuidv4(),
geometry: message.data
};
this.zoomToFeature(feature);
Expand All @@ -178,7 +178,7 @@ class CCCInterface extends React.Component {
this.stopEdit();
const feature = {
type: "Feature",
id: uuid.v4(),
id: uuidv4(),
geometry: message.data
};
this.zoomToFeature(feature);
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
"qwc2-extra"
],
"devDependencies": {
"babel-loader": "8.2.3",
"clean-webpack-plugin": "4.0.0",
"copy-webpack-plugin": "9.0.0",
"css-loader": "6.4.0",
"eslint": "7.32.0",
"babel-loader": "^9.1.3",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"eslint": "^8.56.0",
"eslint-plugin-react": "7.26.1",
"html-webpack-plugin": "5.4.0",
"source-map-loader": "3.0.0",
"string-replace-loader": "3.0.3",
"style-loader": "3.3.1",
"webpack": "5.59.1",
"webpack-bundle-size-analyzer": "3.1.0",
"webpack-cli": "4.9.1",
"webpack-dev-server": "4.3.1"
"html-webpack-plugin": "^5.5.4",
"source-map-loader": "^4.0.1",
"string-replace-loader": "^3.1.0",
"style-loader": "^3.3.3",
"webpack": "^5.89.0",
"webpack-bundle-size-analyzer": "^3.1.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
"scripts": {
"prod": "npm run tsupdate && npm run themesconfig && npm run iconfont && webpack --mode production --progress",
Expand Down
2 changes: 1 addition & 1 deletion qwc2
Submodule qwc2 updated 298 files
2 changes: 1 addition & 1 deletion qwc2-extra
Loading

0 comments on commit bfd5969

Please sign in to comment.