Skip to content

Remove composition-api plugin & upgrade to vue 2.7 #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 24, 2022
Merged

Remove composition-api plugin & upgrade to vue 2.7 #1981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9b0084
Remove composition-api plugin & upgrade to vue 2.7
marcianos Jul 18, 2022
b5f912a
Upgrade @vue/cli plugins
marcianos Jul 18, 2022
d909956
Polishing
sdirix Jul 22, 2022
7aca0eb
Adapt readme and remove unnecessary config in vue2-vanilla
sdirix Jul 24, 2022
bb3956b
Adapt Vue test
sdirix Jul 24, 2022
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
2 changes: 1 addition & 1 deletion packages/vue2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"private": true,
"description": "Meta package for JSON Forms Vue 2 development",
"devDependencies": {
"vue": "^2.6.14"
"vue": "^2.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/vue2/vue2-vanilla/config/vue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Switch between Vue 3 and Vue 2 '@vue/composition-api'.
*/
Copy link
Member

@sdirix sdirix Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also adapt the docs

Copy link
Contributor Author

@marcianos marcianos Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just adjust the comment? Because now it could be one config file for vue 2 and 3 and not two separte files like right now (vue2 vue3)

export { computed, defineComponent, inject, onBeforeMount, onUnmounted, reactive, ref, watch, watchEffect } from "@vue/composition-api";
export type { Ref } from "@vue/composition-api";
export { computed, defineComponent, inject, onBeforeMount, onUnmounted, reactive, ref, watch, watchEffect } from "vue";
export type { Ref } from "vue";
/**
* Compatibility type as defineComponent of '@vue/composition-api' can't properly handle PropTypes.
Copy link
Member

@sdirix sdirix Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also the docs here.

*/
Expand Down
8 changes: 2 additions & 6 deletions packages/vue2/vue2-vanilla/dev/serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import Vue, { VNode } from 'vue';
import Vue, { VNode, CreateElement } from 'vue';
import App from './components/App.vue';
import VueCompositionAPI from '@vue/composition-api'

Vue.use(VueCompositionAPI)

Vue.config.productionTip = false;

new Vue({
render: (h): VNode => h(App),
render: (h: CreateElement): VNode => h(App),
}).$mount('#app');
13 changes: 6 additions & 7 deletions packages/vue2/vue2-vanilla/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,10 @@
"@jsonforms/vue2": "^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/composition-api": "^1.4.2",
"@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",
Comment on lines +62 to +65
Copy link
Member

@sdirix sdirix Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to raise these dependencies? If yes please align them in the Vue 3 packages. If possible any dependency within the monorepo should be required in the same version.

Copy link
Contributor Author

@marcianos marcianos Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it should be at least ~4.5.18 for v4 or ~5.0.6 for v5 . See here. I align the Vue 3 packages as well to ~4.5.18

"@vue/test-utils": "^1.0.3",
"cp-cli": "^2.0.0",
"cross-env": "^7.0.2",
Expand All @@ -78,11 +77,11 @@
"symlink-dir": "^5.0.0",
"typedoc": "^0.19.2",
"typescript": "4.2.3",
"vue-template-compiler": "^2.6.14"
"vue-loader": "^15.10.0"
},
"peerDependencies": {
"@jsonforms/core": "3.0.0-beta.5",
"@jsonforms/vue2": "3.0.0-beta.5",
"vue": "^2.6.14"
"vue": "^2.7.0"
}
}
2 changes: 1 addition & 1 deletion packages/vue2/vue2/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Switch between Vue 3 and Vue 2 '@vue/composition-api'.
*/
export { computed, defineComponent, inject, onBeforeMount, onUnmounted, reactive, ref, watch, watchEffect } from "@vue/composition-api";
export { computed, defineComponent, inject, onBeforeMount, onUnmounted, reactive, ref, watch, watchEffect } from "vue";

/**
* Compatibility type as defineComponent of '@vue/composition-api' can't properly handle PropTypes.
Expand Down
7 changes: 2 additions & 5 deletions packages/vue2/vue2/dev/serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import Vue, { VNode } from 'vue';
import Vue, { VNode, CreateElement } from 'vue';
import App from './components/App.vue';
import VueCompositionAPI from '@vue/composition-api'

Vue.use(VueCompositionAPI)

Vue.config.productionTip = false;

new Vue({
render: (h): VNode => h(App),
render: (h: CreateElement): VNode => h(App),
}).$mount('#app');
14 changes: 6 additions & 8 deletions packages/vue2/vue2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,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/composition-api": "^1.4.2",
"@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/test-utils": "^1.0.3",
"cp-cli": "^2.0.0",
"cross-env": "^7.0.2",
Expand All @@ -71,11 +70,10 @@
"rollup-plugin-vue": "^5.1.9",
"typedoc": "^0.19.2",
"typescript": "4.2.3",
"vue-template-compiler": "^2.6.14"
"vue-loader": "^15.10.0"
},
"peerDependencies": {
"@jsonforms/core": "3.0.0-beta.5",
"@vue/composition-api": "^1.4.2",
"vue": "^2.6.14"
"vue": "^2.7.0"
}
}