Fixes less#3574

matthew-dean · Dec 17, 2020 · 458cf99 · 458cf99
1 parent 5423802
commit 458cf99
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/packages/less/package-lock.json b/packages/less/package-lock.json
diff --git a/packages/less/src/less/import-manager.js b/packages/less/src/less/import-manager.js
@@ -121,7 +121,6 @@ export default function(environment) {
                 } else if (importOptions.inline) {
                     fileParsedFunc(null, contents, resolvedFilename);
                 } else {
-
                     // import (multiple) parse trees apparently get altered and can't be cached.
                     // TODO: investigate why this is
                     if (importManager.files[resolvedFilename]

diff --git a/packages/less/src/less/parse.js b/packages/less/src/less/parse.js
@@ -1,4 +1,3 @@
-let PromiseConstructor;
 import contexts from './contexts';
 import Parser from './parser/parser';
 import PluginManager from './plugin-manager';

diff --git a/packages/less/src/less/render.js b/packages/less/src/less/render.js
@@ -1,4 +1,3 @@
-let PromiseConstructor;
 import * as utils from './utils';
 
 export default (environment, ParseTree, ImportManager) => {

diff --git a/packages/less/src/less/source-map-output.js b/packages/less/src/less/source-map-output.js
@@ -69,8 +69,12 @@ export default environment => {
                     inputSource = inputSource.slice(this._contentsIgnoredCharsMap[fileInfo.filename]);
                 }
 
-                // ignore empty content
+                /** 
+                 * ignore empty content, or failsafe
+                 * if contents map is incorrect
+                 */
                 if (inputSource === undefined) {
+                    this._css.push(chunk);
                     return;
                 }
 

diff --git a/packages/less/src/less/utils.js b/packages/less/src/less/utils.js
@@ -1,5 +1,6 @@
 /* jshint proto: true */
 import * as Constants from './constants';
+import { copy } from 'copy-anything';
 
 export function getLocation(index, inputStream) {
     let n = index + 1;
@@ -45,9 +46,9 @@ export function defaults(obj1, obj2) {
     let newObj = obj2 || {};
     if (!obj2._defaults) {
         newObj = {};
-        const defaults = {...obj1};
+        const defaults = copy(obj1);
         newObj._defaults = defaults;
-        const cloned = obj2 ? {...obj2} : {};
+        const cloned = obj2 ? copy(obj2) : {};
         Object.assign(newObj, defaults, cloned);
     }
     return newObj;