less-openui5 0.11.3 → 0.11.5

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const path = require("path");
-const css = require("@adobe/css-tools");
+const css = require("css");
 
 
 const diff = require("./diff");

package/lib/plugin/css-variables-collector.js

@@ -11,6 +11,7 @@ const CSSVariablesCollectorPlugin = module.exports = function(config) {
 	this.ruleStack = [];
 	this.mixinStack = [];
 	this.parenStack = [];
+	this.fontFaceDirectiveStack = [];
 };
 
 CSSVariablesCollectorPlugin.prototype = {
@@ -20,8 +21,8 @@ CSSVariablesCollectorPlugin.prototype = {
 
 	isReplacing: true,
 
-	_isInMixinOrParen() {
-		return this.mixinStack.length > 0 || this.parenStack.length > 0;
+	_isInMixinOrParenOrFontFaceDirective() {
+		return this.mixinStack.length > 0 || this.parenStack.length > 0 || this.fontFaceDirectiveStack.length > 0;
 	},
 
 	_isVarInRule() {
@@ -39,7 +40,7 @@ CSSVariablesCollectorPlugin.prototype = {
 	},
 
 	_isRelevant() {
-		return !this._isInMixinOrParen() && this._isVarInRule();
+		return !this._isInMixinOrParenOrFontFaceDirective() && this._isVarInRule();
 	},
 
 	toLessVariables(varsOverride) {
@@ -153,7 +154,7 @@ CSSVariablesCollectorPlugin.prototype = {
 	visitRule(node, visitArgs) {
 		// check rule for being a variable declaration
 		const isVarDeclaration = typeof node.name === "string" && node.name.startsWith("@");
-		if (!this._isInMixinOrParen() && isVarDeclaration) {
+		if (!this._isInMixinOrParenOrFontFaceDirective() && isVarDeclaration) {
 			// add the variable declaration to the list of vars
 			const varName = node.name.substr(1);
 			const isVarInLib = this._isVarInLibrary({
@@ -199,6 +200,22 @@ CSSVariablesCollectorPlugin.prototype = {
 		return node;
 	},
 
+	visitDirective(node, visitArgs) {
+		// store the @font-face directive context
+		if (node.name === "@font-face") {
+			this.fontFaceDirectiveStack.push(node);
+		}
+		return node;
+	},
+
+	visitDirectiveOut(node) {
+		// remove @font-face directive context
+		if (node.name === "@font-face") {
+			this.fontFaceDirectiveStack.pop();
+		}
+		return node;
+	},
+
 	visitUrl(node, visitArgs) {
 		// we mark the less variables which should be updated after eval
 		// => strangewise less variables with "none" values are also urls

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "less-openui5",
-	"version": "0.11.3",
+	"version": "0.11.5",
 	"description": "Build OpenUI5 themes with Less.js",
 	"author": {
 		"name": "SAP SE",
@@ -82,8 +82,8 @@
 		"url": "git@github.com:SAP/less-openui5.git"
 	},
 	"dependencies": {
-		"@adobe/css-tools": "^4.0.1",
 		"clone": "^2.1.2",
+		"css": "^3.0.0",
 		"mime": "^1.6.0"
 	},
 	"devDependencies": {