From cdbf003327cd19ad07e38b53d6430f5e030479a0 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 28 Apr 2025 12:52:33 +0200 Subject: [PATCH 1/5] chore(docker): ignore package-lock.json when copy files --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 49512c6..0ae5001 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ node_modules build +package-lock.json .dockerignore Dockerfile Dockerfile.prod From 08ae9393a165fb9db14f6b93b3ff959eecb50f48 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Mon, 28 Apr 2025 13:08:44 +0200 Subject: [PATCH 2/5] chore(workflow): update production deployment workflow --- .github/workflows/prod-build.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index c726e91..a7bae6d 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -64,14 +64,21 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} # Build npm for release - - name: Build npm + - name: Clean and build npm run: |- + echo "Cleaning node_modules and lock file to avoid native module issues..." + rm -rf node_modules package-lock.json + npm cache clean --force + + echo "Installing dependencies..." npm install - # Build for main distribution + + echo "Building for main distribution..." VITE_BUILD_OUT_DIR=dist npm run build - # Build for specific version + + echo "Building for release version: ${{ steps.fetch-latest-release.outputs.tag_name }}" VITE_BUILD_OUT_DIR=releases/${{ steps.fetch-latest-release.outputs.tag_name }} npm run build - + # Commit - name: Commit to repo uses: EndBug/add-and-commit@v9.1.4 From 3279ff6e468a421ab3e33f455cdfa8d1e58400a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 08:54:39 +0000 Subject: [PATCH 3/5] chore(main): release 0.9.0 --- CHANGELOG.md | 21 +++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 912a23f..0f850d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.9.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/compare/v0.8.0...v0.9.0) (2025-04-25) + + +### Features + +* update NMRium beta to version 0.62.1-pre.1742933761 ([bfcc475](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/bfcc4759b36b4e12e927b266bb5c3cc408cddb99)) +* update NMRium to version 0.59.0 ([9ce10e2](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/9ce10e2af987de866da733e821cd243e0c00d273)) +* update nmrium to version 0.62.1 ([ce6a04f](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/ce6a04fecf7e7e36f599714090454587e5273462)) +* update NMRium to version 0.62.1 ([58b93f2](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/58b93f2c4492d46e300fa2c9315233f317323d5b)) +* upgrade NMRium to beta version 0.61 ([c785266](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/c785266d3c13716f251f35e861b3425d9df734b4)) +* validate origins based on hostnames ([57edf5c](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/57edf5c52fc75adbc4c4007bdc65a71e9cded528)), closes [#223](https://github.com/NFDI4Chem/nmrium-react-wrapper/issues/223) + + +### Bug Fixes + +* correct invalid url in the whitelist ([5d32319](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/5d323193724c134cecb1d5a0de28b1e8695a3498)) +* updated default release version to latest ([07638d2](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/07638d215a84d7e12a7913acda62a2ae4f3e4bf0)) +* updated docker files for VM based deployments ([36fd947](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/36fd947e9d0c1b36bbbabbf024ee34d72fc37346)) +* various build updates and bug fixes ([2b45110](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/2b4511055eb2af28989c42ed7c7248408fbb9af0)) +* various workflow updates, docker file changes and old files tidy up ([45a4695](https://github.com/NFDI4Chem/nmrium-react-wrapper/commit/45a46954170ab10113f0fb1eda79648c4b0626b6)) + ## [1.0.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/compare/v0.9.0...v1.0.0) (2024-06-21) diff --git a/package-lock.json b/package-lock.json index 0334109..b0e1eb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "NMRiumWrapper", - "version": "1.0.0", + "version": "0.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "NMRiumWrapper", - "version": "1.0.0", + "version": "0.9.0", "license": "MIT", "dependencies": { "@blueprintjs/core": "^5.18.0", diff --git a/package.json b/package.json index 540b7b3..42d9e6c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "NMRiumWrapper", - "version": "1.0.0", + "version": "0.9.0", "private": false, "license": "MIT", "type": "module", From 01373f403f49dc9b832a1b0a54e76969867541e2 Mon Sep 17 00:00:00 2001 From: hamed musallam Date: Tue, 6 May 2025 12:48:54 +0200 Subject: [PATCH 4/5] chore(deployment): test deployment to development environment --- src/demo/NMRiumWrapperDemo.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/demo/NMRiumWrapperDemo.tsx b/src/demo/NMRiumWrapperDemo.tsx index 9140c6b..c484609 100644 --- a/src/demo/NMRiumWrapperDemo.tsx +++ b/src/demo/NMRiumWrapperDemo.tsx @@ -33,6 +33,7 @@ export default function NMRiumWrapperDemo() { type: 'nmrium', }); }} + intent="primary" > Test load from json From fe04ea68143597ca907d789686a3bbc05f61cb86 Mon Sep 17 00:00:00 2001 From: Chandu Nainala Date: Wed, 4 Jun 2025 09:34:38 +0200 Subject: [PATCH 5/5] Update allowed-origins.json --- src/allowed-origins.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/allowed-origins.json b/src/allowed-origins.json index b97d4f9..10215f6 100644 --- a/src/allowed-origins.json +++ b/src/allowed-origins.json @@ -4,6 +4,7 @@ "http://nmriumdev.nmrxiv.org", "https://nmriumdev.nmrxiv.org", "https://nmrxiv.org", + "https://www.nmrxiv.org", "https://dev.nmrxiv.org", "https://chemotion.uni-jena.de", "http://localhost", @@ -40,4 +41,4 @@ "https://test1.eln.chemotion.scc.kit.edu", "https://test.chemdev.scc.kit.edu", "http://5.10.12.108" -] \ No newline at end of file +]