Skip to content

Commit 9f544fa

Browse files
refactor: code
1 parent 3d0e5f5 commit 9f544fa

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

lib/css/CssParser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,9 +1271,9 @@ class CssParser extends Parser {
12711271
const parseValueAtRuleParams = (str) => {
12721272
if (/from(\/\*|\s)(?:[\s\S]+)$/i.test(str)) {
12731273
str = str.replace(CSS_COMMENT, " ").trim().replace(/;$/, "");
1274-
const fromIdx = str.lastIndexOf(" from ");
1274+
const fromIdx = str.lastIndexOf("from");
12751275
const path = str
1276-
.slice(fromIdx + 6)
1276+
.slice(fromIdx + 5)
12771277
.trim()
12781278
.replace(/['"]/g, "");
12791279
let content = str.slice(0, fromIdx).trim();

lib/dependencies/CssIcssExportDependency.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
349349
* @param {string} localName local name
350350
* @param {string} importName import name
351351
* @param {DependencyTemplateContext} templateContext the context object
352-
* @param {Set<exportDep>} seen seen to prevent cyclical problems
352+
* @param {Set<CssIcssExportDependency>} seen seen to prevent cyclical problems
353353
* @returns {string | undefined} found reference
354354
*/
355355
static resolve(localName, importName, templateContext, seen = new Set()) {
@@ -374,6 +374,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
374374
(d) => d instanceof CssIcssExportDependency && d.name === importName
375375
)
376376
);
377+
377378
if (!exportDep) return undefined;
378379

379380
if (seen.has(exportDep)) return undefined;

lib/dependencies/CssIcssSymbolDependency.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class CssIcssSymbolDependency extends NullDependency {
3333
constructor(localName, range, value, importName) {
3434
super();
3535
this.localName = localName;
36+
this.range = range;
3637
this.value = value;
3738
this.importName = importName;
38-
this.range = range;
3939
/** @type {undefined | string} */
4040
this._hashUpdate = undefined;
4141
}
@@ -63,10 +63,9 @@ class CssIcssSymbolDependency extends NullDependency {
6363
serialize(context) {
6464
const { write } = context;
6565
write(this.localName);
66-
write(this.symbol);
66+
write(this.range);
6767
write(this.value);
6868
write(this.importName);
69-
write(this.range);
7069
super.serialize(context);
7170
}
7271

@@ -76,10 +75,9 @@ class CssIcssSymbolDependency extends NullDependency {
7675
deserialize(context) {
7776
const { read } = context;
7877
this.localName = read();
79-
this.symbol = read();
78+
this.range = read();
8079
this.value = read();
8180
this.importName = read();
82-
this.range = read();
8381
super.deserialize(context);
8482
}
8583
}

0 commit comments

Comments
 (0)