fix(ui5-tooling-modules): properly support keepDynamicImports

packages/ui5-tooling-modules/lib/rollup-plugin-dynamic-imports.js

@@ -1,20 +1,47 @@
-module.exports = function ({ moduleName, keepDynamicImports } = {}) {
- // by default the dynamic imports are kept (can be disabled with false or define a list of modules to keep)
- keepDynamicImports = keepDynamicImports === undefined ? true : keepDynamicImports;
- // if the value is an array, the module needs to be listed to keep the dynamic imports
- if (typeof keepDynamicImports !== "boolean" && Array.isArray(keepDynamicImports)) {
- keepDynamicImports = keepDynamicImports.indexOf(moduleName) !== -1;
- }
+const { existsSync, readFileSync } = require("fs");
+
+module.exports = function ({ findPackageJson, keepDynamicImports } = {}) {
  // ensure to keep the dynamic import
  return {
  name: "dynamic-imports",
- renderDynamicImport({ targetModuleId }) {
- if (!targetModuleId && keepDynamicImports) {
+ /*
+ resolveDynamicImport(specifier, importer, { attributes } = {}) {
+ const code = this.getModuleInfo(importer)?.code;
+ if (code) {
+ // get the import statement around the specifier
+ const codeBeforeImport = code.substring(0, specifier.start);
+ const importStatementStart = codeBeforeImport.lastIndexOf("(") + 1;
+ const codeAfterImport = code.substring(specifier.end);
+ const importStatementEnd = codeAfterImport.indexOf(")");
+ const importStatement = code.substring(importStatementStart, specifier.end + importStatementEnd);
+ // check for a / * webpackIgnore: true * / in the import statement ignoring whitespaces
+ const hasIgnoreMarker = importStatement.match(/\/\*\s*webpackIgnore:\s*true\s*\*\//);
+ if (hasIgnoreMarker) {
+ return false;
+ }
+ }
+ return null;
+ },
+ */
+ renderDynamicImport({ moduleId, targetModuleId /*, customResolution, format */ }) {
+ // detect whether the dynamic import should be kept or not
+ let keepDynamicImport = true;
+ if (Array.isArray(keepDynamicImports)) {
+ const pkgJsonFile = findPackageJson(moduleId);
+ const pkgJson = existsSync(pkgJsonFile) ? JSON.parse(readFileSync(pkgJsonFile, { encoding: "utf8" })) : {};
+ keepDynamicImport = keepDynamicImports.indexOf(pkgJson.name) !== -1;
+ } else if (typeof keepDynamicImports === "boolean") {
+ keepDynamicImport = keepDynamicImports;
+ }
+ // empty targetModuleId means it is a dynamic import using a variable and in this
+ // case we keep it if the module is in the list or based on the boolean value
+ if (!targetModuleId && keepDynamicImport) {
  return {
  left: "import(",
  right: ")",
  };
  }
+ return null;
  },
  };
 };

packages/ui5-tooling-modules/lib/util.js

@@ -1168,9 +1168,10 @@ module.exports = function (log, projectInfo) {
  isMiddleware,
  pluginOptions,
  };
- if (modules.length === 1) {
- options.afterPlugins.push(dynamicImports({ moduleName: modules[0].name, keepDynamicImports }));
- }
+ // by default we add the dynamic imports plugin to keep dynamic imports for the given modules
+ // if the keepDynamicImports is a boolean, we keep the dynamic imports for all modules
+ options.afterPlugins.push(dynamicImports({ findPackageJson, keepDynamicImports }));
+ // when minifying the code, we add the terser plugin
  if (minify) {
  options.afterPlugins.push(require("@rollup/plugin-terser")());
  }