Skip to content

Commit

Permalink
Merge pull request #208 from NFDI4Chem/update-nmrium-54
Browse files Browse the repository at this point in the history
feat: update nmrium to version 0.54.0
CS76 authored May 7, 2024
2 parents fdd7699 + 9072241 commit 8131c4f
Showing 4 changed files with 2,198 additions and 1,776 deletions.
1,995 changes: 1,138 additions & 857 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -12,16 +12,16 @@
"node": "20.2.0"
},
"dependencies": {
"@blueprintjs/core": "^5.10.1",
"@blueprintjs/core": "^5.10.2",
"@blueprintjs/icons": "^5.9.0",
"@emotion/react": "^11.11.4",
"fifo-logger": "^0.6.1",
"fifo-logger": "^1.0.0",
"filelist-utils": "^1.11.0",
"nmr-load-save": "^0.29.1",
"nmr-processing": "^12.0.2",
"nmrium": "^0.53.0",
"react-science": "^1.0.2",
"vite-plugin-pwa": "^0.19.7"
"nmr-load-save": "^0.31.0",
"nmr-processing": "^12.2.0",
"nmrium": "^0.54.0",
"react-science": "^3.1.0",
"vite-plugin-pwa": "^0.20.0"
},
"scripts": {
"start": "vite --host localhost --port 3000 --open",
@@ -42,25 +42,25 @@
"@babel/plugin-transform-modules-commonjs": "^7.24.1",
"@babel/preset-react": "^7.24.1",
"@babel/preset-typescript": "^7.24.1",
"@playwright/test": "^1.42.1",
"@playwright/test": "^1.44.0",
"@simbathesailor/use-what-changed": "^2.0.0",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.30",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.22",
"@types/node": "^20.12.10",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react-swc": "^3.6.0",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint-config-cheminfo-react": "^11.0.1",
"eslint-config-cheminfo-typescript": "^12.2.0",
"eslint-config-cheminfo-typescript": "^12.4.0",
"jest": "^29.7.0",
"prettier": "3.2.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3",
"serve": "^14.2.1",
"typescript": "^5.4.3",
"vite": "^5.2.6"
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.23.0",
"serve": "^14.2.3",
"typescript": "^5.4.5",
"vite": "^5.2.11"
}
}
23 changes: 13 additions & 10 deletions src/hooks/useLoadSpectra.ts
Original file line number Diff line number Diff line change
@@ -18,16 +18,19 @@ type DeepPartial<T> = {
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
};

const logger = new FifoLogger({
onChange: (log) => {
if (log && ['error', 'fatal', 'warn'].includes(log.levelLabel)) {
const error = log?.error || new Error(log?.message);
events.trigger('error', error);
// eslint-disable-next-line no-console
console.log(error);
}
},
});
const logger = new FifoLogger();

function handleLogger({ detail: { logs } }) {
const log = logs.at(-1);
if (log && ['error', 'fatal', 'warn'].includes(log.levelLabel)) {
const error = log?.error || new Error(log?.message);
events.trigger('error', error);
// eslint-disable-next-line no-console
console.log(error);
}
}

logger.addEventListener('change', handleLogger);

const PARSING_OPTIONS: Partial<ParsingOptions> = {
onLoadProcessing: { autoProcessing: true },
1,920 changes: 1,029 additions & 891 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 8131c4f

Please sign in to comment.