Skip to content

Commit 0616a60

Browse files
committed
dependencies(vue): Support 2.7
Breaking CHANGE: Dependencies vue minimum to 2.7 to use vue instead of vue-demi
1 parent cda2c77 commit 0616a60

14 files changed

+216
-283
lines changed

.circleci/config.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ workflows:
2828
- test
2929
filters:
3030
branches:
31-
only: main
31+
only:
32+
- main
33+
- next

build/rollup.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import replace from '@rollup/plugin-replace';
88
import resolve from '@rollup/plugin-node-resolve';
99
import commonjs from '@rollup/plugin-commonjs';
1010
import { babel } from '@rollup/plugin-babel';
11-
import pascalcase from 'pascalcase';
1211

1312
const pkg = require('../package.json');
1413
const name = pkg.name;
@@ -94,7 +93,7 @@ function createConfig(format, output, plugins = []) {
9493
const isNodeBuild = format === 'cjs';
9594
const isBundlerESMBuild = /esm-bundler/.test(format);
9695

97-
if (isGlobalBuild) output.name = pascalcase(pkg.name);
96+
if (isGlobalBuild) output.name = "VueDatatableUrlSync";
9897

9998
const shouldEmitDeclarations = !hasTSChecked;
10099

package-lock.json

+46-175
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"lodash.clonedeep": "^4.5.0",
2121
"lodash.debounce": "^4.0.8",
2222
"lodash.isequal": "^4.5.0",
23-
"vue-demi": "^0.6.2",
2423
"vue-router": "^4.0.3"
2524
},
2625
"devDependencies": {
@@ -42,7 +41,8 @@
4241
"@vue/cli-service": "^5.0.8",
4342
"@vue/compiler-sfc": "^3.0.0",
4443
"@vue/eslint-config-typescript": "^9.1.0",
45-
"@vue/test-utils": "^2.0.0-rc.4",
44+
"@vue/test-utils": "^2.0.2",
45+
"@vue/vue3-jest": "^28.0.1",
4646
"babel-eslint": "^10.1.0",
4747
"eslint": "^7.32.0",
4848
"eslint-plugin-typescript": "^0.14.0",
@@ -52,13 +52,13 @@
5252
"rollup-plugin-terser": "^7.0.2",
5353
"rollup-plugin-typescript2": "^0.30.0",
5454
"rollup-plugin-vue": "^6.0.0",
55-
"ts-jest": "^26.5.4",
55+
"ts-jest": "^27.1.5",
5656
"typescript": "~4.5.5",
5757
"vue": "^3.0.0",
5858
"vue-jest": "^5.0.0-0"
5959
},
6060
"peerDependencies": {
61-
"vue": "^2.6.0 || >=3.0.0-rc.0",
61+
"vue": "^2.7.0 || >=3.0.0-rc.0",
6262
"@vue/composition-api": "^1.0.0-rc.2"
6363
},
6464
"browserslist": [

release.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
branches: ["main"]
2+
branches: ["main", "next"]
33
}

src/useDatatableUrlSync.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
import cloneDeep from "lodash.clonedeep";
1414
import isEqual from "lodash.isequal";
1515

16-
import { ref, watch, nextTick, computed, Ref } from 'vue-demi'
16+
import { ref, watch, nextTick, computed, Ref } from 'vue'
1717
import {GenericDictionnary, VDUSConfiguration, VuetifyOptions, VDUSFormSchema, VDUSDatatableOptions} from "./utils/VDUSTypes"
1818

1919
/*

src/utils/listPaginatedTools.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const isValueDefault = (value: any, param: string, schema?: VDUSFormSchema): boo
7171
*/
7272
const generateQueryFromObject = (object: GenericDictionnary, schema?: VDUSFormSchema, localName = true): GenericDictionnary => {
7373
const queryUrl: GenericDictionnary = {};
74-
for (let [key, value] of Object.entries(object)) {
74+
for (const [key, value] of Object.entries(object)) {
7575
// We do not want to send a default value
7676
if (isValueDefault(value, key, schema)) {
7777
continue;

0 commit comments

Comments
 (0)