Skip to content

Commit

Permalink
fix: property handle non css characters in localIdentName (#920)
Browse files Browse the repository at this point in the history
  • Loading branch information
evilebottnawi authored Apr 10, 2019
1 parent fe10758 commit d3a0a3c
Show file tree
Hide file tree
Showing 5 changed files with 1,248 additions and 184 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"webpack": "^4.0.0"
},
"dependencies": {
"cssesc": "^3.0.0",
"icss-utils": "^4.1.0",
"loader-utils": "^1.2.3",
"camelcase": "^5.2.0",
Expand Down
66 changes: 10 additions & 56 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import path from 'path';
import cc from 'camelcase';
import loaderUtils from 'loader-utils';
import normalizePath from 'normalize-path';
import cssesc from 'cssesc';

/* eslint-disable line-comment-position */

Expand Down Expand Up @@ -79,16 +80,15 @@ function getLocalIdent(loaderContext, localIdentName, localName, options) {
// eslint-disable-next-line no-param-reassign
options.content = `${options.hashPrefix + request}+${unescape(localName)}`;

// eslint-disable-next-line no-param-reassign
localIdentName = localIdentName.replace(/\[local\]/gi, localName);

const hash = loaderUtils.interpolateName(
loaderContext,
localIdentName,
options
);

return normalizeIdentifier(hash);
// Using `[path]` placeholder outputs `/` we need escape their
// Also directories can contains invalid characters for css we need escape their too
return cssesc(
loaderUtils
.interpolateName(loaderContext, localIdentName, options)
// For `[hash]` placeholder
.replace(/^((-?[0-9])|--)/, '_$1'),
{ isIdentifier: true }
).replace(/\\\[local\\\]/gi, localName);
}

function getFilter(filter, resourcePath, defaultFilter = null) {
Expand All @@ -105,52 +105,6 @@ function getFilter(filter, resourcePath, defaultFilter = null) {
};
}

function normalizeIdentifier(value) {
const escapedSymbols = [
'~',
'!',
'@',
'#',
'$',
'%',
'&',
'^',
'*',
'(',
')',
'{',
'}',
'[',
']',
'`',
'/',
'=',
'?',
'+',
'\\',
'|',
'-',
'_',
':',
';',
"'",
'"',
',',
'<',
'.',
'>',
];

const identifiersRegExp = new RegExp(
`[^a-zA-Z0-9${escapedSymbols.join('\\')}\\-_\u00A0-\uFFFF]`,
'g'
);

return value
.replace(identifiersRegExp, '-')
.replace(/^((-?[0-9])|--)/, '_$1');
}

export {
getImportPrefix,
getLocalIdent,
Expand Down
Loading

0 comments on commit d3a0a3c

Please sign in to comment.