babel-plugin-transform-modules-ui5 7.4.0 → 7.4.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.4.2](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.4.1...v7.4.2) (2024-06-25)
+
+
+### Bug Fixes
+
+* remove mandatory ESM file extensions from sap.ui.define imports ([#129](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/129)) ([571dfa1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/571dfa192984c9838c573909546b42a85b71e5b6))
+
+
+
+
+
+## [7.4.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.4.0...v7.4.1) (2024-06-02)
+
+
+### Bug Fixes
+
+* ensure to remove file ext .js only from module path ([#127](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/127)) ([c6afb92](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/c6afb92c2f758a245086baa6f77d3274bb4e5466))
+
+
+
+
+
 # [7.4.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.3.1...v7.4.0) (2024-05-31)
 
 

package/dist/modules/visitor.js

@@ -37,13 +37,29 @@ const hasGlobalExportFlag = node => (0, _jsdoc.hasJsdocGlobalExportFlag)(node);
 const addImport = (imports, imp, filename, first) => {
   const existingImport = imports.find(i => i.src === imp.src);
   if (!existingImport) {
-    // if a module ends with the file extension ".js" and it can be resolved to
+    // if a module path ends with the file extension ".js" and it can be resolved to
     // a local file having also the file extension ".js" and not ".js.js" then
     // we need to slice the file extension to avoid redundant file extension
     // (the require/define of UI5 always adds the file extension ".js" to the module name)
-    if (imp.src.indexOf(".js") != -1) {
+    if (/^(?:(@[^/]+)\/)?([^/]+)\/(.*)\.js$/.test(imp.src)) {
       try {
-        const modulePath = require.resolve(imp.src);
+        let modulePath;
+        let absModuleSrc = imp.src;
+        // if the module has a relative path, resolve it to an absolute path
+        // and verify if the file exists, if not, try to resolve it as a module
+        if (/^\.\.?\//.test(absModuleSrc)) {
+          absModuleSrc = (0, _path.resolve)((0, _path.dirname)(filename), absModuleSrc);
+          // handle the fallback of module names introduced with Node 20.0.0
+          [".js", ".jsx", ".ts", ".tsx"].some(ext => {
+            if ((0, _fs.existsSync)(absModuleSrc.replace(/\.js$/, ext))) {
+              modulePath = imp.src;
+              return true;
+            }
+          });
+        } else {
+          modulePath = require.resolve(absModuleSrc);
+        }
+        // detect removal of file extension and log a hint
         if (modulePath.endsWith(imp.src.split("/").pop())) {
           console.log(`\x1b[33mHint:\x1b[0m Removed file extension for dependency "\x1b[34m${imp.src}\x1b[0m" found in \x1b[90m${filename}\x1b[0m`);
           imp.src = imp.src.slice(0, -3);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.4.0",
+  "version": "7.4.2",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -94,5 +94,5 @@
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5"
   },
-  "gitHead": "76dacf36cedd90d054dba13d8a92168e66b1730b"
+  "gitHead": "840510e9de26aa1e17946cf0f3a2b6395089e7e1"
 }