diff --git a/packages/iobroker.vis-2/gulpfile.js b/packages/iobroker.vis-2/gulpfile.js index 1a437ca4..66d3aab7 100644 --- a/packages/iobroker.vis-2/gulpfile.js +++ b/packages/iobroker.vis-2/gulpfile.js @@ -79,6 +79,8 @@ function buildRuntime() { } gulp.task('runtime-0-clean', done => { + deleteFoldersRecursive(`${__dirname}/www`); + deleteFoldersRecursive(`${__dirname}/../../www`); deleteFoldersRecursive(`${__dirname}/runtime`, ['node_modules', 'package-lock.json']); done(); }); @@ -198,6 +200,7 @@ gulp.task('runtime-6-copy-dep', gulp.series('runtime-4-build-dep', 'runtime-6-co gulp.task('runtime-7-patch', done => { patchFile(`${__dirname}/www/index.html`); patchFile(`${__dirname}/runtime/build/index.html`); + copyFolder(`${__dirname}/www`, `${__dirname}/../../www`); done(); }); @@ -205,8 +208,6 @@ gulp.task('runtime-7-patch-dep', gulp.series('runtime-6-copy-dep', 'runtime-7-p gulp.task('0-clean', done => { deleteFoldersRecursive(`${__dirname}/src/build`); - deleteFoldersRecursive(`${__dirname}/www`); - deleteFoldersRecursive(`${__dirname}/../../www`); done(); }); diff --git a/packages/iobroker.vis-2/io-package.json b/packages/iobroker.vis-2/io-package.json index 84440099..48bcda54 100644 --- a/packages/iobroker.vis-2/io-package.json +++ b/packages/iobroker.vis-2/io-package.json @@ -171,7 +171,6 @@ } }, "compact": true, - "materialize": true, "eraseOnUpload": true, "welcomeScreen": [ { diff --git a/packages/iobroker.vis-2/package.json b/packages/iobroker.vis-2/package.json index 187056c4..e52dc544 100644 --- a/packages/iobroker.vis-2/package.json +++ b/packages/iobroker.vis-2/package.json @@ -34,7 +34,7 @@ "@alcalzone/release-script": "^3.7.0", "@alcalzone/release-script-plugin-iobroker": "^3.7.0", "@alcalzone/release-script-plugin-license": "^3.7.0", - "@iobroker/vis-2-widgets-testing": "^1.0.1", + "@iobroker/vis-2-widgets-testing": "^1.0.2", "@tsconfig/node18": "^18.2.4", "@types/mocha": "^10.0.6", "chai": "^4.4.1", diff --git a/packages/iobroker.vis-2/test/testAdapter.gui.js b/packages/iobroker.vis-2/test/testAdapter.gui.js index cc464f84..180586b0 100644 --- a/packages/iobroker.vis-2/test/testAdapter.gui.js +++ b/packages/iobroker.vis-2/test/testAdapter.gui.js @@ -1,5 +1,5 @@ const helper = require('@iobroker/vis-2-widgets-testing'); -const path = require('path') +const path = require('node:path') let gPage; let gBrowser; @@ -14,7 +14,7 @@ describe('vis', () => { additionalAdapters: ['web'], visUploadedId: 'vis-2.0.info.uploaded', mainGuiProject: 'vis-2', - rootDir: path.join(__dirname, '..') + '/' + rootDir: path.normalize(`${path.join(__dirname, '..')}/`).replace(/\\/g, '/'), }); const { browser, page } = await helper.startBrowser(process.env.CI === 'true'); gBrowser = browser @@ -71,4 +71,4 @@ describe('vis', () => { await helper.stopIoBroker(); console.log('ioBroker stopped'); }); -}); \ No newline at end of file +}); diff --git a/packages/iobroker.vis-2/test/testPackageFiles.engine.js b/packages/iobroker.vis-2/test/testPackageFiles.engine.js index 9a11cd81..2f6f308a 100644 --- a/packages/iobroker.vis-2/test/testPackageFiles.engine.js +++ b/packages/iobroker.vis-2/test/testPackageFiles.engine.js @@ -1 +1,3 @@ -require('@iobroker/legacy-testing/tests/testPackageFiles'); \ No newline at end of file +const path = require('node:path'); +process.env.IOBROKER_ROOT_DIR = path.normalize(`${__dirname}/../`).replace(/\\/g, '/'); +require('@iobroker/legacy-testing/tests/testPackageFiles');