From c0bfc39929f1618d57b040139f6c0540dfd7059f Mon Sep 17 00:00:00 2001 From: jenkinsEdificePublic Date: Wed, 3 Jun 2026 14:54:08 +0200 Subject: [PATCH 1/6] chore: prepare next development iteration --- backend/pom.xml | 8 ++++---- frontend/package.json.template | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 6c544eb6..db10c403 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -11,10 +11,10 @@ com.opendigitaleducation explorer - 2.6-SNAPSHOT + 2.6-develop-pedago-SNAPSHOT - 6.15-SNAPSHOT - 6.15-SNAPSHOT + 6.15-develop-pedago-SNAPSHOT + 6.15-develop-pedago-SNAPSHOT 3.0-SNAPSHOT 2.2-SNAPSHOT 2.1 @@ -23,7 +23,7 @@ edificeio https://sonarcloud.io 2.2-SNAPSHOT - 4.2-SNAPSHOT + 4.2-develop-pedago-SNAPSHOT scm:git:https://github.com/edificeio/explorer.git diff --git a/frontend/package.json.template b/frontend/package.json.template index fed0880f..375044f0 100644 --- a/frontend/package.json.template +++ b/frontend/package.json.template @@ -1,6 +1,6 @@ { "name": "ode-explorer", - "version": "2.6.0-%branch%.%generateVersion%", + "version": "2.6-%branch%.%generateVersion%", "description": "Edifice Explorer", "homepage": "https://github.com/edificeio/explorer#readme", "bugs": { From acd7b933912a2685689bacc63f2547c9646b736f Mon Sep 17 00:00:00 2001 From: Nabil Mansouri Date: Mon, 8 Jun 2026 13:30:45 +0200 Subject: [PATCH 2/6] chore: use correct npm version in package.json.template --- frontend/package.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json.template b/frontend/package.json.template index 375044f0..fed0880f 100644 --- a/frontend/package.json.template +++ b/frontend/package.json.template @@ -1,6 +1,6 @@ { "name": "ode-explorer", - "version": "2.6-%branch%.%generateVersion%", + "version": "2.6.0-%branch%.%generateVersion%", "description": "Edifice Explorer", "homepage": "https://github.com/edificeio/explorer#readme", "bugs": { From 9a6dd9b7cecaf306b82517d9f6d7149a2e6e1a27 Mon Sep 17 00:00:00 2001 From: Nabil Mansouri Date: Tue, 21 Apr 2026 15:19:52 +0200 Subject: [PATCH 3/6] fix: #ENABLING-722, build lib to dist/lib for recipe deployment --- frontend/package.json | 5 ++--- frontend/vite.config.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 2705b733..154bc7ac 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,13 +15,12 @@ "type": "module", "exports": { "./lib": { - "import": "./lib/index.js", - "types": "./lib/index.d.ts" + "import": "./dist/lib/index.js", + "types": "./dist/lib/index.d.ts" } }, "files": [ "dist/!(assets)", - "lib", "*.d.ts" ], "scripts": { diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 99d2858c..030edc0b 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -86,7 +86,7 @@ export default ({ mode }: { mode: string }) => { }; const buildLib: BuildOptions = { - outDir: 'lib', + outDir: 'dist/lib', lib: { entry: { index: resolve(__dirname, 'src/index.ts'), From 90d2626e0c97fb0e002c223fb6229a49b50d709e Mon Sep 17 00:00:00 2001 From: Nabil Mansouri Date: Tue, 21 Apr 2026 15:49:54 +0200 Subject: [PATCH 4/6] fix: #ENABLING-722, bundlue with external deps --- frontend/package.json | 2 +- frontend/vite.config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 154bc7ac..dfefc6f0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -103,4 +103,4 @@ "node": "18 || 20" }, "nx": {} -} \ No newline at end of file +} diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 030edc0b..43cbb5af 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -95,7 +95,7 @@ export default ({ mode }: { mode: string }) => { }, rollupOptions: { treeshake: true, - external: [...Object.keys(dependencies || {}), 'react/jsx-runtime'], + //external: [...Object.keys(dependencies || {}), 'react/jsx-runtime'], output: { entryFileNames: `[name].js`, chunkFileNames: `[name].js`, From 0caa67ea5229e811fe47d88e41ce3f32aa9a8949 Mon Sep 17 00:00:00 2001 From: Nabil Mansouri Date: Tue, 21 Apr 2026 17:03:08 +0200 Subject: [PATCH 5/6] fix(ode-explorer): #ENABLING-722, externalize react to use shared ESM build --- frontend/vite.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 43cbb5af..d8f313e4 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -62,6 +62,7 @@ export default ({ mode }: { mode: string }) => { assetsDir: '', // Put assets at root of dist cssCodeSplit: false, rollupOptions: { + external: ['react', 'react-dom', 'react/jsx-runtime'], output: [ { inlineDynamicImports: true, @@ -95,7 +96,7 @@ export default ({ mode }: { mode: string }) => { }, rollupOptions: { treeshake: true, - //external: [...Object.keys(dependencies || {}), 'react/jsx-runtime'], + external: ['react', 'react-dom', 'react/jsx-runtime'], output: { entryFileNames: `[name].js`, chunkFileNames: `[name].js`, From a6035f42a48c0c3071be10be13b59e01d8a42038 Mon Sep 17 00:00:00 2001 From: Nabil Mansouri Date: Tue, 19 May 2026 15:10:05 +0200 Subject: [PATCH 6/6] chore: update deps --- frontend/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index dfefc6f0..b3b85f9c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -50,9 +50,9 @@ "dependencies": { "@dnd-kit/core": "^6.1.0", "@dnd-kit/modifiers": "7.0.0", - "@edifice.io/react": "develop-pedago", - "@edifice.io/bootstrap": "develop-pedago", - "@edifice.io/client": "develop-pedago", + "@edifice.io/bootstrap": "feat-ENABLING-722", + "@edifice.io/client": "feat-ENABLING-722", + "@edifice.io/react": "feat-ENABLING-722", "@react-spring/web": "9.7.3", "@tanstack/react-query": "5.62.7", "clsx": "2.1.1",