requirejs-esm 2.4.0 → 2.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "requirejs-esm",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "A RequireJS plugin converting JavaScript modules from ESM to AMD.",
   "author": "Ferdinand Prantl <prantlf@gmail.com>",
   "license": "MIT",
@@ -67,29 +67,46 @@
     "functions": 20,
     "statements": 45
   },
+  "release": {
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      [
+        "@semantic-release/github",
+        {
+          "failComment": false
+        }
+      ],
+      "@semantic-release/git"
+    ]
+  },
   "dependencies": {
     "@prantlf/convert-source-map": "^2.0.0",
-    "astring": "^1.8.6",
+    "astring": "^1.8.4",
     "charcodes": "^0.2.0",
-    "commander": "^12.1.0",
-    "meriyah": "^5.0.0",
-    "punycode": "^2.3.1",
+    "commander": "^10.0.1",
+    "meriyah": "^4.3.5",
+    "punycode": "^2.3.0",
     "source-map": "^0.8.0-beta.0",
     "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
-    "@prantlf/requirejs": "^3.2.0",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "c8": "^10.1.2",
-    "eslint": "^8.57.0",
+    "@prantlf/requirejs": "^3.0.2",
+    "@rollup/plugin-commonjs": "^24.1.0",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.2",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "c8": "^7.13.0",
+    "eslint": "^8.40.0",
     "lit-html": "^1",
-    "rollup": "^4.19.0",
+    "rollup": "^3.21.5",
     "tehanu": "^1.0.1",
-    "tehanu-repo-coco": "^1.0.1",
-    "tehanu-teru": "^1.0.1",
-    "terser": "^5.31.3"
+    "tehanu-repo-coco": "^1.0.0",
+    "tehanu-teru": "^1.0.0",
+    "terser": "^5.17.1"
   },
   "keywords": [
     "requirejs-plugin",
@@ -99,4 +116,4 @@
     "esm",
     "es6"
   ]
-}
+}

package/src/transformer/esm.js

@@ -93,7 +93,6 @@ export function transformEsmToAmd(program, options) {
   let hasExport = false
   let needReturnExport = false
   let isOnlyDefaultExport = true
-  let defaultExportVar
 
   for (let i = 0; i < length; ++i) {
     const statement = body[i]
@@ -189,7 +188,6 @@ export function transformEsmToAmd(program, options) {
     // export var a = 1
     // export function test() {}
     // export class Test {}
-    // export {default as A} from "module"
     if (statement.type === 'ExportNamedDeclaration') {
       hasExport = true
       needReturnExport = true
@@ -248,45 +246,13 @@ export function transformEsmToAmd(program, options) {
               addExportStatement({ exported, local: identifier(localName) })
             } else {
               localName = name
-              if (localName === 'default') {
-                if (exported.name === 'default') {
-                  // export {default} from "module"
-                  defaultExportVar = importVar
-                } else {
-                  // export {default as A} from "module"
-                  addExportDefaultStatement(exported, importVar)
-                }
-              } else if (exported.name === 'default') {
-                // export {A as default} from "module"
-                defaultExportVar = importVar
-              } else {
-                // export {A as B} from "module"
-                addExportStatement(specifier)
-              }
-            }
-            if (localName !== 'default' && !defaultExportVar) {
-              // _exports.B = A;
-              namedImports.push(declareImport(localName, importVar.name, name))
+              addExportStatement(specifier)
             }
+            namedImports.push(declareImport(localName, importVar.name, name))
           }
         } else {
           for (const specifier of specifiers) {
-            const { exported, local } = specifier
-            if (local.name === 'default') {
-              if (exported.name === 'default') {
-                // export {default}
-                throw new Error('Expression `export { default }` is not supported.')
-              } else {
-                // export {default as A}
-                throw new Error(`Expression \`export { default as ${exported.name} }\` is not supported.`)
-              }
-            } else if (exported.name === 'default') {
-              // export {A as default}
-              defaultExportVar = local
-            } else {
-              // export {A as B}
-              addExportStatement(specifier)
-            }
+            addExportStatement(specifier)
           }
         }
 
@@ -314,27 +280,22 @@ export function transformEsmToAmd(program, options) {
 
   // adding define wrapper
   if (hasExport && needReturnExport) {
+    // var _exports = {}
+    body.unshift(
+      variableDeclaration('let', [
+        variableDeclarator(exportsVar, objectExpression([]))
+      ])
+    )
+
+    // return <expression>
     let returnStat
-    if (defaultExportVar) {
-      // return _import
-      returnStat = returnStatement(defaultExportVar)
-    } else {
-      // var _exports = {}
-      body.unshift(
-        variableDeclaration('let', [
-          variableDeclarator(exportsVar, objectExpression([]))
-        ])
-      )
-
-      // return <expression>
-      if (isOnlyDefaultExport) {
-        // return _exports.default
-        returnStat = returnStatement(memberExpression(exportsVar, identifier('default')))
-      }
-      else {
-        // return _exports
-        returnStat = returnStatement(exportsVar)
-      }
+    if (isOnlyDefaultExport) {
+      // return _exports.default
+      returnStat = returnStatement(memberExpression(exportsVar, identifier('default')))
+    }
+    else {
+      // return _exports
+      returnStat = returnStatement(exportsVar)
     }
 
     body.push(returnStat)
@@ -350,15 +311,6 @@ export function transformEsmToAmd(program, options) {
     const exportStat = exportStatement(exportsVar, asName, local)
     body.push(exportStat)
   }
-
-  function addExportDefaultStatement(exported, imported) {
-    const asName = exported.name
-    if (asName !== 'default') {
-      isOnlyDefaultExport = false
-    }
-    const exportStat = exportStatement(exportsVar, asName, imported)
-    body.push(exportStat)
-  }
 }
 
 function declareImport(varName, object, property) {