fix: more cleanup of obsolete deps

ui5-community · Jul 31, 2023 · 8d08048 · 8d08048
1 parent 65287fa
commit 8d08048
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 47 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<undefined>} Promise resolving with <code>undefined</code> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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