Skip to content

Commit 28e1628

Browse files
refactor: code (#438)
1 parent 5c51b90 commit 28e1628

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

src/index.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ options.insert = ${insert};
5555
var content = require(${loaderUtils.stringifyRequest(this, `!!${request}`)});
5656
content = content.__esModule ? content.default : content;
5757
58-
var update = require(${loaderUtils.stringifyRequest(
58+
var api = require(${loaderUtils.stringifyRequest(
5959
this,
6060
`!${path.join(__dirname, 'runtime/injectStylesIntoLinkTag.js')}`
61-
)})(content, options);
61+
)});
62+
var update = api(content, options);
6263
${hmrCode}`;
6364
}
6465

@@ -113,10 +114,11 @@ if (content.locals) {
113114
114115
exports.use = function() {
115116
if (!(refs++)) {
116-
dispose = require(${loaderUtils.stringifyRequest(
117+
var api = require(${loaderUtils.stringifyRequest(
117118
this,
118119
`!${path.join(__dirname, 'runtime/injectStylesIntoStyleTag.js')}`
119-
)})(content, options);
120+
)});
121+
dispose = api(content, options);
120122
}
121123
122124
return exports;
@@ -180,10 +182,11 @@ var options = ${JSON.stringify(options)}
180182
options.insert = ${insert};
181183
options.singleton = ${isSingleton};
182184
183-
var update = require(${loaderUtils.stringifyRequest(
185+
var api = require(${loaderUtils.stringifyRequest(
184186
this,
185187
`!${path.join(__dirname, 'runtime/injectStylesIntoStyleTag.js')}`
186-
)})(content, options);
188+
)});
189+
var update = api(content, options);
187190
188191
if (content.locals) {
189192
module.exports = content.locals;

test/manual/webpack.config.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
],
2929
use: [
3030
{
31-
loader: require.resolve('../../dist/index.js'),
31+
loader: require.resolve('../../dist/cjs.js'),
3232
},
3333
{
3434
loader: 'css-loader',
@@ -44,7 +44,7 @@ module.exports = {
4444
exclude: [/\.lazy\.css$/i, /\.link\.css$/i, /\.lazy\.module\.css$/i],
4545
use: [
4646
{
47-
loader: require.resolve('../../dist/index.js'),
47+
loader: require.resolve('../../dist/cjs.js'),
4848
},
4949
{
5050
loader: 'css-loader',
@@ -60,7 +60,7 @@ module.exports = {
6060
test: /\.lazy\.css$/i,
6161
use: [
6262
{
63-
loader: require.resolve('../../dist/index.js'),
63+
loader: require.resolve('../../dist/cjs.js'),
6464
options: { injectType: 'lazyStyleTag' },
6565
},
6666
{
@@ -76,7 +76,7 @@ module.exports = {
7676
test: /\.lazy\.module\.css$/i,
7777
use: [
7878
{
79-
loader: require.resolve('../../dist/index.js'),
79+
loader: require.resolve('../../dist/cjs.js'),
8080
options: { injectType: 'lazyStyleTag' },
8181
},
8282
{
@@ -94,7 +94,7 @@ module.exports = {
9494
test: /\.link\.css$/i,
9595
use: [
9696
{
97-
loader: require.resolve('../../dist/index.js'),
97+
loader: require.resolve('../../dist/cjs.js'),
9898
options: { injectType: 'linkTag' },
9999
},
100100
{
@@ -107,7 +107,7 @@ module.exports = {
107107
exclude: /\.lazy\.scss$/i,
108108
use: [
109109
{
110-
loader: require.resolve('../../dist/index.js'),
110+
loader: require.resolve('../../dist/cjs.js'),
111111
},
112112
{
113113
loader: 'css-loader',
@@ -130,7 +130,7 @@ module.exports = {
130130
test: /\.lazy\.scss$/i,
131131
use: [
132132
{
133-
loader: require.resolve('../../dist/index.js'),
133+
loader: require.resolve('../../dist/cjs.js'),
134134
options: { injectType: 'lazyStyleTag' },
135135
},
136136
{

0 commit comments

Comments
 (0)