Skip to content

Commit 7bdd036

Browse files
committed
fix: Add support for Node 10
Closes #138.
1 parent 9bc18f7 commit 7bdd036

File tree

9 files changed

+15
-6
lines changed

9 files changed

+15
-6
lines changed

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/dubnium

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: node_js
22
node_js:
3+
- "10"
34
- "12"
45
script:
56
- npm run build

CHANGELOG.md

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

3+
## 5.0.7 / 2020-07-07
4+
5+
- Fix - Support Node 10 #138
6+
37
## 5.0.6 / 2020-07-06
48

59
- Fix - Drop tslib dependency by setting `"importHelpers": false,`
@@ -24,6 +28,7 @@
2428
- Deprecation - `merge.multiple` has been dropped as the functionality was too specific and it's better to implement in the user space if needed.
2529
- Breaking - `merge` has been moved as a regular import (i.e. `import { merge } from 'webpack-merge'`).
2630
- Breaking - Merge customization has been moved behind `mergeWithCustomize`.
31+
- Breaking - Bump supported Node version to 12
2732
- Feature - `customizeArray` supports wildcards now. Example: `'entry.*': 'prepend'`. #45 #99
2833
- Feature - Throw an error in case a `Promise` is being merged. It's better to wrap configuration within a `Promise` and merge inside it. #81
2934
- Fix - Drop lodash in favor of simpler dependencies. #134

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,10 @@ const output = mergeWithCustomize({
174174

175175
## Development
176176

177+
1. `nvm use`
177178
1. `npm i`
178-
1. `npm t -- --watch`
179+
1. `npm run build -- --watch` in one terminal
180+
1. `npm t -- --watch` in another one
179181

180182
Before contributing, please [open an issue](https://github.com/survivejs/webpack-merge/issues/new) where to discuss.
181183

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"merge"
4141
],
4242
"engines": {
43-
"node": ">=12.0.0"
43+
"node": ">=10.0.0"
4444
},
4545
"jest": {
4646
"collectCoverage": true

test/customize.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { mergeWithCustomize, customizeArray, customizeObject } from "../src";
2+
import { mergeWithCustomize, customizeArray, customizeObject } from "../";
33
import customizeTests from "../helpers/customize-tests";
44

55
describe("Merge strategy", function () {

test/merge-with-customize.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
22
import webpack from "webpack";
3-
import { mergeWithCustomize } from "../src";
3+
import { mergeWithCustomize } from "../";
44

55
describe("Merge", function () {
66
customizeMergeTests(mergeWithCustomize);

test/merge.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { merge } from "../src";
2+
import { merge } from "../";
33
import mergeTests from "../helpers/merge-tests";
44
import loadersKeys from "../helpers/loaders-keys";
55

test/unique.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
22
import webpack from "webpack";
3-
import { mergeWithCustomize, unique } from "../src";
3+
import { mergeWithCustomize, unique } from "../";
44

55
describe("Unique", function () {
66
it("should allow unique definitions", function () {

0 commit comments

Comments
 (0)