Skip to content

Commit ee40727

Browse files
chore(defaults): update (webpack-contrib#1020)
1 parent 65450d9 commit ee40727

8 files changed

+200
-111
lines changed

.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]
12-
insert_final_newline = true
1312
trim_trailing_whitespace = false

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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+
### [3.3.2](https://github.com/webpack-contrib/css-loader/compare/v3.3.1...v3.3.2) (2019-12-12)
6+
7+
8+
### Bug Fixes
9+
10+
* logic for order and media queries for imports ([1fb5134](https://github.com/webpack-contrib/css-loader/commit/1fb51340a7719b6f5b517cb71ea85ec5d45c1199))
11+
512
### [3.3.1](https://github.com/webpack-contrib/css-loader/compare/v3.3.0...v3.3.1) (2019-12-12)
613

714

azure-pipelines.yml

+39-19
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ trigger:
22
- master
33
- next
44

5+
variables:
6+
npm_config_cache: $(Pipeline.Workspace)/.npm
7+
58
jobs:
69
- job: Lint
710
pool:
8-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-latest
912
steps:
1013
- task: NodeTool@0
1114
inputs:
@@ -20,10 +23,12 @@ jobs:
2023
node -v
2124
npm -v
2225
displayName: 'Print versions'
23-
- task: Npm@1
26+
- task: CacheBeta@1
2427
inputs:
25-
command: custom
26-
customCommand: ci
28+
key: npm | $(Agent.OS) | package-lock.json
29+
path: $(npm_config_cache)
30+
displayName: 'Cache npm'
31+
- script: npm ci
2732
displayName: 'Install dependencies'
2833
- script: npm run lint
2934
displayName: 'Run lint'
@@ -34,10 +39,13 @@ jobs:
3439

3540
- job: Linux
3641
pool:
37-
vmImage: ubuntu-16.04
42+
vmImage: ubuntu-latest
3843
strategy:
39-
maxParallel: 4
44+
maxParallel: 5
4045
matrix:
46+
node-13:
47+
node_version: ^13.0.0
48+
webpack_version: latest
4149
node-12:
4250
node_version: ^12.0.0
4351
webpack_version: latest
@@ -65,10 +73,12 @@ jobs:
6573
node -v
6674
npm -v
6775
displayName: 'Print versions'
68-
- task: Npm@1
76+
- task: CacheBeta@1
6977
inputs:
70-
command: custom
71-
customCommand: ci
78+
key: npm | $(Agent.OS) | package-lock.json
79+
path: $(npm_config_cache)
80+
displayName: 'Cache npm'
81+
- script: npm ci
7282
displayName: 'Install dependencies'
7383
- script: npm i webpack@$(webpack_version)
7484
displayName: 'Install "webpack@$(webpack_version)"'
@@ -86,10 +96,13 @@ jobs:
8696

8797
- job: macOS
8898
pool:
89-
vmImage: macOS-10.14
99+
vmImage: macOS-latest
90100
strategy:
91-
maxParallel: 4
101+
maxParallel: 5
92102
matrix:
103+
node-13:
104+
node_version: ^13.0.0
105+
webpack_version: latest
93106
node-12:
94107
node_version: ^12.0.0
95108
webpack_version: latest
@@ -117,10 +130,12 @@ jobs:
117130
node -v
118131
npm -v
119132
displayName: 'Print versions'
120-
- task: Npm@1
133+
- task: CacheBeta@1
121134
inputs:
122-
command: custom
123-
customCommand: ci
135+
key: npm | $(Agent.OS) | package-lock.json
136+
path: $(npm_config_cache)
137+
displayName: 'Cache npm'
138+
- script: npm ci
124139
displayName: 'Install dependencies'
125140
- script: npm i webpack@$(webpack_version)
126141
displayName: 'Install "webpack@$(webpack_version)"'
@@ -138,10 +153,13 @@ jobs:
138153

139154
- job: Windows
140155
pool:
141-
vmImage: windows-2019
156+
vmImage: windows-latest
142157
strategy:
143-
maxParallel: 4
158+
maxParallel: 5
144159
matrix:
160+
node-13:
161+
node_version: ^13.0.0
162+
webpack_version: latest
145163
node-12:
146164
node_version: ^12.0.0
147165
webpack_version: latest
@@ -172,10 +190,12 @@ jobs:
172190
node -v
173191
npm -v
174192
displayName: 'Print versions'
175-
- task: Npm@1
193+
- task: CacheBeta@1
176194
inputs:
177-
command: custom
178-
customCommand: ci
195+
key: npm | $(Agent.OS) | package-lock.json
196+
path: $(npm_config_cache)
197+
displayName: 'Cache npm'
198+
- script: npm ci
179199
displayName: 'Install dependencies'
180200
- script: npm i webpack@$(webpack_version)
181201
displayName: 'Install "webpack@$(webpack_version)"'

lint-staged.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
22
'*.js': ['prettier --write', 'eslint --fix', 'git add'],
3-
'*.{json,md,yml,css}': ['prettier --write', 'git add'],
3+
'*.{json,md,yml,css,ts}': ['prettier --write', 'git add'],
44
};

0 commit comments

Comments
 (0)