Merge branch 'next' into main

Author: AMontagu

.circleci/config.yml

@@ -28,4 +28,6 @@ workflows:
             - test
           filters:
             branches:
-              only: main
+              only: 
+                - main
+                - next

.eslintrc.js

@@ -13,7 +13,7 @@ module.exports = {
   ],
 
   parserOptions: {
-    parser: "@typescript-eslint/parser"
+    parser: '@typescript-eslint/parser'
   },
 
   plugins: [

build/rollup.config.js

@@ -8,7 +8,6 @@ import replace from '@rollup/plugin-replace';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import { babel } from '@rollup/plugin-babel';
-import pascalcase from 'pascalcase';
 
 const pkg = require('../package.json');
 const name = pkg.name;
@@ -94,7 +93,7 @@ function createConfig(format, output, plugins = []) {
   const isNodeBuild = format === 'cjs';
   const isBundlerESMBuild = /esm-bundler/.test(format);
 
-  if (isGlobalBuild) output.name = pascalcase(pkg.name);
+  if (isGlobalBuild) output.name = "VueDatatableUrlSync";
 
   const shouldEmitDeclarations = !hasTSChecked;
 

package-lock.json

@@ -20,7 +20,7 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
-    "vue-demi": "^0.6.2",
+    "vue-demi": "^0.13.11",
     "vue-router": "^4.0.3"
   },
   "devDependencies": {
@@ -33,26 +33,28 @@
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.debounce": "^4.0.6",
     "@types/lodash.isequal": "^4.5.5",
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-typescript": "^4.5.11",
-    "@vue/cli-plugin-unit-jest": "^4.5.12",
-    "@vue/cli-service": "~4.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-plugin-typescript": "^5.0.8",
+    "@vue/cli-plugin-unit-jest": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
     "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^5.0.2",
-    "@vue/test-utils": "^2.0.0-rc.4",
+    "@vue/eslint-config-typescript": "^9.1.0",
+    "@vue/test-utils": "^2.0.2",
+    "@vue/vue3-jest": "^28.0.1",
     "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
+    "eslint": "^7.32.0",
     "eslint-plugin-typescript": "^0.14.0",
-    "eslint-plugin-vue": "^7.0.0-0",
+    "eslint-plugin-vue": "^8.0.3",
+    "jest": "^27.1.0",
     "rollup": "^2.39.1",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.30.0",
     "rollup-plugin-vue": "^6.0.0",
-    "ts-jest": "^26.5.4",
-    "typescript": "~3.9.3",
+    "ts-jest": "^27.1.5",
+    "typescript": "~4.5.5",
     "vue": "^3.0.0",
     "vue-jest": "^5.0.0-0"
   },

package.json

@@ -1,3 +1,3 @@
 module.exports = {
-  branches: ["main"]
+  branches: ["main", "next"]
 }

release.config.js

@@ -71,7 +71,7 @@ const isValueDefault = (value: any, param: string, schema?: VDUSFormSchema): boo
   */
 const generateQueryFromObject = (object: GenericDictionnary, schema?: VDUSFormSchema, localName = true): GenericDictionnary => {
   const queryUrl: GenericDictionnary = {};
-  for (let [key, value] of Object.entries(object)) {
+  for (const [key, value] of Object.entries(object)) {
     // We do not want to send a default value
     if (isValueDefault(value, key, schema)) {
       continue;

src/utils/listPaginatedTools.ts

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

vue2.7-example/.browserslistrc

@@ -0,0 +1,21 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'eslint:recommended',
+    '@vue/typescript/recommended'
+  ],
+  parserOptions: {
+    parser: '@typescript-eslint/parser'
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    "@typescript-eslint/camelcase": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-use-before-define": "off"
+  }
+}

vue2.7-example/.eslintrc.js

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

vue2.7-example/.gitignore

@@ -0,0 +1,24 @@
+# vue2-example
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

vue2.7-example/README.md

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}