From b5986ca3bad3b6eb0b108c8ad5102d9b15f940c4 Mon Sep 17 00:00:00 2001 From: Bob van de Vijver Date: Thu, 20 May 2021 23:01:40 +0200 Subject: [PATCH 1/2] Allow less-loader v9 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 package.json mode change 100644 => 100755 yarn.lock diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 0f4681a5..1cfd7b98 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "handlebars-loader": "^1.7.0", "http-server": "^0.12.3", "less": "^4.0.0", - "less-loader": "^7.0.0 || ^8.0.0", + "less-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "mocha": "^8.2.1", "postcss": "^8.1.0", "postcss-loader": "^4.0.0 || ^5.0.0", diff --git a/yarn.lock b/yarn.lock old mode 100644 new mode 100755 index 463b4b4b..dc34f6b4 --- a/yarn.lock +++ b/yarn.lock @@ -4455,10 +4455,10 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -"less-loader@^7.0.0 || ^8.0.0": - version "8.1.1" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-8.1.1.tgz#ababe912580457ad00a4318146aac5b53e023f42" - integrity sha512-K93jJU7fi3n6rxVvzp8Cb88Uy9tcQKfHlkoezHwKILXhlNYiRQl4yowLIkQqmBXOH/5I8yoKiYeIf781HGkW9g== +"less-loader@^7.0.0 || ^8.0.0 || ^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-9.0.0.tgz#71a0b530174bddf89bb11a5019dd725f54df4791" + integrity sha512-bPen1xeGTZuYFFobcdz9kMUVgSSSDZQJtyhawtCtcz1QboQOwhkI7uCwp5UO+IZpO+LJS1W73YwxsufbBT6SBQ== dependencies: klona "^2.0.4" From 8ab906ec55a7161aa15401349f56ea22ffce24fa Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 21 May 2021 11:43:51 -0400 Subject: [PATCH 2/2] working around node 10 and less-loader 9 in the test suite --- .github/workflows/node-windows.yml | 5 ++++- .travis.yml | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node-windows.yml b/.github/workflows/node-windows.yml index 3c35389d..8f14fa3f 100644 --- a/.github/workflows/node-windows.yml +++ b/.github/workflows/node-windows.yml @@ -19,7 +19,10 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} + # needed so that Node 10 downloads a compatible less-loader version + - name: Clear lock file + run: del yarn.lock - name: yarn install - run: yarn install + run: yarn --ignore-engines - name: run tests run: yarn test diff --git a/.travis.yml b/.travis.yml index 71d4076c..393c4e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,15 @@ matrix: - rm yarn.lock - yarn - os: linux - node_js: "10" + node_js: "14" env: JOB_PART=travis:lint - os: linux node_js: "10" env: JOB_PART=test + # needed so that Node 10 downloads a compatible less-loader version + install: + - rm yarn.lock + - yarn --ignore-engines - os: linux node_js: "12" env: JOB_PART=test