Skip to content

Commit db2547e

Browse files
committed
chore: Update internal tooling
1 parent 99b62a2 commit db2547e

16 files changed

Lines changed: 12282 additions & 13694 deletions

.github/workflows/test.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node_version: [10, 12, 14, 16, 18]
15+
node_version: [18, 20]
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- name: Use Node.js ${{ matrix.node_version }}
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: ${{ matrix.node_version }}
18+
- uses: actions/checkout@v3
19+
- name: Use Node.js ${{ matrix.node_version }}
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: ${{ matrix.node_version }}
2323

24-
- run: npm ci
24+
- run: npm ci
2525

26-
- run: npm run build
27-
- run: npm run test
26+
- run: npm run build
27+
- run: npm run test
2828

29-
- if: matrix.node_version == 18
30-
uses: codecov/codecov-action@v3
31-
with:
32-
directory: ./coverage
29+
- if: matrix.node_version == 18
30+
uses: codecov/codecov-action@v3
31+
with:
32+
directory: ./coverage

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/dubnium
1+
18

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 6.0.0 / xxxx-xx-xx
4+
5+
- Chore - Update internal dependencies. As a result, the package needs at least Node 18 to run.
6+
37
## 5.10.0 / 2023-10-16
48

59
- Feat - Support object/array-formed condition for `mergeWithRules`. #212
@@ -174,7 +178,7 @@ merge.smart(
174178
loaders: ["react-hot", "babel"],
175179
},
176180
],
177-
}
181+
},
178182
);
179183
// will become
180184
{

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ const output = mergeWithCustomize({
159159
customizeArray: unique(
160160
"plugins",
161161
["HotModuleReplacementPlugin"],
162-
(plugin) => plugin.constructor && plugin.constructor.name
162+
(plugin) => plugin.constructor && plugin.constructor.name,
163163
),
164164
})(
165165
{
166166
plugins: [new webpack.HotModuleReplacementPlugin()],
167167
},
168168
{
169169
plugins: [new webpack.HotModuleReplacementPlugin()],
170-
}
170+
},
171171
);
172172

173173
// Output contains only single HotModuleReplacementPlugin now and it's
@@ -237,7 +237,7 @@ assert.deepStrictEqual(
237237
},
238238
},
239239
})(a, b),
240-
result
240+
result,
241241
);
242242
```
243243

helpers/customize-tests.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function mergeStrategyTests(merge) {
1616
merge({
1717
entry: "append",
1818
})(a, b),
19-
result
19+
result,
2020
);
2121
});
2222

@@ -35,7 +35,7 @@ function mergeStrategyTests(merge) {
3535
merge({
3636
entry: "prepend",
3737
})(a, b),
38-
result
38+
result,
3939
);
4040
});
4141

@@ -61,9 +61,9 @@ function mergeStrategyTests(merge) {
6161
Object.keys(
6262
merge({
6363
entry: "append",
64-
})(a, b).entry
64+
})(a, b).entry,
6565
),
66-
Object.keys(result.entry)
66+
Object.keys(result.entry),
6767
);
6868
});
6969

@@ -89,9 +89,9 @@ function mergeStrategyTests(merge) {
8989
Object.keys(
9090
merge({
9191
entry: "prepend",
92-
})(a, b).entry
92+
})(a, b).entry,
9393
),
94-
Object.keys(result.entry)
94+
Object.keys(result.entry),
9595
);
9696
});
9797

@@ -110,9 +110,9 @@ function mergeStrategyTests(merge) {
110110
Object.keys(
111111
merge({
112112
entry: "replace",
113-
})(a, b).entry
113+
})(a, b).entry,
114114
),
115-
Object.keys(result.entry)
115+
Object.keys(result.entry),
116116
);
117117
});
118118

@@ -137,9 +137,9 @@ function mergeStrategyTests(merge) {
137137
Object.keys(
138138
merge({
139139
entry: "replace",
140-
})(a, b).entry
140+
})(a, b).entry,
141141
),
142-
Object.keys(result.entry)
142+
Object.keys(result.entry),
143143
);
144144
});
145145

@@ -160,7 +160,7 @@ function mergeStrategyTests(merge) {
160160
merge({
161161
postcss: "prepend",
162162
})(a, b).postcss(),
163-
expected
163+
expected,
164164
);
165165
});
166166

@@ -192,9 +192,9 @@ function mergeStrategyTests(merge) {
192192
Object.keys(
193193
merge({
194194
postcss: "prepend",
195-
})(a, b).postcss()
195+
})(a, b).postcss(),
196196
),
197-
Object.keys(result.postcss())
197+
Object.keys(result.postcss()),
198198
);
199199
});
200200

@@ -215,7 +215,7 @@ function mergeStrategyTests(merge) {
215215
merge({
216216
postcss: "replace",
217217
})(a, b).postcss(),
218-
expected
218+
expected,
219219
);
220220
});
221221

@@ -236,7 +236,7 @@ function mergeStrategyTests(merge) {
236236
merge({
237237
postcss: "replace",
238238
})(a, b).postcss(),
239-
expected
239+
expected,
240240
);
241241
});
242242
}

0 commit comments

Comments
 (0)