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

perf: improve #1290

Merged
merged 1 commit 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
6 changes: 3 additions & 3 deletions src/plugins/postcss-import-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
resolveRequests,
isUrlRequestable,
requestify,
webpackIgnoreCommentRegexp,
WEBPACK_IGNORE_COMMENT_REGEXP,
} from "../utils";

function parseNode(atRule, key) {
Expand All @@ -22,7 +22,7 @@ function parseNode(atRule, key) {
const lastCommentIndex = atRule.raws.afterName.lastIndexOf("/*");
const matched = atRule.raws.afterName
.slice(lastCommentIndex)
.match(webpackIgnoreCommentRegexp);
.match(WEBPACK_IGNORE_COMMENT_REGEXP);

if (matched && matched[2] === "true") {
return;
Expand All @@ -32,7 +32,7 @@ function parseNode(atRule, key) {
const prevNode = atRule.prev();

if (prevNode && prevNode.type === "comment") {
const matched = prevNode.text.match(webpackIgnoreCommentRegexp);
const matched = prevNode.text.match(WEBPACK_IGNORE_COMMENT_REGEXP);

if (matched && matched[2] === "true") {
return;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/postcss-url-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
requestify,
resolveRequests,
isUrlRequestable,
webpackIgnoreCommentRegexp,
WEBPACK_IGNORE_COMMENT_REGEXP,
} from "../utils";

const isUrlFunc = /url/i;
Expand Down Expand Up @@ -42,7 +42,7 @@ function getWebpackIgnoreCommentValue(index, nodes, inBetween) {
return;
}

const matched = prevValueNode.value.match(webpackIgnoreCommentRegexp);
const matched = prevValueNode.value.match(WEBPACK_IGNORE_COMMENT_REGEXP);

return matched && matched[2] === "true";
}
Expand Down Expand Up @@ -81,7 +81,7 @@ function parseDeclaration(declaration, key, result) {

const matched = declaration.raws.between
.slice(lastCommentIndex)
.match(webpackIgnoreCommentRegexp);
.match(WEBPACK_IGNORE_COMMENT_REGEXP);

if (matched) {
inBetween = matched[2] === "true";
Expand All @@ -93,7 +93,7 @@ function parseDeclaration(declaration, key, result) {
const prevNode = declaration.prev();

if (prevNode && prevNode.type === "comment") {
const matched = prevNode.text.match(webpackIgnoreCommentRegexp);
const matched = prevNode.text.match(WEBPACK_IGNORE_COMMENT_REGEXP);

if (matched) {
isIgnoreOnDeclaration = matched[2] === "true";
Expand Down
121 changes: 94 additions & 27 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ import extractImports from "postcss-modules-extract-imports";
import modulesScope from "postcss-modules-scope";
import camelCase from "camelcase";

const whitespace = "[\\x20\\t\\r\\n\\f]";
const unescapeRegExp = new RegExp(
`\\\\([\\da-f]{1,6}${whitespace}?|(${whitespace})|.)`,
"ig"
);
const matchNativeWin32Path = /^[A-Z]:[/\\]|^\\\\/i;
const webpackIgnoreCommentRegexp = /webpackIgnore:(\s+)?(true|false)/;
const WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/;

// eslint-disable-next-line no-useless-escape
const regexSingleEscape = /[ -,.\/:-@[\]\^`{-~]/;
Expand Down Expand Up @@ -72,24 +66,95 @@ function escape(string) {
return output;
}

function gobbleHex(str) {
const lower = str.toLowerCase();
let hex = "";
let spaceTerminated = false;

// eslint-disable-next-line no-undefined
for (let i = 0; i < 6 && lower[i] !== undefined; i++) {
const code = lower.charCodeAt(i);
// check to see if we are dealing with a valid hex char [a-f|0-9]
const valid = (code >= 97 && code <= 102) || (code >= 48 && code <= 57);
// https://drafts.csswg.org/css-syntax/#consume-escaped-code-point
spaceTerminated = code === 32;

if (!valid) {
break;
}

hex += lower[i];
}

if (hex.length === 0) {
// eslint-disable-next-line no-undefined
return undefined;
}

const codePoint = parseInt(hex, 16);

const isSurrogate = codePoint >= 0xd800 && codePoint <= 0xdfff;
// Add special case for
// "If this number is zero, or is for a surrogate, or is greater than the maximum allowed code point"
// https://drafts.csswg.org/css-syntax/#maximum-allowed-code-point
if (isSurrogate || codePoint === 0x0000 || codePoint > 0x10ffff) {
return ["\uFFFD", hex.length + (spaceTerminated ? 1 : 0)];
}

return [
String.fromCodePoint(codePoint),
hex.length + (spaceTerminated ? 1 : 0),
];
}

const CONTAINS_ESCAPE = /\\/;

function unescape(str) {
return str.replace(unescapeRegExp, (_, escaped, escapedWhitespace) => {
const high = `0x${escaped}` - 0x10000;

/* eslint-disable line-comment-position */
// NaN means non-codepoint
// Workaround erroneous numeric interpretation of +"0x"
// eslint-disable-next-line no-self-compare
return high !== high || escapedWhitespace
? escaped
: high < 0
? // BMP codepoint
String.fromCharCode(high + 0x10000)
: // Supplemental Plane codepoint (surrogate pair)
// eslint-disable-next-line no-bitwise
String.fromCharCode((high >> 10) | 0xd800, (high & 0x3ff) | 0xdc00);
/* eslint-enable line-comment-position */
});
const needToProcess = CONTAINS_ESCAPE.test(str);

if (!needToProcess) {
return str;
}

let ret = "";

for (let i = 0; i < str.length; i++) {
if (str[i] === "\\") {
const gobbled = gobbleHex(str.slice(i + 1, i + 7));

// eslint-disable-next-line no-undefined
if (gobbled !== undefined) {
ret += gobbled[0];
i += gobbled[1];

// eslint-disable-next-line no-continue
continue;
}

// Retain a pair of \\ if double escaped `\\\\`
// https://github.com/postcss/postcss-selector-parser/commit/268c9a7656fb53f543dc620aa5b73a30ec3ff20e
if (str[i + 1] === "\\") {
ret += "\\";
i += 1;

// eslint-disable-next-line no-continue
continue;
}

// if \\ is at the end of the string retain it
// https://github.com/postcss/postcss-selector-parser/commit/01a6b346e3612ce1ab20219acc26abdc259ccefb
if (str.length === i + 1) {
ret += str[i];
}

// eslint-disable-next-line no-continue
continue;
}

ret += str[i];
}

return ret;
}

function normalizePath(file) {
Expand Down Expand Up @@ -139,6 +204,8 @@ function defaultGetLocalIdent(
return interpolateName(loaderContext, localIdentName, options);
}

const NATIVE_WIN32_PATH = /^[A-Z]:[/\\]|^\\\\/i;

function normalizeUrl(url, isStringValue) {
let normalizedUrl = url
.replace(/^( |\t\n|\r\n|\r|\f)*/g, "")
Expand All @@ -148,7 +215,7 @@ function normalizeUrl(url, isStringValue) {
normalizedUrl = normalizedUrl.replace(/\\(\n|\r\n|\r|\f)/g, "");
}

if (matchNativeWin32Path.test(url)) {
if (NATIVE_WIN32_PATH.test(url)) {
try {
normalizedUrl = decodeURI(normalizedUrl);
} catch (error) {
Expand Down Expand Up @@ -768,7 +835,7 @@ function isUrlRequestable(url) {
}

// Absolute URLs
if (/^[a-z][a-z0-9+.-]*:/i.test(url) && !matchNativeWin32Path.test(url)) {
if (/^[a-z][a-z0-9+.-]*:/i.test(url) && !NATIVE_WIN32_PATH.test(url)) {
return false;
}

Expand Down Expand Up @@ -811,6 +878,6 @@ export {
resolveRequests,
isUrlRequestable,
sort,
webpackIgnoreCommentRegexp,
WEBPACK_IGNORE_COMMENT_REGEXP,
combineRequests,
};