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
3 changes: 2 additions & 1 deletion mycore-vue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ its `yarn.lock` and its local `node_modules`.

`resourcePath` is the path below `target/classes/META-INF/resources` and has to match the `url-pattern` the app
is bound to in the `web-fragment.xml` of the owning module. App specific settings are passed as a second
argument and are merged on top of the shared defaults.
argument and are merged on top of the shared defaults. vite 8 bundles with rolldown, so bundler settings go
below `build.rolldownOptions`, not below the deprecated `build.rollupOptions`.

The `.mts` extension and the explicit `.ts` extension in the import are required: without them vite warns that
the config cannot be loaded natively, because after the migration there is no `package.json` next to the app
Expand Down
5 changes: 4 additions & 1 deletion mycore-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"build-only:texteditor": "vite build --config ../mycore-webtools/src/main/vue/texteditor/vite.config.mts",
"type-check:texteditor": "vue-tsc --noEmit -p ../mycore-webtools/src/main/vue/texteditor/tsconfig.json",
"dev:texteditor": "vite --config ../mycore-webtools/src/main/vue/texteditor/vite.config.mts",
"build:processing": "vite build --config ../mycore-webtools/src/main/vue/processing/vite.config.mts",
"build:processing": "run-s type-check:processing build-only:processing",
"build-only:processing": "vite build --config ../mycore-webtools/src/main/vue/processing/vite.config.mts",
"type-check:processing": "vue-tsc --noEmit -p ../mycore-webtools/src/main/vue/processing/tsconfig.json",
"dev:processing": "vite --config ../mycore-webtools/src/main/vue/processing/vite.config.mts",
"build:jobqueue": "vite build --config ../mycore-jobqueue/src/main/vue/jobqueue/vite.config.mts",
"build:webcli": "vite build --config ../mycore-webcli/src/main/vue/webcli/vite.config.mts",
"build:access-key-manager": "vite build --config ../mycore-acl/src/main/vue/access-key-manager2/vite.config.mts",
Expand Down
15 changes: 2 additions & 13 deletions mycore-webtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,15 @@
<arguments>build:texteditor</arguments>
</configuration>
</execution>
<execution>
<id>yarn-install-processing</id>
<goals>
<goal>yarn</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>${basedir}/src/main/vue/processing</workingDirectory>
<arguments>install ${yarn.install.args}</arguments>
</configuration>
</execution>
<execution>
<id>yarn-build-processing</id>
<goals>
<goal>yarn</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>${basedir}/src/main/vue/processing</workingDirectory>
<arguments>build</arguments>
<workingDirectory>${basedir}/../mycore-vue</workingDirectory>
<arguments>build:processing</arguments>
</configuration>
</execution>
</executions>
Expand Down
21 changes: 18 additions & 3 deletions mycore-webtools/src/main/vue/processing/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
# processing

### Build
The toolchain is shared by all MyCoRe Vue apps and lives in `mycore-vue`, so
all commands are run from there.

### Install dependencies

```sh
yarn
cd ../../../../../mycore-vue && yarn
```

### Compile and Hot-Reload for Development

```sh
yarn dev
yarn dev:processing
```

### Type-check

```sh
yarn type-check:processing
```

### Build

```sh
yarn build:processing
```
23 changes: 0 additions & 23 deletions mycore-webtools/src/main/vue/processing/package.json

This file was deleted.

2 changes: 1 addition & 1 deletion mycore-webtools/src/main/vue/processing/src/vite-env.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/// <reference types="vite/client" />
/// <reference path="../../../../../../mycore-vue/env.d.ts" />
14 changes: 0 additions & 14 deletions mycore-webtools/src/main/vue/processing/tsconfig.app.json

This file was deleted.

22 changes: 17 additions & 5 deletions mycore-webtools/src/main/vue/processing/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"files": [],
"references": [
{ "path": "./tsconfig.app.json" },
{ "path": "./tsconfig.node.json" }
]
"extends": "../../../../../mycore-vue/tsconfig.json",
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue", "vite.config.mts"],
"compilerOptions": {
"baseUrl": ".",
"typeRoots": ["../../../../../mycore-vue/node_modules/@types"],
"paths": {
"*": [
"../../../../../mycore-vue/node_modules/@types/*",
"../../../../../mycore-vue/node_modules/*"
]
},
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
}
}
24 changes: 0 additions & 24 deletions mycore-webtools/src/main/vue/processing/tsconfig.node.json

This file was deleted.

17 changes: 17 additions & 0 deletions mycore-webtools/src/main/vue/processing/vite.config.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { defineMCRVueApp } from '../../../../../mycore-vue/vite.shared.ts';

export default defineMCRVueApp(
{
configUrl: import.meta.url,
name: 'processing',
resourcePath: 'modules/webtools/processing',
},
{
build: {
// bootstrap is provided by the surrounding MyCoRe page
rolldownOptions: {
external: ['bootstrap'],
},
},
}
);
23 changes: 0 additions & 23 deletions mycore-webtools/src/main/vue/processing/vite.config.ts

This file was deleted.

Loading