Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</parent>
<groupId>com.opendigitaleducation</groupId>
<artifactId>explorer</artifactId>
<version>2.6-SNAPSHOT</version>
<version>2.6-develop-pedago-SNAPSHOT</version>
<properties>
<entCoreVersion>6.15-SNAPSHOT</entCoreVersion>
<entCoreLibsVersion>6.15-SNAPSHOT</entCoreLibsVersion>
<entCoreVersion>6.15-develop-pedago-SNAPSHOT</entCoreVersion>
<entCoreLibsVersion>6.15-develop-pedago-SNAPSHOT</entCoreLibsVersion>
<vertxCronTimerVersion>3.0-SNAPSHOT</vertxCronTimerVersion>
<modPostgresVersion>2.2-SNAPSHOT</modPostgresVersion>
<scramVersion>2.1</scramVersion>
Expand All @@ -23,7 +23,7 @@
<sonar.organization>edificeio</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<modJsonSchemaValidatorVersion>2.2-SNAPSHOT</modJsonSchemaValidatorVersion>
<modMongoVersion>4.2-SNAPSHOT</modMongoVersion>
<modMongoVersion>4.2-develop-pedago-SNAPSHOT</modMongoVersion>
</properties>
<scm>
<connection>scm:git:https://github.com/edificeio/explorer.git</connection>
Expand Down
13 changes: 6 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -104,4 +103,4 @@
"node": "18 || 20"
},
"nx": {}
}
}
5 changes: 3 additions & 2 deletions frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'),
Expand All @@ -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`,
Expand Down
Loading