Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add styleLibraryDirectory option, fixes #381 #382

Merged
merged 1 commit into from
Nov 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,27 @@ e.g.
]
```

#### styleLibraryDirectory

- `["import", { "libraryName": "element-ui", "styleLibraryDirectory": "lib/theme-chalk" }]`: import js and css modularly

If `styleLibraryDirectory` is provided (default `null`), it will be used to form style file path,
`style` will be ignored then. e.g.

```javascript
{
"libraryName": "element-ui",
"styleLibraryDirectory": "lib/theme-chalk",
}

import { Button } from 'element-ui';

↓ ↓ ↓ ↓ ↓ ↓

var _button = require('element-ui/lib/button');
require('element-ui/lib/theme-chalk/button');
```

#### customName

We can use `customName` to customize import file path.
Expand Down Expand Up @@ -226,6 +247,10 @@ module.exports = function customName(name) {
};
```

#### customStyleName

`customStyleName` works exactly the same as customName, except that it deals with style file path.

#### transformToDefaultImport

Set this option to `false` if your module does not have a `default` export.
Expand Down
14 changes: 13 additions & 1 deletion src/Plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export default class Plugin {
libraryName,
libraryDirectory,
style,
styleLibraryDirectory,
customStyleName,
camel2DashComponentName,
camel2UnderlineComponentName,
fileName,
Expand All @@ -43,6 +45,8 @@ export default class Plugin {
: camel2DashComponentName;
this.camel2UnderlineComponentName = camel2UnderlineComponentName;
this.style = style || false;
this.styleLibraryDirectory = styleLibraryDirectory;
this.customStyleName = normalizeCustomName(customStyleName);
this.fileName = fileName || '';
this.customName = normalizeCustomName(customName);
this.transformToDefaultImport = typeof transformToDefaultImport === 'undefined'
Expand Down Expand Up @@ -74,7 +78,15 @@ export default class Plugin {
pluginState.selectedMethods[methodName] = this.transformToDefaultImport // eslint-disable-line
? addDefault(file.path, path, { nameHint: methodName })
: addNamed(file.path, methodName, path);
if (style === true) {
if (this.customStyleName) {
const stylePath = winPath(this.customStyleName(transformedMethodName));
addSideEffect(file.path, `${stylePath}`);
} else if (this.styleLibraryDirectory) {
const stylePath = winPath(
join(this.libraryName, this.styleLibraryDirectory, transformedMethodName, this.fileName)
);
addSideEffect(file.path, `${stylePath}`);
} else if (style === true) {
addSideEffect(file.path, `${path}/style`);
} else if (style === 'css') {
addSideEffect(file.path, `${path}/style/css`);
Expand Down
6 changes: 6 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export default function ({ types }) {
libraryName,
libraryDirectory,
style,
styleLibraryDirectory,
customStyleName,
camel2DashComponentName,
camel2UnderlineComponentName,
fileName,
Expand All @@ -37,6 +39,8 @@ export default function ({ types }) {
libraryName,
libraryDirectory,
style,
styleLibraryDirectory,
customStyleName,
camel2DashComponentName,
camel2UnderlineComponentName,
fileName,
Expand All @@ -53,6 +57,8 @@ export default function ({ types }) {
opts.libraryName,
opts.libraryDirectory,
opts.style,
opts.styleLibraryDirectory,
opts.customStyleName,
opts.camel2DashComponentName,
opts.camel2UnderlineComponentName,
opts.fileName,
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/custom-style-name/actual.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Button } from 'element-ui';

ReactDOM.render(<div>
<Button>xxxx</Button>
</div>);
11 changes: 11 additions & 0 deletions test/fixtures/custom-style-name/expected.js
Original file line number Diff line number Diff line change
@@ -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(_react.default.createElement("div", null, _react.default.createElement(_button2.default, null, "xxxx")));
5 changes: 5 additions & 0 deletions test/fixtures/style-library-name/actual.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Button } from 'element-ui';

ReactDOM.render(<div>
<Button>xxxx</Button>
</div>);
11 changes: 11 additions & 0 deletions test/fixtures/style-library-name/expected.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"use strict";

var _react = _interopRequireDefault(require("react"));

require("element-ui/lib/theme-chalk/button");

var _button2 = _interopRequireDefault(require("element-ui/lib/button"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button2.default, null, "xxxx")));
16 changes: 16 additions & 0 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,22 @@ describe('index', () => {
},
},
];
} else if (caseName === 'style-library-name') {
pluginWithOpts = [
plugin,
{
libraryName: 'element-ui',
styleLibraryDirectory: 'lib/theme-chalk',
},
];
} else if (caseName === 'custom-style-name') {
pluginWithOpts = [
plugin,
{
libraryName: 'element-ui',
customStyleName: (name) => `element-ui/lib/theme-light/${name}`,
},
];
} else {
pluginWithOpts = [
plugin, { libraryName: 'antd' }
Expand Down