eclipsesource · sdirix · Jul 24, 2022 · Jul 18, 2022 · Jul 18, 2022 · Jul 22, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/vue/vue-vanilla/config/vue.ts b/packages/vue/vue-vanilla/config/vue.ts
diff --git a/packages/vue/vue-vanilla/dev/components/App.vue b/packages/vue/vue-vanilla/dev/components/App.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { JsonForms, JsonFormsChangeEvent } from '../../config/jsonforms';
 import { vanillaRenderers, mergeStyles, defaultStyles } from '../../src';
 import '../../vanilla.css';

diff --git a/packages/vue/vue-vanilla/package.json b/packages/vue/vue-vanilla/package.json
@@ -60,10 +60,10 @@
     "@types/chai": "^4.2.11",
     "@types/jest": "^24.0.23",
     "@types/mocha": "^5.2.4",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-plugin-unit-mocha": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-babel": "~4.5.18",
+    "@vue/cli-plugin-typescript": "~4.5.18",
+    "@vue/cli-plugin-unit-mocha": "~4.5.18",
+    "@vue/cli-service": "~4.5.18",
     "@vue/compiler-sfc": "^3.2.26",
     "@vue/test-utils": "^2.0.2",
     "chai": "^4.1.2",

diff --git a/packages/vue/vue-vanilla/src/array/ArrayListElement.vue b/packages/vue/vue-vanilla/src/array/ArrayListElement.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, CompType } from '../../config/vue';
+import { defineComponent, PropType } from 'vue';
 import { classes, Styles } from '../styles';
 
 const listItem = defineComponent({
@@ -76,7 +76,7 @@ const listItem = defineComponent({
     },
     styles: {
       required: true,
-      type: Object as CompType<Styles, ObjectConstructor>
+      type: Object as PropType<Styles>
     }
   },
   data() {

diff --git a/packages/vue/vue-vanilla/src/array/ArrayListRenderer.vue b/packages/vue/vue-vanilla/src/array/ArrayListRenderer.vue
@@ -51,7 +51,7 @@ import {
   ControlElement,
   schemaTypeIs
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import {
   DispatchRenderer,
   rendererProps,

diff --git a/packages/vue/vue-vanilla/src/controls/BooleanControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/BooleanControlRenderer.vue
@@ -27,7 +27,7 @@ import {
   rankWith,
   isBooleanControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/ControlWrapper.vue b/packages/vue/vue-vanilla/src/controls/ControlWrapper.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import { isDescriptionHidden, computeLabel } from '@jsonforms/core';
-import { defineComponent, CompType } from '../../config/vue';
+import { defineComponent, PropType } from 'vue';
 import { Styles } from '../styles';
 import { Options } from '../util';
 
@@ -42,7 +42,7 @@ export default defineComponent({
     },
     appliedOptions: {
       required: false as false,
-      type: Object as CompType<Options, ObjectConstructor>,
+      type: Object as PropType<Options>,
       default: undefined
     },
     visible: {
@@ -62,7 +62,7 @@ export default defineComponent({
     },
     styles: {
       required: true,
-      type: Object as CompType<Styles, ObjectConstructor>
+      type: Object as PropType<Styles>
     }
   },
   computed: {

diff --git a/packages/vue/vue-vanilla/src/controls/DateControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/DateControlRenderer.vue
@@ -27,7 +27,7 @@ import {
   rankWith,
   isDateControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/DateTimeControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/DateTimeControlRenderer.vue
@@ -27,7 +27,7 @@ import {
   rankWith,
   isDateTimeControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/EnumControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/EnumControlRenderer.vue
@@ -35,7 +35,7 @@ import {
   rankWith,
   isEnumControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsEnumControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/EnumOneOfControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/EnumOneOfControlRenderer.vue
@@ -35,7 +35,7 @@ import {
   rankWith,
   isOneOfEnumControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsOneOfEnumControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/IntegerControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/IntegerControlRenderer.vue
@@ -28,7 +28,7 @@ import {
   rankWith,
   isIntegerControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/MultiStringControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/MultiStringControlRenderer.vue
@@ -28,7 +28,7 @@ import {
   isMultiLineControl,
   and
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/NumberControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/NumberControlRenderer.vue
@@ -28,7 +28,7 @@ import {
   rankWith,
   isNumberControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/StringControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/StringControlRenderer.vue
@@ -26,7 +26,7 @@ import {
   rankWith,
   isStringControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/controls/TimeControlRenderer.vue b/packages/vue/vue-vanilla/src/controls/TimeControlRenderer.vue
@@ -27,7 +27,7 @@ import {
   rankWith,
   isTimeControl
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '../../config/jsonforms';
 import { default as ControlWrapper } from './ControlWrapper.vue';
 import { useVanillaControl } from '../util';

diff --git a/packages/vue/vue-vanilla/src/label/LabelRenderer.vue b/packages/vue/vue-vanilla/src/label/LabelRenderer.vue
@@ -11,7 +11,7 @@ import {
   rankWith,
   uiTypeIs
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import {
   rendererProps,
   RendererProps,

diff --git a/packages/vue/vue-vanilla/src/layouts/GroupRenderer.vue b/packages/vue/vue-vanilla/src/layouts/GroupRenderer.vue
@@ -29,7 +29,7 @@ import {
   isLayout,
   uiTypeIs
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import {
   DispatchRenderer,
   rendererProps,

diff --git a/packages/vue/vue-vanilla/src/layouts/LayoutRenderer.vue b/packages/vue/vue-vanilla/src/layouts/LayoutRenderer.vue
@@ -24,7 +24,7 @@ import {
   Layout,
   rankWith
 } from '@jsonforms/core';
-import { defineComponent } from '../../config/vue';
+import { defineComponent } from 'vue';
 import {
   DispatchRenderer,
   rendererProps,

diff --git a/packages/vue/vue-vanilla/src/styles/styles.ts b/packages/vue/vue-vanilla/src/styles/styles.ts
@@ -1,5 +1,5 @@
 import { UISchemaElement } from '@jsonforms/core';
-import { inject } from '../../config/vue';
+import { inject } from 'vue';
 import merge from 'lodash/merge';
 import { defaultStyles } from './defaultStyles';
 

diff --git a/packages/vue/vue-vanilla/src/util/composition.ts b/packages/vue/vue-vanilla/src/util/composition.ts
@@ -1,5 +1,5 @@
 import { useStyles } from '../styles';
-import { computed, ref } from '../../config/vue';
+import { computed, ref } from 'vue';
 import merge from 'lodash/merge';
 import cloneDeep from 'lodash/cloneDeep';
 import {

diff --git a/packages/vue/vue-vanilla/tests/unit/util/TestComponent.vue b/packages/vue/vue-vanilla/tests/unit/util/TestComponent.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent } from '../../../config/vue';
+import { defineComponent } from 'vue';
 import { JsonForms } from '../../../config/jsonforms';
 import { vanillaRenderers } from '../../../src';
 import { JsonFormsChangeEvent } from '@jsonforms/vue';

diff --git a/packages/vue/vue/config/config.ts b/packages/vue/vue/config/config.ts
diff --git a/packages/vue/vue/config/index.ts b/packages/vue/vue/config/index.ts
diff --git a/packages/vue/vue/dev/renderers/ControlRenderer.vue b/packages/vue/vue/dev/renderers/ControlRenderer.vue
@@ -38,7 +38,7 @@ import {
   JsonFormsRendererRegistryEntry,
   rankWith
 } from '@jsonforms/core';
-import { defineComponent } from '../../config';
+import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl } from '../../src/';
 
 const controlRenderer = defineComponent({

diff --git a/packages/vue/vue/package.json b/packages/vue/vue/package.json
@@ -29,7 +29,7 @@
   ],
   "main": "lib/jsonforms-vue.cjs.js",
   "module": "lib/jsonforms-vue.esm.js",
-  "types": "lib/src/index.d.ts",
+  "types": "lib/index.d.ts",
   "files": [
     "lib/*",
     "src/*"
@@ -51,10 +51,10 @@
     "@jsonforms/core": "^3.0.0-beta.5",
     "@rollup/plugin-alias": "^3.1.8",
     "@types/jest": "^24.0.23",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-plugin-unit-jest": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-babel": "~4.5.18",
+    "@vue/cli-plugin-typescript": "~4.5.18",
+    "@vue/cli-plugin-unit-jest": "~4.5.18",
+    "@vue/cli-service": "~4.5.18",
     "@vue/compiler-sfc": "^3.2.26",
     "@vue/test-utils": "^2.0.2",
     "core-js": "^3.9.1",

diff --git a/packages/vue/vue/src/components/DispatchCell.vue b/packages/vue/vue/src/components/DispatchCell.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '../../config';
+import { defineComponent } from 'vue';
 import UnknownRenderer from './UnknownRenderer.vue';
 import maxBy from 'lodash/maxBy';
 import {

diff --git a/packages/vue/vue/src/components/DispatchRenderer.vue b/packages/vue/vue/src/components/DispatchRenderer.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '../../config';
+import { defineComponent } from 'vue';
 import UnknownRenderer from './UnknownRenderer.vue';
 import maxBy from 'lodash/maxBy';
 import { rendererProps, useJsonFormsRenderer } from '../jsonFormsCompositions';

diff --git a/packages/vue/vue/src/components/JsonForms.vue b/packages/vue/vue/src/components/JsonForms.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts">
 import { PropType } from 'vue';
-import { defineComponent } from '../../config';
+import { defineComponent } from 'vue';
 import {
   coreReducer,
   Actions,

diff --git a/packages/vue/vue/src/components/UnknownRenderer.vue b/packages/vue/vue/src/components/UnknownRenderer.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '../../config';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'unknown-renderer'

diff --git a/packages/vue/vue/src/jsonFormsCompositions.ts b/packages/vue/vue/src/jsonFormsCompositions.ts
@@ -37,13 +37,13 @@ import {
   LabelElement
 } from '@jsonforms/core';
 import {
-  CompType,
+  PropType,
   computed,
   inject,
   onBeforeMount,
   onUnmounted,
   ref
-} from '../config';
+} from 'vue';
 
 /**
  * Constructs a props declaration for Vue components which can be used
@@ -57,14 +57,13 @@ import {
 export const rendererProps = <U = UISchemaElement>() => ({
   schema: {
     required: true as true,
-    type: [Object, Boolean] as CompType<
-      JsonSchema,
-      [ObjectConstructor, BooleanConstructor]
+    type: [Object, Boolean] as PropType<
+      JsonSchema
     >
   },
   uischema: {
     required: true as true,
-    type: Object as CompType<U, ObjectConstructor>
+    type: Object as PropType<U>
   },
   path: {
     required: true as true,
@@ -77,14 +76,13 @@ export const rendererProps = <U = UISchemaElement>() => ({
   },
   renderers: {
     required: false,
-    type: Array as CompType<JsonFormsRendererRegistryEntry[], ArrayConstructor>,
+    type: Array as PropType<JsonFormsRendererRegistryEntry[]>,
     default: undefined
   },
   cells: {
     required: false,
-    type: Array as CompType<
-      JsonFormsCellRendererRegistryEntry[],
-      ArrayConstructor
+    type: Array as PropType<
+      JsonFormsCellRendererRegistryEntry[]
     >,
     default: undefined
   },
@@ -114,21 +112,19 @@ export const masterListItemProps = () => ({
   },
   schema: {
     required: true as true,
-    type: [Object, Boolean] as CompType<
-      JsonSchema,
-      [ObjectConstructor, BooleanConstructor]
+    type: [Object, Boolean] as PropType<
+      JsonSchema
     >
   },
   handleSelect: {
     required: false as false,
-    type: Function as CompType<(index: number) => void, FunctionConstructor>,
+    type: Function as PropType<(index: number) => void>,
     default: undefined
   },
   removeItem: {
     required: false as false,
-    type: Function as CompType<
-      (path: string, value: number) => void,
-      FunctionConstructor
+    type: Function as PropType<
+      (path: string, value: number) => void
     >,
     default: undefined
   }