Skip to content

fix: locals export #1315

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 24, 2021
Merged

fix: locals export #1315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d636b94
fix: locals export
cap-Bernardito May 22, 2021
ae24e69
fix: locals export
cap-Bernardito May 24, 2021
9c2aaf7
refactor: code
alexander-akait May 24, 2021
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
Prev Previous commit
refactor: code
  • Loading branch information
@alexander-akait
alexander-akait committed May 24, 2021
commit 9c2aaf76826e4e107e5c97ac6ca72188432243f6
11 changes: 9 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ export default async function loader(content, map, meta) {
const icssPluginImports = [];
const icssPluginApi = [];

if (shouldUseIcssPlugin(options)) {
const needToUseIcssPlugin = shouldUseIcssPlugin(options);

if (needToUseIcssPlugin) {
const icssResolver = this.getResolve({
conditionNames: ["style"],
extensions: [],
Expand Down Expand Up @@ -211,7 +213,12 @@ export default async function loader(content, map, meta) {

const importCode = getImportCode(imports, options);
const moduleCode = getModuleCode(result, api, replacements, options, this);
const exportCode = getExportCode(exports, replacements, options);
const exportCode = getExportCode(
exports,
replacements,
needToUseIcssPlugin,
options
);

callback(null, `${importCode}${moduleCode}${exportCode}`);
}
4 changes: 2 additions & 2 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,10 +770,10 @@ function dashesCamelCase(str) {
);
}

function getExportCode(exports, replacements, options) {
function getExportCode(exports, replacements, needToUseIcssPlugin, options) {
let code = "// Exports\n";

if (!shouldUseIcssPlugin(options)) {
if (!needToUseIcssPlugin) {
code += `${
options.esModule ? "export default" : "module.exports ="
} ___CSS_LOADER_EXPORT___;\n`;
Expand Down