.fatherrc.ts

@@ -0,0 +1,7 @@
+
+export default {
+  target: 'node',
+  cjs: {
+    type: 'babel',
+  }
+}

.gitignore

@@ -6,4 +6,5 @@
 /*.log
 /*.log.*
 /yarn.lock
+/pnpm-lock.yaml
 

package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel-plugin-import",
-  "version": "1.13.3",
+  "version": "1.13.4",
   "description": "Component modular import plugin for babel.",
   "repository": {
     "type": "git",
     "url": "https://github.com/ant-design/babel-plugin-import"
   },
   "main": "lib/index.js",
   "scripts": {
-    "build": "father-next",
+    "build": "father-build",
     "test": "umi-test --coverage",
     "debug": "umi-test",
     "lint": "eslint --ext .js src",
@@ -45,7 +45,7 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-prettier": "^3.1.3",
-    "father-next": "^3.0.0-alpha.3",
+    "father-build": "^1.21.2",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.8",
     "material-ui": "^0.20.2",

src/Plugin.js

@@ -76,7 +76,7 @@ export default class Plugin {
         ? addDefault(file.path, path, { nameHint: methodName })
         : addNamed(file.path, methodName, path);
       if (this.customStyleName) {
-        const stylePath = winPath(this.customStyleName(transformedMethodName));
+        const stylePath = winPath(this.customStyleName(transformedMethodName, file));
         addSideEffect(file.path, `${stylePath}`);
       } else if (this.styleLibraryDirectory) {
         const stylePath = winPath(
@@ -274,7 +274,10 @@ export default class Plugin {
 
   NewExpression(path, state) {
     const { node } = path;
-    this.buildExpressionHandler(node, ['callee', 'arguments'], path, state);
+    this.buildExpressionHandler(node, ['callee'], path, state);
+
+    const argumentsProps = node.arguments.map((_, index) => index);
+    this.buildExpressionHandler(node.arguments, argumentsProps, path, state);
   }
 
   SwitchStatement(path, state) {

test/fixtures/as-arguments-identifier/actual.js

@@ -1,2 +1,3 @@
 import { Modal } from 'antd';
 const _Modal = bind()(Modal);
+const _newModal = new AnyClass(Modal);

test/fixtures/as-arguments-identifier/expected.js

@@ -4,4 +4,6 @@ var _modal = _interopRequireDefault(require("antd/lib/modal"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _Modal = bind()(_modal.default);
+var _Modal = bind()(_modal.default);
+
+var _newModal = new AnyClass(_modal.default);

test/fixtures/custom-style-name-file/actual.js

@@ -0,0 +1,5 @@
+import { Button } from 'element-ui';
+
+ReactDOM.render(<div>
+  <Button>xxxx</Button>
+</div>);

test/fixtures/custom-style-name-file/expected.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+
+require("../../../../element-ui/lib/theme-light/button");
+
+var _button2 = _interopRequireDefault(require("element-ui/lib/button"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+ReactDOM.render( /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_button2.default, null, "xxxx")));

test/index.test.js

@@ -101,6 +101,20 @@ describe('index', () => {
             customStyleName: name => `element-ui/lib/theme-light/${name}`,
           },
         ];
+      } else if (caseName === 'custom-style-name-file') {
+        pluginWithOpts = [
+          plugin,
+          {
+            libraryName: 'element-ui',
+            customStyleName: (name, file) => {
+              const { root, filename } = file?.opts;
+              const diff = filename?.slice(root?.length);
+              const count = diff.match(/\//g).length;
+              const prefix = String.prototype.repeat.call('../', count);
+              return `${prefix}element-ui/lib/theme-light/${name}`;
+            },
+          },
+        ];
       } else {
         pluginWithOpts = [plugin, { libraryName: 'antd' }];
       }