update

node_modules/@babel/plugin-transform-modules-commonjs/lib/index.js

@@ -9,28 +9,32 @@ var _helperPluginUtils = require("@babel/helper-plugin-utils");
 
 var _helperModuleTransforms = require("@babel/helper-module-transforms");
 
-var _helperSimpleAccess = _interopRequireDefault(require("@babel/helper-simple-access"));
+var _helperSimpleAccess = require("@babel/helper-simple-access");
 
 var _core = require("@babel/core");
 
 var _utils = require("babel-plugin-dynamic-import-node/utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = (0, _helperPluginUtils.declare)((api, options) => {
+  var _api$assumption, _api$assumption2, _api$assumption3;
+
   api.assertVersion(7);
   const transformImportCall = (0, _utils.createDynamicImportTransform)(api);
   const {
-    loose,
     strictNamespace = false,
-    mjsStrictNamespace = true,
+    mjsStrictNamespace = strictNamespace,
     allowTopLevelThis,
     strict,
     strictMode,
     noInterop,
+    importInterop,
     lazy = false,
-    allowCommonJSExports = true
+    allowCommonJSExports = true,
+    loose = false
   } = options;
+  const constantReexports = (_api$assumption = api.assumption("constantReexports")) != null ? _api$assumption : loose;
+  const enumerableModuleMeta = (_api$assumption2 = api.assumption("enumerableModuleMeta")) != null ? _api$assumption2 : loose;
+  const noIncompleteNsImportDetection = (_api$assumption3 = api.assumption("noIncompleteNsImportDetection")) != null ? _api$assumption3 : false;
 
   if (typeof lazy !== "boolean" && typeof lazy !== "function" && (!Array.isArray(lazy) || !lazy.every(item => typeof item === "string"))) {
     throw new Error(`.lazy must be a boolean, array of strings, or a function`);
@@ -73,11 +77,22 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
       path.replaceWith(getAssertion(localName));
     },
 
+    UpdateExpression(path) {
+      const arg = path.get("argument");
+      if (!arg.isIdentifier()) return;
+      const localName = arg.node.name;
+      if (localName !== "module" && localName !== "exports") return;
+      const localBinding = path.scope.getBinding(localName);
+      const rootBinding = this.scope.getBinding(localName);
+      if (rootBinding !== localBinding) return;
+      path.replaceWith(_core.types.assignmentExpression(path.node.operator[0] + "=", arg.node, getAssertion(localName)));
+    },
+
     AssignmentExpression(path) {
       const left = path.get("left");
 
       if (left.isIdentifier()) {
-        const localName = path.node.name;
+        const localName = left.node.name;
         if (localName !== "module" && localName !== "exports") return;
         const localBinding = path.scope.getBinding(localName);
         const rootBinding = this.scope.getBinding(localName);
@@ -131,7 +146,7 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
           path.scope.rename("__dirname");
 
           if (!allowCommonJSExports) {
-            (0, _helperSimpleAccess.default)(path, new Set(["module", "exports"]));
+            (0, _helperSimpleAccess.default)(path, new Set(["module", "exports"]), false);
             path.traverse(moduleExportsVisitor, {
               scope: path.scope
             });
@@ -144,13 +159,17 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
             headers
           } = (0, _helperModuleTransforms.rewriteModuleStatementsAndPrepareHeader)(path, {
             exportName: "exports",
-            loose,
+            constantReexports,
+            enumerableModuleMeta,
             strict,
             strictMode,
             allowTopLevelThis,
             noInterop,
+            importInterop,
             lazy,
-            esNamespaceOnly: typeof state.filename === "string" && /\.mjs$/.test(state.filename) ? mjsStrictNamespace : strictNamespace
+            esNamespaceOnly: typeof state.filename === "string" && /\.mjs$/.test(state.filename) ? mjsStrictNamespace : strictNamespace,
+            noIncompleteNsImportDetection,
+            filename: this.file.opts.filename
           });
 
           for (const [source, metadata] of meta.source) {
@@ -165,7 +184,7 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
               const init = (0, _helperModuleTransforms.wrapInterop)(path, loadExpr, metadata.interop) || loadExpr;
 
               if (metadata.lazy) {
-                header = _core.template.ast`
+                header = _core.template.statement.ast`
                   function ${metadata.name}() {
                     const data = ${init};
                     ${metadata.name} = function(){ return data; };
@@ -173,7 +192,7 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
                   }
                 `;
               } else {
-                header = _core.template.ast`
+                header = _core.template.statement.ast`
                   var ${metadata.name} = ${init};
                 `;
               }
@@ -181,11 +200,18 @@ var _default = (0, _helperPluginUtils.declare)((api, options) => {
 
             header.loc = metadata.loc;
             headers.push(header);
-            headers.push(...(0, _helperModuleTransforms.buildNamespaceInitStatements)(meta, metadata, loose));
+            headers.push(...(0, _helperModuleTransforms.buildNamespaceInitStatements)(meta, metadata, constantReexports));
           }
 
           (0, _helperModuleTransforms.ensureStatementsHoisted)(headers);
           path.unshiftContainer("body", headers);
+          path.get("body").forEach(path => {
+            if (headers.indexOf(path.node) === -1) return;
+
+            if (path.isVariableDeclaration()) {
+              path.scope.registerDeclaration(path);
+            }
+          });
         }
 
       }