Skip to content

[FIX] CSS Variables: Fix variable handling / relative urls #172

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 13 commits into from
Jun 28, 2021
Merged

[FIX] CSS Variables: Fix variable handling / relative urls #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c8f3595
[FIX] Variables: improved detection of library variables
petermuessig Jun 23, 2021
77ca02c
[FIX] Variables: resolve url values in variables
petermuessig Jun 25, 2021
6217f5a
[INTERNAL] Variables: report override only with env var
petermuessig Jun 25, 2021
1fbb1a6
[FIX] Variables: handle variables in the proper order
petermuessig Jun 25, 2021
b2ec78d
[FIX] Variables: adopted the test to new behavior (last var wins)
petermuessig Jun 27, 2021
64c00e9
[INTERNAL] Variables: use regex for library-local var detection
petermuessig Jun 28, 2021
c99433f
[FIX] Variables: reuse of variables-collector
petermuessig Jun 28, 2021
1f41cc1
[INTERNAL] Variables: using the variable value for override
petermuessig Jun 28, 2021
9e52bc9
[INTERNAL] Variables: improved tests and coverage to be 100%
petermuessig Jun 28, 2021
6169b39
[INTERNAL] Variables: fixed the indentation
petermuessig Jun 28, 2021
76edeed
[INTERNAL] Enhance tests
matz3 Jun 28, 2021
15c6fb8
[INTERNAL] Fix RegExp for relative paths used in tests
matz3 Jun 28, 2021
a24aa11
[INTERNAL] Cleanup
matz3 Jun 28, 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
1 change: 1 addition & 0 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Builder.prototype.build = function(options) {
// inject the library name as prefix (e.g. "sap.m" as "_sap_m")
if (options.library && typeof options.library.name === "string") {
const libName = config.libName = options.library.name;
config.libPath = libName.replace(/\./g, "/");
config.prefix = "_" + libName.replace(/\./g, "_") + "_";
}

Expand Down
13 changes: 7 additions & 6 deletions lib/plugin/css-variables-collector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ CSSVariablesCollectorPlugin.prototype = {
return this.ruleStack.length > 0 && !this.ruleStack[this.ruleStack.length - 1].variable;
},

_isInGlobalOrBaseImport() {
return this.config.libName !== "sap.ui.core" && this.importStack.filter((importNode) => {
return /\/(?:global|base)\.less$/.test(importNode.importedFilename);
}).length > 0;
_isVarInLibrary() {
// the last less file defines the location of the css variable and this must
// be in the path of the current library, otherwise it is an external variable
const regexp = new RegExp(`^/resources/${this.config.libPath}/themes/`);
return this.importStack.length > 0 ? regexp.test(this.importStack[this.importStack.length - 1].importedFilename) : true;
},

_isRelevant() {
Expand Down Expand Up @@ -109,7 +110,7 @@ CSSVariablesCollectorPlugin.prototype = {
}
this.calcVars[newName] = {
css: css,
export: !this._isInGlobalOrBaseImport()
export: this._isVarInLibrary()
};
return new less.tree.Call("var", [new less.tree.Anonymous("--" + newName, node.index, node.currentFileInfo, node.mapLines)]);
}
Expand Down Expand Up @@ -187,7 +188,7 @@ CSSVariablesCollectorPlugin.prototype = {
// add the variable declaration to the list of vars
this.vars[value.name.substr(1)] = {
css: this._getCSS(value.value),
export: !this._isInGlobalOrBaseImport()
export: this._isVarInLibrary()
};
}
});
Expand Down