Skip to content

Commit

Permalink
chore: Update internal tooling
Browse files Browse the repository at this point in the history
  • Loading branch information
bebraw committed Oct 16, 2023
1 parent 99b62a2 commit db2547e
Show file tree
Hide file tree
Showing 16 changed files with 12,282 additions and 13,694 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ jobs:

strategy:
matrix:
node_version: [10, 12, 14, 16, 18]
node_version: [18, 20]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}

- run: npm ci
- run: npm ci

- run: npm run build
- run: npm run test
- run: npm run build
- run: npm run test

- if: matrix.node_version == 18
uses: codecov/codecov-action@v3
with:
directory: ./coverage
- if: matrix.node_version == 18
uses: codecov/codecov-action@v3
with:
directory: ./coverage
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/dubnium
18
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 6.0.0 / xxxx-xx-xx

- Chore - Update internal dependencies. As a result, the package needs at least Node 18 to run.

## 5.10.0 / 2023-10-16

- Feat - Support object/array-formed condition for `mergeWithRules`. #212
Expand Down Expand Up @@ -174,7 +178,7 @@ merge.smart(
loaders: ["react-hot", "babel"],
},
],
}
},
);
// will become
{
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ const output = mergeWithCustomize({
customizeArray: unique(
"plugins",
["HotModuleReplacementPlugin"],
(plugin) => plugin.constructor && plugin.constructor.name
(plugin) => plugin.constructor && plugin.constructor.name,
),
})(
{
plugins: [new webpack.HotModuleReplacementPlugin()],
},
{
plugins: [new webpack.HotModuleReplacementPlugin()],
}
},
);

// Output contains only single HotModuleReplacementPlugin now and it's
Expand Down Expand Up @@ -237,7 +237,7 @@ assert.deepStrictEqual(
},
},
})(a, b),
result
result,
);
```

Expand Down
30 changes: 15 additions & 15 deletions helpers/customize-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function mergeStrategyTests(merge) {
merge({
entry: "append",
})(a, b),
result
result,
);
});

Expand All @@ -35,7 +35,7 @@ function mergeStrategyTests(merge) {
merge({
entry: "prepend",
})(a, b),
result
result,
);
});

Expand All @@ -61,9 +61,9 @@ function mergeStrategyTests(merge) {
Object.keys(
merge({
entry: "append",
})(a, b).entry
})(a, b).entry,
),
Object.keys(result.entry)
Object.keys(result.entry),
);
});

Expand All @@ -89,9 +89,9 @@ function mergeStrategyTests(merge) {
Object.keys(
merge({
entry: "prepend",
})(a, b).entry
})(a, b).entry,
),
Object.keys(result.entry)
Object.keys(result.entry),
);
});

Expand All @@ -110,9 +110,9 @@ function mergeStrategyTests(merge) {
Object.keys(
merge({
entry: "replace",
})(a, b).entry
})(a, b).entry,
),
Object.keys(result.entry)
Object.keys(result.entry),
);
});

Expand All @@ -137,9 +137,9 @@ function mergeStrategyTests(merge) {
Object.keys(
merge({
entry: "replace",
})(a, b).entry
})(a, b).entry,
),
Object.keys(result.entry)
Object.keys(result.entry),
);
});

Expand All @@ -160,7 +160,7 @@ function mergeStrategyTests(merge) {
merge({
postcss: "prepend",
})(a, b).postcss(),
expected
expected,
);
});

Expand Down Expand Up @@ -192,9 +192,9 @@ function mergeStrategyTests(merge) {
Object.keys(
merge({
postcss: "prepend",
})(a, b).postcss()
})(a, b).postcss(),
),
Object.keys(result.postcss())
Object.keys(result.postcss()),
);
});

Expand All @@ -215,7 +215,7 @@ function mergeStrategyTests(merge) {
merge({
postcss: "replace",
})(a, b).postcss(),
expected
expected,
);
});

Expand All @@ -236,7 +236,7 @@ function mergeStrategyTests(merge) {
merge({
postcss: "replace",
})(a, b).postcss(),
expected
expected,
);
});
}
Expand Down
Loading

0 comments on commit db2547e

Please sign in to comment.