feat(ui5-tooling-modules): new module resolution

packages/ui5-tooling-modules/lib/rollup-plugin-pnpm-resolve.js

@@ -1,32 +1,19 @@
 const path = require("path");
-const fs = require("fs");
-
-const existsAndIsFile = function (file) {
- return fs.existsSync(file) && fs.statSync(file).isFile();
-};
 
 module.exports = function ({ resolveModule } = {}) {
  return {
  name: "pnpm-resolve",
  resolveId: function (importee, importer) {
+ let module = importee;
  if (path.isAbsolute(importee)) {
  // ignore absolute paths
  return null;
  } else if (importee.startsWith("./") || importee.startsWith("../")) {
  // resolve relative paths
- const file = path.resolve(path.dirname(importer), importee);
- if (existsAndIsFile(file)) {
- return file;
- } else if (existsAndIsFile(`${file}.js`)) {
- return `${file}.js`;
- } else if (existsAndIsFile(`${file}.cjs`)) {
- return `${file}.cjs`;
- } else if (existsAndIsFile(`${file}.mjs`)) {
- return `${file}.mjs`;
- }
+ module = path.resolve(path.dirname(importer), importee);
  }
- // needs to be in sync with nodeResolve
- const resolvedModule = resolveModule(importee);
+ // try to resolve the node module using the provided function
+ const resolvedModule = resolveModule(module);
  //console.log(`Resolved ${importee} to ${resolvedModule}`);
  return resolvedModule;
  },

packages/ui5-tooling-modules/lib/rollup-plugin-webcomponents.js

@@ -10,7 +10,7 @@ const { lt, gte } = require("semver");
 // TODO:
 // - enabled - disabled mapping
 // - Externalize UI5 Web Components specific code
-module.exports = function ({ log, resolveModule, framework, options } = {}) {
+module.exports = function ({ log, resolveModule, getPackageJson, framework, options } = {}) {
  // derive the configuration from the provided options
  let { skip, scoping, scopeSuffix, enrichBusyIndicator } = Object.assign({ skip: false, scoping: true, enrichBusyIndicator: false }, options);
 
@@ -50,7 +50,13 @@ module.exports = function ({ log, resolveModule, framework, options } = {}) {
  if (!registryEntry) {
  const packageJsonPath = resolveModule(`${npmPackage}/package.json`);
  if (packageJsonPath) {
- const packageJson = require(packageJsonPath);
+ let packageJson;
+ try {
+ packageJson = getPackageJson(packageJsonPath);
+ } catch (err) {
+ log.error(`Failed to parse package.json of ${npmPackage}`, err);
+ return undefined;
+ }
  const npmPackagePath = dirname(packageJsonPath);
  // check if the custom elements metadata file exists (fallback to custom-elements-internal.json for @ui5/webcomponents)
  let metadataPath;