Merge branch 'less:master' into master

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [10, 12, 14, 16, 19]
+        node: [10, 12, 14, 16, 20]
     runs-on: ${{ matrix.os }}
     steps:
      - uses: actions/checkout@v2

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+### v4.2.0 (2023-08-06)
+- [#3811](https://github.com/less/less.js/pull/3811) add support for [container queries](https://www.w3.org/TR/css-contain-3) (@puckowski)
+- [#3761](https://github.com/less/less.js/pull/3761) fix faulty source map generation with variables in selectors, fixes [#3567](https://github.com/less/less.js/issues/3567) (@pgoldberg)
+- [#3700](https://github.com/less/less.js/pull/3700) parsing variables fail when there is no trailing semicolon (@b-kelly)
+- [#3719](https://github.com/less/less.js/pull/3719) modify `this` pointer so that it is not empty. (@lumburr)
+- [#3649](https://github.com/less/less.js/pull/3649) fixes [#2991](https://github.com/less/less.js/issues/2991) empty @media queries generated when compiling less file with (reference) to bootstrap (@MoonCoral)
+
 ### v4.1.3 (2022-06-09)
 - [#3673](https://github.com/less/less.js/pull/3673) Feat: add support for case-insensitive attribute selectors (#3673) (@iChenLei)
 - [#3710](https://github.com/less/less.js/pull/3701) Feat: add `disablePluginRule` flag for render() options (#3710) (@broofa @edhgoose)

package.json

@@ -28,7 +28,6 @@
   "devDependencies": {
     "github-changes": "^1.1.2",
     "lerna": "^3.22.1",
-    "npm-run-all": "^4.1.5",
-    "resolve-bin": "~1.0.1"
+    "npm-run-all": "^4.1.5"
   }
 }

packages/less/Gruntfile.js

@@ -2,7 +2,6 @@
 
 var resolve = require('resolve');
 var path = require('path');
-var resolveBin = require('resolve-bin')
 
 var testFolder = path.relative(process.cwd(), path.dirname(resolve.sync('@less/test-data')));
 var lessFolder = path.join(testFolder, 'less');
@@ -184,12 +183,6 @@ module.exports = function(grunt) {
     // Make the SauceLabs jobs
     ["all"].concat(browserTests).map(makeJob);
 
-    var path = require('path');
-
-    // Handle async / await in Rollup build for tests
-    const tsNodeRuntime = resolveBin.sync('ts-node');
-    const crossEnv = resolveBin.sync('cross-env');
-
     // Project configuration.
     grunt.initConfig({
         shell: {
@@ -223,12 +216,7 @@ module.exports = function(grunt) {
                 command: "node build/rollup.js --browser --out=./tmp/browser/less.min.js"
             },
             test: {
-                command: [
-                    // https://github.com/TypeStrong/ts-node/issues/693#issuecomment-848907036
-                    crossEnv + " TS_NODE_SCOPE=true",
-                    tsNodeRuntime + " test/test-es6.ts",
-                    "node test/index.js"
-                ].join(' && ')
+                command: 'ts-node test/test-es6.ts && node test/index.js'
             },
             generatebrowser: {
                 command: 'node test/browser/generator/generate.js'

packages/less/test/browser/generator/runner.config.js

@@ -1,11 +1,11 @@
 var path = require('path');
 var resolve = require('resolve')
+var { forceCovertToBrowserPath } = require('./utils');
 
 /** Root of repo */
-var rootFolder = path.resolve(__dirname, '../../../../../');
-var testFolder = path.dirname(resolve.sync('@less/test-data'))
-var lessFolder = path.join(testFolder, 'less');
-var localTests = path.resolve(__dirname, '..');
+var testFolder = forceCovertToBrowserPath(path.dirname(resolve.sync('@less/test-data')));
+var lessFolder = forceCovertToBrowserPath(path.join(testFolder, 'less'));
+var localTests = forceCovertToBrowserPath(path.resolve(__dirname, '..'));
 
 module.exports = {
     main: {
@@ -35,7 +35,7 @@ module.exports = {
         }
     },
     strictUnits: {
-        src: [`${lessFolder}/strict-units/*.less`],
+        src: [`${lessFolder}/units/strict/*.less`],
         options: {
             helpers: 'test/browser/runner-strict-units-options.js',
             specs: 'test/browser/runner-strict-units-spec.js',
@@ -185,4 +185,4 @@ module.exports = {
             outfile: 'tmp/browser/test-runner-filemanager-plugin.html'
         }
     }
-}
+}

packages/less/test/browser/generator/template.js

@@ -1,10 +1,11 @@
 const html = require('html-template-tag')
 const path = require('path')
+const { forceCovertToBrowserPath } = require('./utils')
 
 const webRoot = path.resolve(__dirname, '../../../../../');
-const mochaDir = path.relative(webRoot, path.dirname(require.resolve('mocha')))
-const chaiDir = path.relative(webRoot, path.dirname(require.resolve('chai')))
-const mochaTeamCityDir = path.relative(webRoot, path.dirname(require.resolve('mocha-teamcity-reporter')))
+const mochaDir = forceCovertToBrowserPath(path.relative(webRoot, path.dirname(require.resolve('mocha'))))
+const chaiDir = forceCovertToBrowserPath(path.relative(webRoot, path.dirname(require.resolve('chai'))))
+const mochaTeamCityDir = forceCovertToBrowserPath(path.relative(webRoot, path.dirname(require.resolve('mocha-teamcity-reporter'))))
 
 /**
  * Generates HTML templates from list of test sheets

packages/less/test/browser/generator/utils.js

@@ -0,0 +1,14 @@
+/**
+ * utils for covert browser paths,
+ * fix https://github.com/less/less.js/pull/4213 
+ * 
+ * @param {string} path 
+ * @returns {string}
+ */
+function forceCovertToBrowserPath (path) {
+    return (path || '').replace(/\\/g, '/');
+}
+
+module.exports = {
+    forceCovertToBrowserPath
+}