Skip to content

Commit

Permalink
Merge pull request #93 from tallence/2207-upgrade
Browse files Browse the repository at this point in the history 
2207 upgrade
  • Loading branch information
Timo Lemke authored Aug 17, 2022
2 parents 8c19a1b + e52380b commit f1ee6e3
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 260 deletions.
7 changes: 3 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ Form-Actions and -fields can be customized and added by your need.

# Getting started

The extension runs with CoreMedia 11 (v2201.2). And also runs with:
- v2110.1. See the release [cmcc-11-2110.1](https://github.com/tallence/core-forms/releases/tag/cmcc-11-2110.1).
- v2107.1. See the release [cmcc-10-2107.1](https://github.com/tallence/core-forms/releases/tag/cmcc-10-2107.1).
See the [releases](https://github.com/tallence/core-forms/releases) for tested compatibilities.
For earlier versions, have a look into these branches:
- v2010.2. See the branch [2010.2-compatible](https://github.com/tallence/core-forms/tree/2010.2-compatible).
- CoreMedia 9 (v19.04). See the branch: [1904.2-compatible](https://github.com/tallence/core-forms/tree/1904.2-compatible).
It is in general compatible with the versions 17.10 and 18.10, but some small changes could be required (import paths, names of artifacts)
- Other CoreMedia 9 versions: It is in general compatible with the versions 17.10 and 18.10, but some small changes could be required (import paths, names of artifacts)

This repo covers the studio- and the backend-cae part. If you are looking for an example implementation for the frontend part (a Vue.js-App wrapped in a CoreMedia-Frontend-Workspace-Theme) have a look here: [core-forms-frontend](https://github.com/tallence/core-forms-frontend)

Expand Down
30 changes: 15 additions & 15 deletions apps/studio-client/apps/main/form-editor-studio-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
"dependencies": {
"@coremedia-blueprint/studio-client.form-editor": "1.0.0-SNAPSHOT",
"@coremedia-blueprint/studio-client.main.blueprint-forms": "1.0.0-SNAPSHOT",
"@coremedia/studio-client.base-models": "2201.2.0",
"@coremedia/studio-client.cap-base-models": "2201.2.0",
"@coremedia/studio-client.cap-rest-client": "2201.2.0",
"@coremedia/studio-client.client-core": "2201.2.0",
"@coremedia/studio-client.core-icons": "2201.2.0",
"@coremedia/studio-client.ext.errors-validation-components": "2201.2.0",
"@coremedia/studio-client.ext.ui-components": "2201.2.0",
"@coremedia/studio-client.main.bpbase-studio-dynamic-query-list": "2201.2.0",
"@coremedia/studio-client.main.editor-components": "2201.2.0",
"@jangaroo/ext-ts": "^1.0.2",
"@jangaroo/runtime": "^1.1.1"
"@coremedia/studio-client.base-models": "2207.1.0",
"@coremedia/studio-client.cap-base-models": "2207.1.0",
"@coremedia/studio-client.cap-rest-client": "2207.1.0",
"@coremedia/studio-client.client-core": "2207.1.0",
"@coremedia/studio-client.core-icons": "2207.1.0",
"@coremedia/studio-client.ext.errors-validation-components": "2207.1.0",
"@coremedia/studio-client.ext.ui-components": "2207.1.0",
"@coremedia/studio-client.main.bpbase-studio-dynamic-query-list": "2207.1.0",
"@coremedia/studio-client.main.editor-components": "2207.1.0",
"@jangaroo/ext-ts": "^1.0.3",
"@jangaroo/runtime": "^1.2.1"
},
"devDependencies": {
"@jangaroo/build": "^1.1.1",
"@jangaroo/core": "^1.1.1",
"@jangaroo/eslint-config": "^1.1.1",
"@jangaroo/publish": "^1.1.1",
"@jangaroo/build": "^1.2.1",
"@jangaroo/core": "^1.2.1",
"@jangaroo/eslint-config": "^1.2.1",
"@jangaroo/publish": "^1.2.1",
"eslint": "^7.27.0",
"rimraf": "^3.0.2"
},
Expand Down
183 changes: 1 addition & 182 deletions apps/studio-client/apps/main/form-editor-studio-plugin/src/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,188 +5,7 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "../dist/src",
"paths": {
"@coremedia-blueprint/studio-client.blueprint-doctypes/*": [
"../../../../../../../../../apps/studio-client/shared/js/blueprint-doctypes/src/*"
],
"@coremedia-blueprint/studio-client.form-editor/*": [
"../../../../shared/js/form-editor/src/*"
],
"@coremedia-blueprint/studio-client.main.blueprint-forms/*": [
"../../../../../../../../../apps/studio-client/apps/main/blueprint-forms/src/*"
],
"@coremedia/studio-client.app-context-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.app-context-models@2201.2.0/node_modules/@coremedia/studio-client.app-context-models/src/*"
],
"@coremedia/studio-client.base-models/*": [
"../node_modules/@coremedia/studio-client.base-models/src/*"
],
"@coremedia/studio-client.cap-base-models/*": [
"../node_modules/@coremedia/studio-client.cap-base-models/src/*"
],
"@coremedia/studio-client.cap-base-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.cap-base-services-api@2201.2.0/node_modules/@coremedia/studio-client.cap-base-services-api/src/*"
],
"@coremedia/studio-client.cap-base-services-toolkit/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.cap-base-services-toolkit@2201.2.0/node_modules/@coremedia/studio-client.cap-base-services-toolkit/src/*"
],
"@coremedia/studio-client.cap-rest-client/*": [
"../node_modules/@coremedia/studio-client.cap-rest-client/src/*"
],
"@coremedia/studio-client.cap-rest-client-impl/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.cap-rest-client-impl@2201.2.0/node_modules/@coremedia/studio-client.cap-rest-client-impl/src/*"
],
"@coremedia/studio-client.ckeditor-constants/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ckeditor-constants@2201.2.0/node_modules/@coremedia/studio-client.ckeditor-constants/src/*"
],
"@coremedia/studio-client.ckeditor-factory/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ckeditor-factory@2201.2.0/node_modules/@coremedia/studio-client.ckeditor-factory/src/*"
],
"@coremedia/studio-client.client-core/*": [
"../node_modules/@coremedia/studio-client.client-core/src/*"
],
"@coremedia/studio-client.client-core-impl/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.client-core-impl@2201.2.0/node_modules/@coremedia/studio-client.client-core-impl/src/*"
],
"@coremedia/studio-client.collaboration-icons/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.collaboration-icons@2201.2.0/node_modules/@coremedia/studio-client.collaboration-icons/src/*"
],
"@coremedia/studio-client.content-link-list-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.content-link-list-models@2201.2.0/node_modules/@coremedia/studio-client.content-link-list-models/src/*"
],
"@coremedia/studio-client.core-icons/*": [
"../node_modules/@coremedia/studio-client.core-icons/src/*"
],
"@coremedia/studio-client.embed-app-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.embed-app-services-api@2201.2.0/node_modules/@coremedia/studio-client.embed-app-services-api/src/*"
],
"@coremedia/studio-client.ext.base-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.base-components@2201.2.0/node_modules/@coremedia/studio-client.ext.base-components/src/*"
],
"@coremedia/studio-client.ext.cap-base-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.cap-base-components@2201.2.0/node_modules/@coremedia/studio-client.ext.cap-base-components/src/*"
],
"@coremedia/studio-client.ext.content-link-list-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.content-link-list-components@2201.2.0/node_modules/@coremedia/studio-client.ext.content-link-list-components/src/*"
],
"@coremedia/studio-client.ext.errors-validation-components/*": [
"../node_modules/@coremedia/studio-client.ext.errors-validation-components/src/*"
],
"@coremedia/studio-client.ext.form-services-toolkit/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.form-services-toolkit@2201.2.0/node_modules/@coremedia/studio-client.ext.form-services-toolkit/src/*"
],
"@coremedia/studio-client.ext.frame-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.frame-components@2201.2.0/node_modules/@coremedia/studio-client.ext.frame-components/src/*"
],
"@coremedia/studio-client.ext.interaction-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.interaction-components@2201.2.0/node_modules/@coremedia/studio-client.ext.interaction-components/src/*"
],
"@coremedia/studio-client.ext.library-services-toolkit/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.library-services-toolkit@2201.2.0/node_modules/@coremedia/studio-client.ext.library-services-toolkit/src/*"
],
"@coremedia/studio-client.ext.link-list-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.link-list-components@2201.2.0/node_modules/@coremedia/studio-client.ext.link-list-components/src/*"
],
"@coremedia/studio-client.ext.logger-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.logger-components@2201.2.0/node_modules/@coremedia/studio-client.ext.logger-components/src/*"
],
"@coremedia/studio-client.ext.lottie-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.lottie-components@2201.2.0/node_modules/@coremedia/studio-client.ext.lottie-components/src/*"
],
"@coremedia/studio-client.ext.multi-site-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.multi-site-components@2201.2.0/node_modules/@coremedia/studio-client.ext.multi-site-components/src/*"
],
"@coremedia/studio-client.ext.richtext-components-toolkit/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.richtext-components-toolkit@2201.2.0/node_modules/@coremedia/studio-client.ext.richtext-components-toolkit/src/*"
],
"@coremedia/studio-client.ext.split-main-view-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.split-main-view-components@2201.2.0/node_modules/@coremedia/studio-client.ext.split-main-view-components/src/*"
],
"@coremedia/studio-client.ext.startup-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.startup-components@2201.2.0/node_modules/@coremedia/studio-client.ext.startup-components/src/*"
],
"@coremedia/studio-client.ext.startup-plugins/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.startup-plugins@2201.2.0/node_modules/@coremedia/studio-client.ext.startup-plugins/src/*"
],
"@coremedia/studio-client.ext.toast-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.toast-components@2201.2.0/node_modules/@coremedia/studio-client.ext.toast-components/src/*"
],
"@coremedia/studio-client.ext.ui-components/*": [
"../node_modules/@coremedia/studio-client.ext.ui-components/src/*"
],
"@coremedia/studio-client.ext.workflow-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.workflow-components@2201.2.0/node_modules/@coremedia/studio-client.ext.workflow-components/src/*"
],
"@coremedia/studio-client.ext.workflow-services-toolkit/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.ext.workflow-services-toolkit@2201.2.0/node_modules/@coremedia/studio-client.ext.workflow-services-toolkit/src/*"
],
"@coremedia/studio-client.form-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.form-models@2201.2.0/node_modules/@coremedia/studio-client.form-models/src/*"
],
"@coremedia/studio-client.form-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.form-services-api@2201.2.0/node_modules/@coremedia/studio-client.form-services-api/src/*"
],
"@coremedia/studio-client.interaction-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.interaction-services-api@2201.2.0/node_modules/@coremedia/studio-client.interaction-services-api/src/*"
],
"@coremedia/studio-client.interaction-services-impl/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.interaction-services-impl@2201.2.0/node_modules/@coremedia/studio-client.interaction-services-impl/src/*"
],
"@coremedia/studio-client.kinetic-js/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.kinetic-js@2201.2.0/node_modules/@coremedia/studio-client.kinetic-js/src/*"
],
"@coremedia/studio-client.library-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.library-services-api@2201.2.0/node_modules/@coremedia/studio-client.library-services-api/src/*"
],
"@coremedia/studio-client.link-list-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.link-list-models@2201.2.0/node_modules/@coremedia/studio-client.link-list-models/src/*"
],
"@coremedia/studio-client.main.bpbase-pagegrid-studio-plugin/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.main.bpbase-pagegrid-studio-plugin@2201.2.0/node_modules/@coremedia/studio-client.main.bpbase-pagegrid-studio-plugin/src/*"
],
"@coremedia/studio-client.main.bpbase-studio-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.main.bpbase-studio-components@2201.2.0/node_modules/@coremedia/studio-client.main.bpbase-studio-components/src/*"
],
"@coremedia/studio-client.main.bpbase-studio-dynamic-query-list/*": [
"../node_modules/@coremedia/studio-client.main.bpbase-studio-dynamic-query-list/src/*"
],
"@coremedia/studio-client.main.ckeditor4-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.main.ckeditor4-components@2201.2.0/node_modules/@coremedia/studio-client.main.ckeditor4-components/src/*"
],
"@coremedia/studio-client.main.editor-components/*": [
"../node_modules/@coremedia/studio-client.main.editor-components/src/*"
],
"@coremedia/studio-client.main.image-editor-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.main.image-editor-components@2201.2.0/node_modules/@coremedia/studio-client.main.image-editor-components/src/*"
],
"@coremedia/studio-client.main.image-map-editor-components/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.main.image-map-editor-components@2201.2.0/node_modules/@coremedia/studio-client.main.image-map-editor-components/src/*"
],
"@coremedia/studio-client.multi-site-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.multi-site-models@2201.2.0/node_modules/@coremedia/studio-client.multi-site-models/src/*"
],
"@coremedia/studio-client.workflow-issues-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.workflow-issues-services-api@2201.2.0/node_modules/@coremedia/studio-client.workflow-issues-services-api/src/*"
],
"@coremedia/studio-client.workflow-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.workflow-models@2201.2.0/node_modules/@coremedia/studio-client.workflow-models/src/*"
],
"@coremedia/studio-client.workflow-plugin-models/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.workflow-plugin-models@2201.2.0/node_modules/@coremedia/studio-client.workflow-plugin-models/src/*"
],
"@coremedia/studio-client.workflow-services-api/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@coremedia+studio-client.workflow-services-api@2201.2.0/node_modules/@coremedia/studio-client.workflow-services-api/src/*"
],
"@jangaroo/ext-ts/*": [
"../node_modules/@jangaroo/ext-ts/src/*"
],
"@jangaroo/jangaroo-net/*": [
"../../../../../../../../../apps/studio-client/node_modules/.pnpm/@jangaroo+jangaroo-net@1.1.1/node_modules/@jangaroo/jangaroo-net/src/*"
],
"@jangaroo/runtime/*": [
"../node_modules/@jangaroo/runtime/src/*"
]
},
"moduleResolution": "nodenext",
"types": [
"@coremedia/studio-client.client-core",
"@coremedia/studio-client.main.editor-components",
Expand Down
8 changes: 4 additions & 4 deletions apps/studio-client/apps/workflow/form-editor-workflow-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"@coremedia-blueprint/studio-client.form-editor": "1.0.0-SNAPSHOT"
},
"devDependencies": {
"@jangaroo/build": "^1.1.1",
"@jangaroo/core": "^1.1.1",
"@jangaroo/eslint-config": "^1.1.1",
"@jangaroo/publish": "^1.1.1",
"@jangaroo/build": "^1.2.1",
"@jangaroo/core": "^1.2.1",
"@jangaroo/eslint-config": "^1.2.1",
"@jangaroo/publish": "^1.2.1",
"eslint": "^7.27.0",
"rimraf": "^3.0.2"
},
Expand Down
12 changes: 6 additions & 6 deletions apps/studio-client/shared/js/form-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "@coremedia-blueprint/studio-client.form-editor",
"version": "1.0.0-SNAPSHOT",
"dependencies": {
"@coremedia/studio-client.cap-base-models": "2201.2.0",
"@jangaroo/runtime": "^1.1.1"
"@coremedia/studio-client.cap-base-models": "2207.1.0",
"@jangaroo/runtime": "^1.2.1"
},
"devDependencies": {
"@jangaroo/build": "^1.1.1",
"@jangaroo/core": "^1.1.1",
"@jangaroo/eslint-config": "^1.1.1",
"@jangaroo/publish": "^1.1.1",
"@jangaroo/build": "^1.2.1",
"@jangaroo/core": "^1.2.1",
"@jangaroo/eslint-config": "^1.2.1",
"@jangaroo/publish": "^1.2.1",
"eslint": "^7.27.0",
"rimraf": "^3.0.2"
},
Expand Down
Loading

0 comments on commit f1ee6e3

Please sign in to comment.