babel-plugin-named-asset-import 0.2.3 → 0.3.2

package/index.js

@@ -5,60 +5,98 @@ const { extname } = require('path');
 function namedAssetImportPlugin({ types: t }) {
   const visited = new WeakSet();
 
+  function generateNewSourcePath(loaderMap, moduleName, sourcePath) {
+    const ext = extname(sourcePath).substr(1);
+    const extMap = loaderMap[ext];
+    return extMap[moduleName]
+      ? extMap[moduleName].replace(/\[path\]/, sourcePath)
+      : sourcePath;
+  }
+
+  function replaceMatchingSpecifiers(path, loaderMap, callback) {
+    const sourcePath = path.node.source.value;
+    const ext = extname(sourcePath).substr(1);
+
+    if (visited.has(path.node) || sourcePath.indexOf('!') !== -1) {
+      return;
+    }
+
+    if (loaderMap[ext]) {
+      path.replaceWithMultiple(
+        path.node.specifiers.map(specifier => {
+          const newSpecifier = callback(specifier, sourcePath);
+          visited.add(newSpecifier);
+
+          return newSpecifier;
+        })
+      );
+    }
+  }
+
   return {
     visitor: {
-      ImportDeclaration(
+      ExportNamedDeclaration(
         path,
         {
           opts: { loaderMap },
         }
       ) {
-        const sourcePath = path.node.source.value;
-        const ext = extname(sourcePath).substr(1);
-
-        if (visited.has(path.node) || sourcePath.indexOf('!') !== -1) {
+        if (!path.node.source) {
           return;
         }
 
-        if (loaderMap[ext]) {
-          path.replaceWithMultiple(
-            path.node.specifiers.map(specifier => {
-              if (t.isImportDefaultSpecifier(specifier)) {
-                const newDefaultImport = t.importDeclaration(
-                  [
-                    t.importDefaultSpecifier(
-                      t.identifier(specifier.local.name)
-                    ),
-                  ],
-                  t.stringLiteral(sourcePath)
-                );
-
-                visited.add(newDefaultImport);
-                return newDefaultImport;
-              }
-
-              const newImport = t.importDeclaration(
-                [
-                  t.importSpecifier(
-                    t.identifier(specifier.local.name),
-                    t.identifier(specifier.imported.name)
-                  ),
-                ],
-                t.stringLiteral(
-                  loaderMap[ext][specifier.imported.name]
-                    ? loaderMap[ext][specifier.imported.name].replace(
-                        /\[path\]/,
-                        sourcePath
-                      )
-                    : sourcePath
-                )
-              );
+        replaceMatchingSpecifiers(path, loaderMap, (specifier, sourcePath) => {
+          if (t.isExportDefaultSpecifier(specifier)) {
+            return t.exportDeclaration(
+              [t.exportDefaultSpecifier(t.identifier(specifier.local.name))],
+              t.stringLiteral(sourcePath)
+            );
+          }
 
-              visited.add(newImport);
-              return newImport;
-            })
+          return t.exportNamedDeclaration(
+            null,
+            [
+              t.exportSpecifier(
+                t.identifier(specifier.local.name),
+                t.identifier(specifier.exported.name)
+              ),
+            ],
+            t.stringLiteral(
+              generateNewSourcePath(loaderMap, specifier.local.name, sourcePath)
+            )
           );
+        });
+      },
+      ImportDeclaration(
+        path,
+        {
+          opts: { loaderMap },
         }
+      ) {
+        replaceMatchingSpecifiers(path, loaderMap, (specifier, sourcePath) => {
+          if (t.isImportDefaultSpecifier(specifier)) {
+            return t.importDeclaration(
+              [t.importDefaultSpecifier(t.identifier(specifier.local.name))],
+              t.stringLiteral(sourcePath)
+            );
+          }
+
+          return t.importDeclaration(
+            [
+              t.importSpecifier(
+                t.identifier(specifier.local.name),
+                t.identifier(specifier.imported.name)
+              ),
+            ],
+            t.stringLiteral(
+              generateNewSourcePath(
+                loaderMap,
+                specifier.imported.name,
+                sourcePath
+              )
+            )
+          );
+        });
       },
     },
   };

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "babel-plugin-named-asset-import",
-  "version": "0.2.3",
+  "version": "0.3.2",
   "description": "Babel plugin for named asset imports in Create React App",
-  "repository": "facebookincubator/create-react-app",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/create-react-app.git",
+    "directory": "packages/babel-plugin-named-asset-import"
+  },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/facebookincubator/create-react-app/issues"
+    "url": "https://github.com/facebook/create-react-app/issues"
   },
   "main": "index.js",
   "files": [
@@ -15,10 +19,11 @@
     "@babel/core": "^7.1.0"
   },
   "devDependencies": {
-    "babel-plugin-tester": "^5.5.1",
-    "jest": "^23.6.0"
+    "babel-plugin-tester": "^6.0.1",
+    "jest": "24.7.1"
   },
   "scripts": {
     "test": "jest"
-  }
+  },
+  "gitHead": "265c1592dcf3853122dcdd50e1bfc1e43f697fbe"
 }