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

fix: do not crash with 'false' aliases #1292

Merged
merged 6 commits into from
Apr 19, 2021
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
1,271 changes: 102 additions & 1,169 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"stylus": "^0.54.8",
"stylus-loader": "^4.3.0",
"url-loader": "^4.1.1",
"webpack": "^5.33.2"
"webpack": "^5.34.0"
},
"keywords": [
"webpack",
Expand Down
21 changes: 17 additions & 4 deletions src/plugins/postcss-icss-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ const plugin = (options = {}) => {
...new Set([normalizedUrl, request]),
]);

if (!resolvedUrl) {
return;
}

// eslint-disable-next-line consistent-return
return { url: resolvedUrl, prefix, tokens };
};

Expand All @@ -49,8 +54,14 @@ const plugin = (options = {}) => {
const results = await Promise.all(tasks);

for (let index = 0; index <= results.length - 1; index++) {
const { url, prefix, tokens } = results[index];
const newUrl = prefix ? `${prefix}!${url}` : url;
const item = results[index];

if (!item) {
// eslint-disable-next-line no-continue
continue;
}

const newUrl = item.prefix ? `${item.prefix}!${item.url}` : item.url;
const importKey = newUrl;
let importName = imports.get(importKey);

Expand All @@ -68,9 +79,11 @@ const plugin = (options = {}) => {
options.api.push({ importName, dedupe: true, index });
}

for (const [replacementIndex, token] of Object.keys(tokens).entries()) {
for (const [replacementIndex, token] of Object.keys(
item.tokens
).entries()) {
const replacementName = `___CSS_LOADER_ICSS_IMPORT_${index}_REPLACEMENT_${replacementIndex}___`;
const localName = tokens[token];
const localName = item.tokens[token];

importReplacements[token] = replacementName;

Expand Down
14 changes: 11 additions & 3 deletions src/plugins/postcss-import-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,10 @@ const plugin = (options = {}) => {
const needKeep = await options.filter(url, media);

if (!needKeep) {
return null;
return;
}
}

atRule.remove();

if (isRequestable) {
const request = requestify(url, options.rootContext);

Expand All @@ -180,9 +178,19 @@ const plugin = (options = {}) => {
...new Set([request, url]),
]);

if (!resolvedUrl) {
return;
}

atRule.remove();

// eslint-disable-next-line consistent-return
return { url: resolvedUrl, media, prefix, isRequestable };
}

atRule.remove();

// eslint-disable-next-line consistent-return
return { url, media, prefix, isRequestable };
})
);
Expand Down
17 changes: 12 additions & 5 deletions src/plugins/postcss-url-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ const plugin = (options = {}) => {
const needKeep = await options.filter(url);

if (!needKeep) {
return null;
return;
}
}

Expand All @@ -309,19 +309,26 @@ const plugin = (options = {}) => {
...new Set([request, url]),
]);

if (!resolvedUrl) {
return;
}

// eslint-disable-next-line consistent-return
return { ...parsedDeclaration, url: resolvedUrl, hash };
})
);

const results = await Promise.all(resolvedDeclarations);

const urlToNameMap = new Map();
const urlToReplacementMap = new Map();

let hasUrlImportHelper = false;

for (let index = 0; index <= results.length - 1; index++) {
const item = results[index];
for (
let index = 0;
index <= resolvedDeclarations.length - 1;
index++
) {
const item = resolvedDeclarations[index];

if (!item) {
// eslint-disable-next-line no-continue
Expand Down
4 changes: 4 additions & 0 deletions test/__snapshots__/import-option.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1865,6 +1865,10 @@ Warning
]
`;

exports[`"import" option should work with 'false' aliases: errors 1`] = `Array []`;

exports[`"import" option should work with 'false' aliases: warnings 1`] = `Array []`;

exports[`"import" option should work with a value equal to "false": errors 1`] = `Array []`;

exports[`"import" option should work with a value equal to "false": module 1`] = `
Expand Down
4 changes: 4 additions & 0 deletions test/__snapshots__/modules-option.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4239,6 +4239,10 @@ Object {

exports[`"modules" option should work with "exportOnlyLocals" and "namedExport" option: warnings 1`] = `Array []`;

exports[`"modules" option should work with "false" alises: errors 1`] = `Array []`;

exports[`"modules" option should work with "false" alises: warnings 1`] = `Array []`;

exports[`"modules" option should work with "url" and "namedExport": errors 1`] = `Array []`;

exports[`"modules" option should work with "url" and "namedExport": module 1`] = `
Expand Down
4 changes: 4 additions & 0 deletions test/__snapshots__/url-option.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,10 @@ Warning
]
`;

exports[`"url" option should work with 'false' aliases: errors 1`] = `Array []`;

exports[`"url" option should work with 'false' aliases: warnings 1`] = `Array []`;

exports[`"url" option should work with a value equal to "Function": errors 1`] = `Array []`;

exports[`"url" option should work with a value equal to "Function": module 1`] = `
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/import/false-alias.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import "/style.css";

.class {
color: red;
}
5 changes: 5 additions & 0 deletions test/fixtures/import/false-alias.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import css from './false-alias.css';

__export__ = css;

export default css;
5 changes: 5 additions & 0 deletions test/fixtures/modules/icss-false-alias/icss.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import relative from './relative.icss.css';

__export__ = relative;

export default relative;
11 changes: 11 additions & 0 deletions test/fixtures/modules/icss-false-alias/relative.icss.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
:import("./unknown.css") {
IMPORTED_NAME: primary-color;
}

.className {
color: IMPORTED_NAME;
}

:export {
primary-color: IMPORTED_NAME
}
3 changes: 3 additions & 0 deletions test/fixtures/modules/icss-false-alias/unknown.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:export {
primary-color: red;
}
3 changes: 3 additions & 0 deletions test/fixtures/url/false-alias.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.class {
background-image: url(/logo.png);
}
5 changes: 5 additions & 0 deletions test/fixtures/url/false-alias.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import css from './false-alias.css';

__export__ = css;

export default css;
Binary file added test/fixtures/url/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions test/import-option.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import fs from "fs";
import path from "path";

import webpack from "webpack";

import {
compile,
getCompiler,
Expand All @@ -10,6 +12,8 @@ import {
getWarnings,
} from "./helpers/index";

const isWebpack5 = webpack.version.startsWith(5);

describe('"import" option', () => {
it("should work when not specified", async () => {
const compiler = getCompiler("./import/import.js");
Expand Down Expand Up @@ -196,6 +200,41 @@ describe('"import" option', () => {
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it("should work with 'false' aliases", async () => {
const compiler = getCompiler(
"./import/false-alias.js",
{},
{
module: {
rules: [
{
test: /\.css$/i,
loader: path.resolve(__dirname, "../src"),
},
],
},
resolve: {
alias: {
"/style.css": isWebpack5
? false
: path.resolve(__dirname, "./fixtures/import/alias.css"),
},
},
}
);
const stats = await compile(compiler);

// TODO uncomment after drop webpack v4
// expect(getModuleSource("./import/false-alias.css", stats)).toMatchSnapshot(
// "module"
// );
// expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
// "result"
// );
expect(getWarnings(stats)).toMatchSnapshot("warnings");
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it("should throw an error on unresolved import", async () => {
const compiler = getCompiler("./import/unresolved.js");
const stats = await compile(compiler);
Expand Down
34 changes: 34 additions & 0 deletions test/modules-option.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import path from "path";
import fs from "fs";

import webpack from "webpack";

import {
compile,
getCompiler,
Expand All @@ -15,6 +17,8 @@ const testCases = fs.readdirSync(testCasesPath);

jest.setTimeout(60000);

const isWebpack5 = webpack.version.startsWith(5);

describe('"modules" option', () => {
[
true,
Expand Down Expand Up @@ -843,6 +847,36 @@ describe('"modules" option', () => {
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it('should work with "false" alises', async () => {
const compiler = getCompiler(
"./modules/icss-false-alias/icss.js",
{},
{
resolve: {
alias: {
"./unknown.css": isWebpack5
? false
: path.resolve(
__dirname,
"./fixtures/modules/icss-false-alias/unknown.css"
),
},
},
}
);
const stats = await compile(compiler);

// TODO uncomment after drop webpack v4
// expect(
// getModuleSource("./modules/icss-false-alias/relative.icss.css", stats)
// ).toMatchSnapshot("module");
// expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
// "result"
// );
expect(getWarnings(stats)).toMatchSnapshot("warnings");
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it('should work with the "auto" when it is "false"', async () => {
const compiler = getCompiler("./modules/mode/modules.js", {
modules: {
Expand Down
47 changes: 47 additions & 0 deletions test/url-option.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,53 @@ describe('"url" option', () => {
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it("should work with 'false' aliases", async () => {
const compiler = getCompiler(
"./url/false-alias.js",
{},
{
module: {
rules: [
{
test: /\.css$/i,
loader: path.resolve(__dirname, "../src"),
},
isWebpack5
? {
test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/i,
type: "asset/resource",
}
: {
test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/i,
loader: "file-loader",
options: {
name: "[name].[ext]",
},
},
],
},
resolve: {
alias: {
"/logo.png": isWebpack5
? false
: path.resolve(__dirname, "./fixtures/url/logo.png"),
},
},
}
);
const stats = await compile(compiler);

// TODO uncomment after drop webpack v4
// expect(getModuleSource("./url/false-alias.css", stats)).toMatchSnapshot(
// "module"
// );
// expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
// "result"
// );
expect(getWarnings(stats)).toMatchSnapshot("warnings");
expect(getErrors(stats)).toMatchSnapshot("errors");
});

it("should throw an error on unresolved import", async () => {
const compiler = getCompiler("./url/url-unresolved.js");
const stats = await compile(compiler);
Expand Down