Skip to content
Merged
Changes from 2 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
13 changes: 13 additions & 0 deletions commands/transpile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ const less = require('less');
const LessPluginResolve = require('less-plugin-npm-import');
const minimist = require('minimist');
const LessPluginRi = require('resolution-independence');
const getRiPlugin = require('resolution-independence/lib/resolution-independence');
// Patch: calc() containing var() must pass through unchanged — the RI plugin's
// parseString regex groups "calc(132px" as one token, causing parseFloat to return NaN.
LessPluginRi.prototype.install = function (_less, pluginManager) {
const Plugin = getRiPlugin(_less);
const origParseString = Plugin.prototype.parseString;
Plugin.prototype.parseString = function (ruleNode, stringValues) {
const value = stringValues || ruleNode.value;
if (/calc\s*\(.*var\s*\(/.test(value)) return value;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also handle situation when not using var() inside calc?

Examples:
@lime-panel-body-padding: @lime-panel-body-padding-top ~"calc(@{lime-panel-body-padding-right} - @{lime-component-spacing})"; was already handled --> padding: 0 calc(132px - var(--primitive-spacing-36));

@lime-panel-body-padding: @lime-panel-body-padding-top ~"calc(@{lime-panel-body-padding-right} - 36px)"; --> padding: 0 NaNrem - 36px);

Suggested change
if (/calc\s*\(.*var\s*\(/.test(value)) return value;
if (/calc\s*\(/.test(value)) return value;

Examples with suggestion applied:
@lime-panel-body-padding: @lime-panel-body-padding-top ~"calc(@{lime-panel-body-padding-right} - @{lime-component-spacing})"; was already handled --> padding: 0 calc(132px - var(--primitive-spacing-36));

@lime-panel-body-padding: @lime-panel-body-padding-top ~"calc(@{lime-panel-body-padding-right} - 36px)"; --> padding: 0 calc(132px - 36px);

return origParseString.call(this, ruleNode, stringValues);
};
pluginManager.addVisitor(new Plugin(this.options));
};
const {optionParser: app} = require('@enact/dev-utils');

let chalk;
Expand Down
Loading