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 b/frontend/package.json index 2705b733..b3b85f9c 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": { @@ -51,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", @@ -104,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 99d2858c..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, @@ -86,7 +87,7 @@ export default ({ mode }: { mode: string }) => { }; const buildLib: BuildOptions = { - outDir: 'lib', + outDir: 'dist/lib', lib: { entry: { index: resolve(__dirname, 'src/index.ts'), @@ -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`,