Skip to content

Commit

Permalink
Firefly-1513: Upgrade packages
Browse files Browse the repository at this point in the history
   - minor upgrades some of firefly packages that are out of date
   - babel was already updated with the ESlint build
  • Loading branch information
robyww committed Jul 15, 2024
1 parent 0623824 commit 20d4b2d
Show file tree
Hide file tree
Showing 5 changed files with 659 additions and 1,260 deletions.
12 changes: 5 additions & 7 deletions buildScript/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/* eslint-env node */
/* global process */

import webpack from 'webpack';
import TerserPlugin from 'terser-webpack-plugin';
import path from 'path';
import fs from 'fs';


const exclude_dirs = /(node_modules|java|python|config|test)/;

process.traceDeprecation = true;

/**
Expand Down Expand Up @@ -138,12 +137,12 @@ export default function makeWebpackConfig(config) {
['@babel/preset-env',
{
targets: {
browsers: ['safari >= 12', 'chrome >= 90', 'firefox >= 90', 'edge >= 90']
browsers: ['safari >= 15', 'chrome >= 115', 'firefox >= 115', 'edge >= 115']
},
debug: false,
modules: false, // preserve application module style - in our case es6 modules
useBuiltIns : 'usage',
corejs: 3
corejs: '3.37' // should specify the minor version: https://babeljs.io/docs/babel-preset-env#corejs
}
],
'@babel/preset-react'
Expand Down Expand Up @@ -196,7 +195,6 @@ export default function makeWebpackConfig(config) {
cached: false,
children: true,
excludeModules: () => true,

},
performance: { hints: false } // Warning disabled the references: https://webpack.js.org/guides/code-splitting/
};
Expand All @@ -215,9 +213,9 @@ function firefly_loader(loadScript, outpath, nameRoot, loaderPostfix, localBuild
return function () {
this.hooks.done.tap('done',
(stats) => {
// not we not get the hash from stats.compilation.hash not stats.compilation.fullHash
// now we get the hash from stats.compilation.hash not stats.compilation.fullHash
// this is what matches [fullhash] for the filename
// this is not very consistent so we should watch it in the future
// this is not very consistent, so we should watch it in the future
const hash = localBuild ? 'dev' : stats.compilation.hash;

const loaderScript= getLoadScript(nameRoot,loaderPostfix);
Expand Down
1 change: 1 addition & 0 deletions package-json-doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ JSDoc packages:
- jsdoc-jsx
- ink-docstrap
- publish-release
- taffydb - JSDoc claims not to need this for 4.0 but I think ink-docstrap needs it

#### `ESLint`
ESLint is completely up to date. We should always keep this up-to-date
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mui/material": "^5.15",
"@mui/x-date-pickers": "^6.19",
"blissfuljs": "~1.0",
"core-js": "~3.31",
"core-js": "~3.37",
"enum": "~3.0",
"fixed-data-table-2": "~2.0.4",
"immutability-helper": "~3.1",
Expand All @@ -26,7 +26,7 @@
"local-storage": "~2.0",
"lodash": "~4.17",
"md5": "~2.3.0",
"moment": "~2.29",
"moment": "~2.30",
"point-in-polygon": "~1.1",
"prismjs": "~1.29",
"prop-types": "~15.8",
Expand All @@ -39,17 +39,17 @@
"react-grid-layout": "~1.3",
"react-router-dom": "^6.14.0",
"react-sizeme": "~3.0",
"react-slick": "^0.29.0",
"react-slick": "~0.30",
"react-split-pane": "~0.1",
"redux": "~3.7",
"redux-logger": "~3.0",
"redux-saga": "~1.1",
"redux-thunk": "~2.4",
"regenerator-runtime": "~0.13",
"regenerator-runtime": "~0.14",
"shallowequal": "~1.1",
"slick-carousel": "^1.8.1",
"slug": "~8.2",
"validator": "~13.9"
"slug": "~9.1",
"validator": "~13.12"
},
"devDependencies": {
"@babel/core": "^7.24.7",
Expand All @@ -64,21 +64,22 @@
"babel-jest": "^24.9",
"babel-loader": "^9.1.3",
"babel-plugin-lodash": "^3.3",
"css-loader": "~6.5",
"eslint": "^9.6.0",
"css-loader": "~7.1",
"eslint": "~9.7",
"eslint-plugin-jsdoc": "^48.5.0",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react": "~7.34",
"eslint-plugin-react-hooks": "^4.6.2",
"globals": "^15.6.0",
"globals": "~15.8",
"ink-docstrap": "~1.3",
"jest": "^24.9",
"jsdoc": "3.6.7",
"jsdoc": "~4.0",
"jsdoc-jsx": "~0.1",
"publish-release": "~1.6",
"style-loader": "~3.3",
"webpack": "^5.92.1",
"webpack-cli": "~4.9",
"style-loader": "~4.0",
"taffydb": "~2.7",
"webpack": "^5.93",
"webpack-cli": "~5.1",
"worker-loader": "^3.0"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/js/api/ApiViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export function getViewer(channel, file=defaultViewerFile, scriptUrl) {

/**
* The interface to remotely communicate to the firefly viewer.
* @public mq/n
* @public
* @namespace firefly.ApiViewer
*/
const viewer= {dispatch, reinitViewer, channel,
Expand Down
Loading

0 comments on commit 20d4b2d

Please sign in to comment.