Skip to content

Commit

Permalink
Merge pull request #1751 from ZakarFin/lib-updates
Browse files Browse the repository at this point in the history
Update latest versions for most dependencies
  • Loading branch information
ZakarFin authored Sep 2, 2024
2 parents 42bfca8 + 92c7ecc commit f2daf59
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 12 deletions.
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"postinstall": "node webpack/hacks/postinstall.js"
},
"dependencies": {
"@ant-design/icons": "4.6.3",
"@ant-design/icons": "4.7.0",
"@babel/core": "7.25.2",
"@babel/preset-env": "7.25.4",
"@babel/preset-react": "7.24.7",
Expand Down Expand Up @@ -61,12 +61,12 @@
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.32.2",
"expose-loader": "0.7.5",
"file-loader": "4.2.0",
"fs-extra": "8.1.0",
"expose-loader": "1.0.3",
"file-loader": "6.2.0",
"fs-extra": "10.0.1",
"geostats": "2.0.0",
"gm": "1.23.1",
"imports-loader": "0.8.0",
"imports-loader": "1.2.0",
"intl-messageformat": "9.11.4",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
Expand All @@ -76,25 +76,26 @@
"less-loader": "5.0.0",
"lodash": "4.17.21",
"merge": "2.1.1",
"mini-css-extract-plugin": "0.8.0",
"mini-css-extract-plugin": "1.6.2",
"mobile-detect": "1.4.5",
"ol": "9.2.4",
"ol-mapbox-style": "12.3.5",
"olcs": "2.20",
"optimize-css-assets-webpack-plugin": "5.0.3",
"optimize-css-assets-webpack-plugin": "5.0.8",
"query-string": "6.8.3",
"react": "16.14.0",
"react-beautiful-dnd": "13.1.0",
"react-dom": "16.14.0",
"sass": "1.77.8",
"sass-loader": "10.5.2",
"script-loader": "0.7.2",
"style-loader": "1.0.0",
"style-loader": "2.0.0",
"styled-components": "5.3.3",
"sumoselect": "3.0.5",
"uglifyjs-webpack-plugin": "2.2.0",
"webpack": "4.47.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.15.2"
"webpack-dev-server": "4.15.2",
"webpackbar": "5.0.2"
}
}
10 changes: 9 additions & 1 deletion webpack/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ const getExcludedNodeModules = (modules, blacklisted = true) => {
};

const BABEL_LOADER_RULE = {
/* eslint-disable array-bracket-spacing */
test: /\.(js|jsx)$/,
exclude: [
/libraries/,
Expand Down Expand Up @@ -123,7 +124,14 @@ const getModuleRules = (isProd = false, antThemeFile) => {
const rules = [
{
test: require.resolve('sumoselect'),
use: 'imports-loader?define=>undefined,exports=>undefined'
use: [{
loader: 'imports-loader',
options: {
imports: [
'side-effects sumoselect'
]
}
}]
},
BABEL_LOADER_RULE,
...styleFileRules,
Expand Down
2 changes: 2 additions & 0 deletions webpack/generateEntries.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ const path = require('path');
const { IgnorePlugin } = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const LocalizationPlugin = require('./localizationPlugin.js');
const WebpackBar = require('webpackbar');
const { existsSync } = require('fs');

module.exports = function generateEntries (appsetupPaths, isProd, context) {
const entries = {};
const plugins = [
new WebpackBar(),
new IgnorePlugin(/^\.\/locale$/, /moment$/),
new CopyWebpackPlugin(
[
Expand Down
2 changes: 1 addition & 1 deletion webpack/oskari-core.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/no-webpack-loader-syntax, import/no-unresolved */
// libraries

import 'expose-loader?jQuery!jquery';
import 'expose-loader?exposes=jQuery!jquery';
import '../src/polyfills.js';

// Oskari global
Expand Down
2 changes: 1 addition & 1 deletion webpack/oskariLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = function (source) {

const output = source + '\n' + dependencies.map(d => {
if (d.expose) {
return `import 'expose-loader?${d.expose}!${d.src}'`;
return `import 'expose-loader?exposes=${d.expose}!${d.src}'`;
}
return `import '${d.src}'`;
}).join('\n');
Expand Down

0 comments on commit f2daf59

Please sign in to comment.