diff --git a/.dependabot/config.yml b/.dependabot/config.yml index c2dbc60b4..2b2adf3ed 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -4,8 +4,3 @@ update_configs: - package_manager: "javascript" directory: "./" update_schedule: "live" - ignored_updates: - - match: - dependency_name: "@ui5/fs" - - match: - dependency_name: "@ui5/logger" diff --git a/packages/ui5-middleware-webjars/package.json b/packages/ui5-middleware-webjars/package.json index 36ecd8e67..3375912db 100644 --- a/packages/ui5-middleware-webjars/package.json +++ b/packages/ui5-middleware-webjars/package.json @@ -13,7 +13,6 @@ "lint": "eslint lib" }, "dependencies": { - "@ui5/server": "^3.1.3", "jszip": "^3.10.1" } } diff --git a/packages/ui5-task-cachebuster/package.json b/packages/ui5-task-cachebuster/package.json index 5a7997a2d..f9ab16963 100644 --- a/packages/ui5-task-cachebuster/package.json +++ b/packages/ui5-task-cachebuster/package.json @@ -22,9 +22,6 @@ "verbose": true, "timeout": "5m" }, - "dependencies": { - "@ui5/fs": "^3.0.4" - }, "devDependencies": { "@ui5/cli": "^3.3.4", "ava": "^5.3.1" diff --git a/packages/ui5-task-flatten-library/package.json b/packages/ui5-task-flatten-library/package.json index cb16c12a0..58759acda 100644 --- a/packages/ui5-task-flatten-library/package.json +++ b/packages/ui5-task-flatten-library/package.json @@ -11,8 +11,5 @@ }, "scripts": { "lint": "eslint lib" - }, - "dependencies": { - "@ui5/logger": "^3.0.0" } } diff --git a/packages/ui5-task-pwa-enabler/lib/pwaEnabler.js b/packages/ui5-task-pwa-enabler/lib/pwaEnabler.js index 02b1f41f6..a4ceef56a 100644 --- a/packages/ui5-task-pwa-enabler/lib/pwaEnabler.js +++ b/packages/ui5-task-pwa-enabler/lib/pwaEnabler.js @@ -7,6 +7,7 @@ const HTMLParser = require("node-html-parser"); let ws = undefined; let rootDir = undefined; +let createResource = undefined; const swStrategies = { offlinePage: "Offline-Page", @@ -49,11 +50,13 @@ let default_manifest = { * @param {string} parameters.options.projectName Project name * @param {string} [parameters.options.projectNamespace] Project namespace if available * @param {object} [parameters.options.configuration] Task configuration if given in ui5.yaml + * @param {object} parameters.taskUtil the task utilities * @returns {Promise} Promise resolving with undefined once data has been written */ -module.exports = async function ({ workspace, dependencies, options: { projectName, projectNamespace, configuration } }) { +module.exports = async function ({ workspace, dependencies, options: { projectName, projectNamespace, configuration }, taskUtil }) { ws = workspace; rootDir = "/resources/" + projectNamespace; + createResource = taskUtil.resourceFactory.createResource; if (!configuration) { throw "Configuration is missing"; } @@ -100,11 +103,10 @@ async function addServiceworkerRegistration() { * @returns {Promise} which resolves once the data has been written */ async function writeFile({ path, content }) { - const { default: Resource } = await import("@ui5/fs/Resource"); if (typeof content === "string") { - return ws.write(new Resource({ path: path, string: content })); + return ws.write(createResource({ path: path, string: content })); } else { - return ws.write(new Resource({ path: path, buffer: content })); + return ws.write(createResource({ path: path, buffer: content })); } } diff --git a/packages/ui5-task-pwa-enabler/package.json b/packages/ui5-task-pwa-enabler/package.json index 32a4f3b11..3c3824794 100644 --- a/packages/ui5-task-pwa-enabler/package.json +++ b/packages/ui5-task-pwa-enabler/package.json @@ -13,7 +13,6 @@ "lint": "eslint lib" }, "dependencies": { - "@ui5/fs": "^3.0.4", "mustache": "^4.2.0", "node-html-parser": "^6.1.5" } diff --git a/packages/ui5-task-zipper/lib/zipper.js b/packages/ui5-task-zipper/lib/zipper.js index 44fdf6cfb..c47121315 100644 --- a/packages/ui5-task-zipper/lib/zipper.js +++ b/packages/ui5-task-zipper/lib/zipper.js @@ -49,11 +49,10 @@ module.exports = async function ({ log, workspace, dependencies, options, taskUt const zipName = `${defaultName || options.projectNamespace.replace(/\//g, "")}.zip`; // determine the dependencies resource collection to be included - const { default: ReaderCollection } = await import("@ui5/fs/ReaderCollection"); const deps = includeDependencies === true ? dependencies - : new ReaderCollection({ + : taskUtil.resourceFactory.createReaderCollection({ readers: !includeDependencies ? [] : dependencies._readers.filter((reader) => { diff --git a/packages/ui5-task-zipper/package.json b/packages/ui5-task-zipper/package.json index 4733e8ed5..ac885e5d7 100644 --- a/packages/ui5-task-zipper/package.json +++ b/packages/ui5-task-zipper/package.json @@ -23,7 +23,6 @@ "timeout": "5m" }, "dependencies": { - "@ui5/fs": "^3.0.4", "yazl": "^2.5.1" }, "devDependencies": { diff --git a/packages/ui5-tooling-modules/package.json b/packages/ui5-tooling-modules/package.json index fdc2b7e00..55b818aab 100644 --- a/packages/ui5-tooling-modules/package.json +++ b/packages/ui5-tooling-modules/package.json @@ -30,7 +30,6 @@ "@rollup/plugin-node-resolve": "^15.1.0", "@rollup/plugin-replace": "^5.0.2", "@rollup/pluginutils": "^5.0.2", - "@ui5/fs": "^3.0.4", "espree": "^9.6.1", "estraverse": "^5.3.0", "fast-xml-parser": "^4.2.6", diff --git a/packages/ui5-tooling-transpile/lib/util.js b/packages/ui5-tooling-transpile/lib/util.js index 468a96ad2..365be0f5d 100644 --- a/packages/ui5-tooling-transpile/lib/util.js +++ b/packages/ui5-tooling-transpile/lib/util.js @@ -358,7 +358,8 @@ module.exports = function (log) { // current work directory is the rootpath of the project resource // it is a root resource which should be considered to be resolved if (path.relative(cwd, resource.getProject().getRootPath()) === "") { - resourcePath = resource.getSourceMetadata().fsPath || resourcePath; + // npm dependencies don't have sourceMetadata applied to resource! + resourcePath = resource.getSourceMetadata()?.fsPath || resourcePath; } } else { // for older versions resolving the file system path is a bit more diff --git a/packages/ui5-tooling-transpile/package.json b/packages/ui5-tooling-transpile/package.json index e5e014771..5c6a9a61b 100644 --- a/packages/ui5-tooling-transpile/package.json +++ b/packages/ui5-tooling-transpile/package.json @@ -13,7 +13,6 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-typescript": "^7.22.5", - "@ui5/fs": "^3.0.4", "babel-plugin-transform-async-to-promises": "^0.8.18", "babel-plugin-transform-remove-console": "^6.9.4", "babel-preset-transform-ui5": "^7.2.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed699bff6..e5c72d595 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -260,18 +260,11 @@ importers: packages/ui5-middleware-webjars: dependencies: - '@ui5/server': - specifier: ^3.1.3 - version: 3.1.3 jszip: specifier: ^3.10.1 version: 3.10.1 packages/ui5-task-cachebuster: - dependencies: - '@ui5/fs': - specifier: ^3.0.4 - version: 3.0.4 devDependencies: '@ui5/cli': specifier: ^3.3.4 @@ -292,11 +285,7 @@ importers: specifier: ^7.4.6 version: 7.4.6 - packages/ui5-task-flatten-library: - dependencies: - '@ui5/logger': - specifier: ^3.0.0 - version: 3.0.0 + packages/ui5-task-flatten-library: {} packages/ui5-task-i18ncheck: dependencies: @@ -312,9 +301,6 @@ importers: packages/ui5-task-pwa-enabler: dependencies: - '@ui5/fs': - specifier: ^3.0.4 - version: 3.0.4 mustache: specifier: ^4.2.0 version: 4.2.0 @@ -324,9 +310,6 @@ importers: packages/ui5-task-zipper: dependencies: - '@ui5/fs': - specifier: ^3.0.4 - version: 3.0.4 yazl: specifier: ^2.5.1 version: 2.5.1 @@ -364,9 +347,6 @@ importers: '@rollup/pluginutils': specifier: ^5.0.2 version: 5.0.2(rollup@3.27.0) - '@ui5/fs': - specifier: ^3.0.4 - version: 3.0.4 espree: specifier: ^9.6.1 version: 9.6.1 @@ -428,9 +408,6 @@ importers: '@babel/preset-typescript': specifier: ^7.22.5 version: 7.22.5(@babel/core@7.22.9) - '@ui5/fs': - specifier: ^3.0.4 - version: 3.0.4 babel-plugin-transform-async-to-promises: specifier: ^0.8.18 version: 0.8.18