diff --git a/package-lock.json b/package-lock.json
index 60a666305d32da9e1803478c0836f51fea614026..1ff280564a339082881db4960c9bad13477461b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3305,6 +3305,61 @@
"assert-plus": "^1.0.0"
}
},
+ "datatables.net": {
+ "version": "1.10.21",
+ "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.21.tgz",
+ "integrity": "sha512-/bSZtxmf3GTpYcvEmwZ8q26I1yhSx8qklR2B+s1K8+/51UW/zc2zTYwJMqr/Z+iCYixAc00ildj4g2x0Qamolw==",
+ "requires": {
+ "jquery": ">=1.7"
+ }
+ },
+ "datatables.net-buttons": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-1.6.2.tgz",
+ "integrity": "sha512-0sKWBBwtCCECRc4T+fUDhFCJv9miLPrB90QsVYq4ep0hIMuWiW76+eCdykZq5yd/3m7K1O+ryt9c7PahBDf91g==",
+ "requires": {
+ "datatables.net": "^1.10.15",
+ "jquery": ">=1.7"
+ }
+ },
+ "datatables.net-buttons-dt": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/datatables.net-buttons-dt/-/datatables.net-buttons-dt-1.6.2.tgz",
+ "integrity": "sha512-CEEhXLqLwJP17RktzdZBN142dvILUj0OnlFtCO1hl4YjFz8ttYGc6Qfi/OhU2GcH0z9sW2bcYKbvAZe2/Uiazg==",
+ "requires": {
+ "datatables.net-buttons": "1.6.2",
+ "datatables.net-dt": "^1.10.15",
+ "jquery": ">=1.7"
+ }
+ },
+ "datatables.net-dt": {
+ "version": "1.10.21",
+ "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.10.21.tgz",
+ "integrity": "sha512-P89PgkhVCB6shP0CbigmB1Z812yfdfhvAbUdg08mLuF7tuvLFPQC9F+WIV30Hj9mgMsPALWAEJEYAA3aJjuqIA==",
+ "requires": {
+ "datatables.net": "1.10.21",
+ "jquery": ">=1.7"
+ }
+ },
+ "datatables.net-responsive": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-2.2.5.tgz",
+ "integrity": "sha512-AuF28BJRQWfke0cwZwgJB5+WHgoDCDAnW59TJWX4JAXYes3iFrJA6mNHWw46Up3bqUJVI2ZxJoKTGpoEHm5hNA==",
+ "requires": {
+ "datatables.net": "^1.10.15",
+ "jquery": ">=1.7"
+ }
+ },
+ "datatables.net-responsive-dt": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/datatables.net-responsive-dt/-/datatables.net-responsive-dt-2.2.5.tgz",
+ "integrity": "sha512-3jqTZBH0ruc+LlDQC+Qi0QS53x5fDpMSXlsn0feffOsnBVdM7jzijrhC8Fr8bjJ5j/wX4oWw4+Gd4LaFaX9aQg==",
+ "requires": {
+ "datatables.net-dt": "^1.10.15",
+ "datatables.net-responsive": "2.2.5",
+ "jquery": ">=1.7"
+ }
+ },
"date-format": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
@@ -5730,6 +5785,11 @@
"minimatch": "^3.0.4"
}
},
+ "immediate": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+ },
"import-cwd": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
@@ -6448,6 +6508,17 @@
"verror": "1.10.0"
}
},
+ "jszip": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+ "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+ "requires": {
+ "lie": "~3.3.0",
+ "pako": "~1.0.2",
+ "readable-stream": "~2.3.6",
+ "set-immediate-shim": "~1.0.1"
+ }
+ },
"karma": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/karma/-/karma-5.1.0.tgz",
@@ -6772,6 +6843,14 @@
"type-check": "~0.4.0"
}
},
+ "lie": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+ "requires": {
+ "immediate": "~3.0.5"
+ }
+ },
"lines-and-columns": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -8426,6 +8505,11 @@
"p-reduce": "^1.0.0"
}
},
+ "pako": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+ },
"parallel-transform": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
@@ -10379,6 +10463,11 @@
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
+ "set-immediate-shim": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+ },
"set-value": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json
index 7dd0d8549c53254a345301fed5df6050ff6e7df7..7927858d27f1ff8c372731722464f4547f05dfed 100644
--- a/packages/data-table-view/package.json
+++ b/packages/data-table-view/package.json
@@ -5,38 +5,38 @@
"license": "LGPL-2.1-or-later",
"devDependencies": {
"chai": "^4.2.0",
- "glob": "^7.1.4",
+ "glob": "^7.1.6",
"i18next-scanner": "^2.10.2",
"karma": "^5.1.0",
"karma-chrome-launcher": "^3.0.0",
"karma-mocha": "^2.0.1",
"mocha": "^8.0.1",
"node-sass": "^4.12.0",
- "puppeteer": "^1.15.0",
- "rollup": "^2.20.0",
+ "puppeteer": "^2.1.1",
+ "rollup": "^2.19.0",
"@rollup/plugin-commonjs": "^13.0.0",
"rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0",
"rollup-plugin-delete": "^2.0.0",
- "@rollup/plugin-json": "^4.0.0",
- "@rollup/plugin-node-resolve": "^8.0.0",
+ "@rollup/plugin-json": "^4.1.0",
+ "@rollup/plugin-node-resolve": "^8.1.0",
"rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^6.1.0",
"@rollup/plugin-url": "^5.0.1",
- "vpu-auth": "file:./vendor/auth",
- "vpu-common": "file:./vendor/common"
+ "vpu-auth": "^1.0.0",
+ "vpu-common": "^1.0.0"
},
"dependencies": {
- "@open-wc/scoped-elements": "^1.0.9",
+ "@open-wc/scoped-elements": "^1.1.1",
"datatables.net-buttons": "^1.6.1",
"datatables.net-buttons-dt": "^1.6.1",
"datatables.net-dt": "^1.10.20",
"datatables.net-responsive": "^2.2.3",
"datatables.net-responsive-dt": "^2.2.3",
- "i18next": "^19.3.2",
+ "i18next": "^19.5.3",
"jquery": "^3.4.1",
"jszip": "^3.2.2",
- "lit-element": "^2.2.1",
+ "lit-element": "^2.3.1",
"lit-html": "^1.1.1"
},
"scripts": {
diff --git a/packages/data-table-view/rollup.config.js b/packages/data-table-view/rollup.config.js
index 15fd311ffb6d0356e6b7e81153151c4da9c149a7..0d379af5c148c6a33c38bd2043eaed064105b384 100644
--- a/packages/data-table-view/rollup.config.js
+++ b/packages/data-table-view/rollup.config.js
@@ -1,4 +1,3 @@
-import path from 'path';
import glob from 'glob';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
@@ -48,15 +47,8 @@ export default {
consts({
environment: build,
}),
- resolve({
- customResolveOptions: {
- // ignore node_modules from vendored packages
- moduleDirectory: path.join(process.cwd(), 'node_modules')
- }
- }),
- commonjs({
- include: 'node_modules/**'
- }),
+ resolve(),
+ commonjs(),
json(),
urlPlugin({
limit: 0,
@@ -73,10 +65,10 @@ export default {
{src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'},
{src: 'assets/nomodule.js', dest: 'dist/local/' + pkg.name},
- {src: 'node_modules/datatables.net-dt/css', dest: 'dist/local/vpu-data-table-view'},
- {src: 'node_modules/datatables.net-dt/images', dest: 'dist/local/vpu-data-table-view'},
- {src: 'node_modules/datatables.net-responsive-dt/css', dest: 'dist/local/vpu-data-table-view'},
- {src: 'node_modules/datatables.net-buttons-dt/css', dest: 'dist/local/vpu-data-table-view'},
+ {src: '../../node_modules/datatables.net-dt/css', dest: 'dist/local/vpu-data-table-view'},
+ {src: '../../node_modules/datatables.net-dt/images', dest: 'dist/local/vpu-data-table-view'},
+ {src: '../../node_modules/datatables.net-responsive-dt/css', dest: 'dist/local/vpu-data-table-view'},
+ {src: '../../node_modules/datatables.net-buttons-dt/css', dest: 'dist/local/vpu-data-table-view'},
],
}),
diff --git a/packages/data-table-view/vendor/auth b/packages/data-table-view/vendor/auth
deleted file mode 160000
index 39d0e356c029e0f2e92233520660ce307d0741d5..0000000000000000000000000000000000000000
--- a/packages/data-table-view/vendor/auth
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5
diff --git a/packages/data-table-view/vendor/common b/packages/data-table-view/vendor/common
deleted file mode 160000
index 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749..0000000000000000000000000000000000000000
--- a/packages/data-table-view/vendor/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749