Skip to content

Commit b06b840

Browse files
authored
Merge branch 'webpack-contrib:master' into feat/1028-v2
2 parents 8185951 + 7c5cdcc commit b06b840

21 files changed

+8181
-9264
lines changed

.github/workflows/cancel.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Cancel
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- next
7+
pull_request:
8+
branches:
9+
- master
10+
- next
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
cancel:
16+
permissions:
17+
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
18+
name: Cancel Previous Runs
19+
runs-on: ubuntu-latest
20+
timeout-minutes: 3
21+
steps:
22+
- uses: styfle/cancel-workflow-action@0.10.0
23+
with:
24+
workflow_id: nodejs.yml
25+
access_token: ${{ github.token }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Dependency Review"
2+
on: [pull_request]
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
dependency-review:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: "Checkout Repository"
12+
uses: actions/checkout@v3
13+
- name: "Dependency Review"
14+
uses: actions/dependency-review-action@v2

.github/workflows/nodejs.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- master
1111
- next
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
lint:
1518
name: Lint - ${{ matrix.os }} - Node v${{ matrix.node-version }}
@@ -20,24 +23,21 @@ jobs:
2023
strategy:
2124
matrix:
2225
os: [ubuntu-latest]
23-
node-version: [12.x]
26+
node-version: [16.x]
2427

2528
runs-on: ${{ matrix.os }}
2629

2730
steps:
28-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
2932
with:
3033
fetch-depth: 0
3134

3235
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v2
36+
uses: actions/setup-node@v3
3437
with:
3538
node-version: ${{ matrix.node-version }}
3639
cache: "npm"
3740

38-
- name: Use latest NPM
39-
run: sudo npm i -g npm
40-
4141
- name: Install dependencies
4242
run: npm ci
4343

@@ -48,15 +48,15 @@ jobs:
4848
run: npm run security
4949

5050
- name: Check commit message
51-
uses: wagoid/commitlint-github-action@v4
51+
uses: wagoid/commitlint-github-action@v5
5252

5353
test:
5454
name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}
5555

5656
strategy:
5757
matrix:
5858
os: [ubuntu-latest, windows-latest, macos-latest]
59-
node-version: [12.x, 14.x, 16.x, 17.x]
59+
node-version: [12.x, 14.x, 16.x, 18.x, 19.x]
6060
webpack-version: [latest]
6161

6262
runs-on: ${{ matrix.os }}
@@ -66,32 +66,25 @@ jobs:
6666
if: matrix.os == 'windows-latest'
6767
run: git config --global core.autocrlf input
6868

69-
- uses: actions/checkout@v2
69+
- uses: actions/checkout@v3
7070

7171
- name: Use Node.js ${{ matrix.node-version }}
72-
uses: actions/setup-node@v2
72+
uses: actions/setup-node@v3
7373
with:
7474
node-version: ${{ matrix.node-version }}
7575
cache: "npm"
7676

77-
- name: Use latest NPM on ubuntu/macos
78-
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
79-
run: sudo npm i -g npm
80-
81-
- name: Use latest NPM on windows
82-
if: matrix.os == 'windows-latest'
83-
run: npm i -g npm
84-
8577
- name: Install dependencies
8678
run: npm ci
8779

8880
- name: Install webpack ${{ matrix.webpack-version }}
81+
if: matrix.webpack-version != 'latest'
8982
run: npm i webpack@${{ matrix.webpack-version }}
9083

9184
- name: Run tests for webpack version ${{ matrix.webpack-version }}
9285
run: npm run test:coverage -- --ci
9386

9487
- name: Submit coverage data to codecov
95-
uses: codecov/codecov-action@v2
88+
uses: codecov/codecov-action@v3
9689
with:
9790
token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [6.7.1](https://github.com/webpack-contrib/css-loader/compare/v6.7.0...v6.7.1) (2022-03-08)
6+
7+
8+
### Bug Fixes
9+
10+
* defaultGetLocalIdent export ([#1427](https://github.com/webpack-contrib/css-loader/issues/1427)) ([74dac1e](https://github.com/webpack-contrib/css-loader/commit/74dac1e428569236d386ff4e0f971e35c334087a))
11+
12+
## [6.7.0](https://github.com/webpack-contrib/css-loader/compare/v6.6.0...v6.7.0) (2022-03-04)
13+
14+
15+
### Features
16+
17+
* re-export defaultGetLocalIdent ([#1423](https://github.com/webpack-contrib/css-loader/issues/1423)) ([207cf36](https://github.com/webpack-contrib/css-loader/commit/207cf36d541423f12a8d6680b21530c52a2f07d5))
18+
19+
## [6.6.0](https://github.com/webpack-contrib/css-loader/compare/v6.5.1...v6.6.0) (2022-02-02)
20+
21+
22+
### Features
23+
24+
* added the `hashStrategy` option ([ca4abce](https://github.com/webpack-contrib/css-loader/commit/ca4abce74d01bc13959e30a4dbbd1ca3a0516d72))
25+
26+
527
### [6.5.1](https://github.com/webpack-contrib/css-loader/compare/v6.5.0...v6.5.1) (2021-11-03)
628

729

0 commit comments

Comments
 (0)