chore: replace deprecated String.prototype.substr() (#3702)

CommanderRoot · web-flow · commit 87bec519e73a · 2026-03-09T13:19:56.000-07:00
.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated

Signed-off-by: Tobias Speicher &lt;rootcommander@gmail.com&gt;
diff --git a/packages/less/src/less-node/plugin-loader.js b/packages/less/src/less-node/plugin-loader.js
@@ -9,7 +9,7 @@ const PluginLoader = function(less) {
     this.require = prefix => {
         prefix = path.dirname(prefix);
         return id => {
-            const str = id.substr(0, 2);
+            const str = id.slice(0, 2);
             if (str === '..' || str === './') {
                 return require(path.join(prefix, id));
             }
diff --git a/packages/less/src/less/less-error.js b/packages/less/src/less/less-error.js
@@ -54,7 +54,7 @@ const LessError = function(e, fileContentMap, currentFilename) {
             /**
              * We have to figure out how this environment stringifies anonymous functions
              * so we can correctly map plugin errors.
-             * 
+             *
              * Note, in Node 8, the output of anonymous funcs varied based on parameters
              * being present or not, so we inject dummy params.
              */
@@ -133,7 +133,7 @@ LessError.prototype.toString = function(options) {
             let errorTxt = `${this.line} `;
             if (extract[1]) {
                 errorTxt += extract[1].slice(0, this.column) +
-                    stylize(stylize(stylize(extract[1].substr(this.column, 1), 'bold') +
+                    stylize(stylize(stylize(extract[1].slice(this.column, this.column + 1), 'bold') +
                         extract[1].slice(this.column + 1), 'red'), 'inverse');
             }
             error.push(errorTxt);
@@ -163,4 +163,4 @@ LessError.prototype.toString = function(options) {
     return message;
 };
 
-export default LessError;
+export default LessError;
diff --git a/packages/less/src/less/parser/parser-input.js b/packages/less/src/less/parser/parser-input.js
@@ -56,15 +56,15 @@ export default () => {
                         nextNewLine = endIndex;
                     }
                     parserInput.i = nextNewLine;
-                    comment.text = inp.substr(comment.index, parserInput.i - comment.index);
+                    comment.text = inp.slice(comment.index, parserInput.i);
                     parserInput.commentStore.push(comment);
                     continue;
                 } else if (nextChar === '*') {
                     const nextStarSlash = inp.indexOf('*/', parserInput.i + 2);
                     if (nextStarSlash >= 0) {
                         comment = {
                             index: parserInput.i,
-                            text: inp.substr(parserInput.i, nextStarSlash + 2 - parserInput.i),
+                            text: inp.slice(parserInput.i, nextStarSlash + 2),
                             isLineComment: false
                         };
                         parserInput.i += comment.text.length - 1;
@@ -188,7 +188,7 @@ export default () => {
                 case '\n':
                     break;
                 case startChar: {
-                    const str = input.substr(currentPosition, i + 1);
+                    const str = input.slice(currentPosition, currentPosition + i + 1);
                     if (!loc && loc !== 0) {
                         skipWhitespace(i + 1);
                         return str
@@ -228,7 +228,7 @@ export default () => {
         do {
             let nextChar = input.charAt(i);
             if (blockDepth === 0 && testChar(nextChar)) {
-                returnVal = input.substr(lastPos, i - lastPos);
+                returnVal = input.slice(lastPos, i);
                 if (returnVal) {
                     parseGroups.push(returnVal);
                 }
@@ -240,7 +240,7 @@ export default () => {
                 loop = false
             } else {
                 if (inComment) {
-                    if (nextChar === '*' && 
+                    if (nextChar === '*' &&
                         input.charAt(i + 1) === '/') {
                         i++;
                         blockDepth--;
@@ -253,7 +253,7 @@ export default () => {
                     case '\\':
                         i++;
                         nextChar = input.charAt(i);
-                        parseGroups.push(input.substr(lastPos, i - lastPos + 1));
+                        parseGroups.push(input.slice(lastPos, i + 1));
                         lastPos = i + 1;
                         break;
                     case '/':
@@ -267,7 +267,7 @@ export default () => {
                     case '"':
                         quote = parserInput.$quoted(i);
                         if (quote) {
-                            parseGroups.push(input.substr(lastPos, i - lastPos), quote);
+                            parseGroups.push(input.slice(lastPos, i), quote);
                             i += quote[1].length - 1;
                             lastPos = i + 1;
                         }
diff --git a/packages/less/src/less/parser/parser.js b/packages/less/src/less/parser/parser.js
@@ -406,7 +406,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                     }
                     parserInput.forget();
 
-                    return new(tree.Quoted)(str.charAt(0), str.substr(1, str.length - 2), isEscaped, index + currentIndex, fileInfo);
+                    return new(tree.Quoted)(str.charAt(0), str.slice(1, -1), isEscaped, index + currentIndex, fileInfo);
                 },
 
                 //
@@ -788,7 +788,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                     if (js) {
                         warn('Inline JavaScript evaluation (backtick expressions) is deprecated and will be removed in Less 5.x. Use Less functions or custom plugins instead.', index, 'DEPRECATED', 'js-eval');
                         parserInput.forget();
-                        return new(tree.JavaScript)(js.substr(0, js.length - 1), Boolean(escape), index + currentIndex, fileInfo);
+                        return new(tree.JavaScript)(js.slice(0, -1), Boolean(escape), index + currentIndex, fileInfo);
                     }
                     parserInput.restore('invalid javascript definition');
                 }
@@ -1901,7 +1901,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                         }
                         if (parserInput.$char(')')) {
                             if (p && !e) {
-                                nodes.push(new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index)));				 
+                                nodes.push(new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index)));
                                 e = p;
                             } else if (p && e) {
                                 nodes.push(new (tree.Paren)(new (tree.Declaration)(p, e, null, null, parserInput.i + currentIndex, fileInfo, true)));
@@ -1986,12 +1986,12 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {
                     if (parserInput.$str('@media')) {
                         return this.prepareAndGetNestableAtRule(tree.Media, index, debugInfo, MediaSyntaxOptions);
                     }
-                    
+
                     if (parserInput.$str('@container')) {
                         return this.prepareAndGetNestableAtRule(tree.Container, index, debugInfo, ContainerSyntaxOptions);
                     }
                 }
-                
+
                 parserInput.restore();
             },
 
diff --git a/packages/less/src/less/tree/dimension.js b/packages/less/src/less/tree/dimension.js
@@ -56,7 +56,7 @@ Dimension.prototype = Object.assign(new Node(), {
 
             // Float values doesn't need a leading zero
             if (value > 0 && value < 1) {
-                strValue = (strValue).substr(1);
+                strValue = (strValue).slice(1);
             }
         }
 
diff --git a/packages/less/src/less/tree/namespace-value.js b/packages/less/src/less/tree/namespace-value.js
@@ -15,7 +15,7 @@ NamespaceValue.prototype = Object.assign(new Node(), {
 
     eval(context) {
         let i, name, rules = this.value.eval(context);
-        
+
         for (i = 0; i < this.lookups.length; i++) {
             name = this.lookups[i];
 
@@ -33,12 +33,12 @@ NamespaceValue.prototype = Object.assign(new Node(), {
             }
             else if (name.charAt(0) === '@') {
                 if (name.charAt(1) === '@') {
-                    name = `@${new Variable(name.substr(1)).eval(context).value}`;
+                    name = `@${new Variable(name.slice(1)).eval(context).value}`;
                 }
                 if (rules.variables) {
                     rules = rules.variable(name);
                 }
-                
+
                 if (!rules) {
                     throw { type: 'Name',
                         message: `variable ${name} not found`,
@@ -48,18 +48,18 @@ NamespaceValue.prototype = Object.assign(new Node(), {
             }
             else {
                 if (name.substring(0, 2) === '$@') {
-                    name = `$${new Variable(name.substr(1)).eval(context).value}`;
+                    name = `$${new Variable(name.slice(1)).eval(context).value}`;
                 }
                 else {
                     name = name.charAt(0) === '$' ? name : `$${name}`;
                 }
                 if (rules.properties) {
                     rules = rules.property(name);
                 }
-            
+
                 if (!rules) {
                     throw { type: 'Name',
-                        message: `property "${name.substr(1)}" not found`,
+                        message: `property "${name.slice(1)}" not found`,
                         filename: this.fileInfo().filename,
                         index: this.getIndex() };
                 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const PluginLoader = function(less) {`
`9`	`9`	`this.require = prefix => {`
`10`	`10`	`prefix = path.dirname(prefix);`
`11`	`11`	`return id => {`
`12`		`- const str = id.substr(0, 2);`
	`12`	`+ const str = id.slice(0, 2);`
`13`	`13`	`if (str === '..' \|\| str === './') {`
`14`	`14`	`return require(path.join(prefix, id));`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {`
`406`	`406`	`}`
`407`	`407`	`parserInput.forget();`
`408`	`408`
`409`		`- return new(tree.Quoted)(str.charAt(0), str.substr(1, str.length - 2), isEscaped, index + currentIndex, fileInfo);`
	`409`	`+ return new(tree.Quoted)(str.charAt(0), str.slice(1, -1), isEscaped, index + currentIndex, fileInfo);`
`410`	`410`	`},`
`411`	`411`
`412`	`412`	`//`
`@@ -788,7 +788,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {`
`788`	`788`	`if (js) {`
`789`	`789`	`warn('Inline JavaScript evaluation (backtick expressions) is deprecated and will be removed in Less 5.x. Use Less functions or custom plugins instead.', index, 'DEPRECATED', 'js-eval');`
`790`	`790`	`parserInput.forget();`
`791`		`- return new(tree.JavaScript)(js.substr(0, js.length - 1), Boolean(escape), index + currentIndex, fileInfo);`
	`791`	`+ return new(tree.JavaScript)(js.slice(0, -1), Boolean(escape), index + currentIndex, fileInfo);`
`792`	`792`	`}`
`793`	`793`	`parserInput.restore('invalid javascript definition');`
`794`	`794`	`}`
`@@ -1901,7 +1901,7 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {`
`1901`	`1901`	`}`
`1902`	`1902`	`if (parserInput.$char(')')) {`
`1903`	`1903`	`if (p && !e) {`
`1904`		`- nodes.push(new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index)));`
	`1904`	`+ nodes.push(new (tree.Paren)(new (tree.QueryInParens)(p.op, p.lvalue, p.rvalue, rangeP ? rangeP.op : null, rangeP ? rangeP.rvalue : null, p._index)));`
`1905`	`1905`	`e = p;`
`1906`	`1906`	`} else if (p && e) {`
`1907`	`1907`	`nodes.push(new (tree.Paren)(new (tree.Declaration)(p, e, null, null, parserInput.i + currentIndex, fileInfo, true)));`
`@@ -1986,12 +1986,12 @@ const Parser = function Parser(context, imports, fileInfo, currentIndex) {`
`1986`	`1986`	`if (parserInput.$str('@media')) {`
`1987`	`1987`	`return this.prepareAndGetNestableAtRule(tree.Media, index, debugInfo, MediaSyntaxOptions);`
`1988`	`1988`	`}`
`1989`		`-`
	`1989`	`+`
`1990`	`1990`	`if (parserInput.$str('@container')) {`
`1991`	`1991`	`return this.prepareAndGetNestableAtRule(tree.Container, index, debugInfo, ContainerSyntaxOptions);`
`1992`	`1992`	`}`
`1993`	`1993`	`}`
`1994`		`-`
	`1994`	`+`
`1995`	`1995`	`parserInput.restore();`
`1996`	`1996`	`},`
`1997`	`1997`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ Dimension.prototype = Object.assign(new Node(), {`
`56`	`56`
`57`	`57`	`// Float values doesn't need a leading zero`
`58`	`58`	`if (value > 0 && value < 1) {`
`59`		`- strValue = (strValue).substr(1);`
	`59`	`+ strValue = (strValue).slice(1);`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ NamespaceValue.prototype = Object.assign(new Node(), {`
`15`	`15`
`16`	`16`	`eval(context) {`
`17`	`17`	`let i, name, rules = this.value.eval(context);`
`18`		`-`
	`18`	`+`
`19`	`19`	`for (i = 0; i < this.lookups.length; i++) {`
`20`	`20`	`name = this.lookups[i];`
`21`	`21`
`@@ -33,12 +33,12 @@ NamespaceValue.prototype = Object.assign(new Node(), {`
`33`	`33`	`}`
`34`	`34`	`else if (name.charAt(0) === '@') {`
`35`	`35`	`if (name.charAt(1) === '@') {`
`36`		- name = `@${new Variable(name.substr(1)).eval(context).value}`;
	`36`	+ name = `@${new Variable(name.slice(1)).eval(context).value}`;
`37`	`37`	`}`
`38`	`38`	`if (rules.variables) {`
`39`	`39`	`rules = rules.variable(name);`
`40`	`40`	`}`
`41`		`-`
	`41`	`+`
`42`	`42`	`if (!rules) {`
`43`	`43`	`throw { type: 'Name',`
`44`	`44`	message: `variable ${name} not found`,
`@@ -48,18 +48,18 @@ NamespaceValue.prototype = Object.assign(new Node(), {`
`48`	`48`	`}`
`49`	`49`	`else {`
`50`	`50`	`if (name.substring(0, 2) === '$@') {`
`51`		- name = `$${new Variable(name.substr(1)).eval(context).value}`;
	`51`	+ name = `$${new Variable(name.slice(1)).eval(context).value}`;
`52`	`52`	`}`
`53`	`53`	`else {`
`54`	`54`	name = name.charAt(0) === '$' ? name : `$${name}`;
`55`	`55`	`}`
`56`	`56`	`if (rules.properties) {`
`57`	`57`	`rules = rules.property(name);`
`58`	`58`	`}`
`59`		`-`
	`59`	`+`
`60`	`60`	`if (!rules) {`
`61`	`61`	`throw { type: 'Name',`
`62`		- message: `property "${name.substr(1)}" not found`,
	`62`	+ message: `property "${name.slice(1)}" not found`,
`63`	`63`	`filename: this.fileInfo().filename,`
`64`	`64`	`index: this.getIndex() };`
`65`	`65`	`}`