Skip to content

Commit

Permalink
fix: Add support for Node 10
Browse files Browse the repository at this point in the history
Closes #138.
  • Loading branch information
bebraw committed Jul 7, 2020
1 parent 9bc18f7 commit 7bdd036
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 6 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/dubnium
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js:
- "10"
- "12"
script:
- npm run build
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 5.0.7 / 2020-07-07

- Fix - Support Node 10 #138

## 5.0.6 / 2020-07-06

- Fix - Drop tslib dependency by setting `"importHelpers": false,`
Expand All @@ -24,6 +28,7 @@
- Deprecation - `merge.multiple` has been dropped as the functionality was too specific and it's better to implement in the user space if needed.
- Breaking - `merge` has been moved as a regular import (i.e. `import { merge } from 'webpack-merge'`).
- Breaking - Merge customization has been moved behind `mergeWithCustomize`.
- Breaking - Bump supported Node version to 12
- Feature - `customizeArray` supports wildcards now. Example: `'entry.*': 'prepend'`. #45 #99
- 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
- Fix - Drop lodash in favor of simpler dependencies. #134
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ const output = mergeWithCustomize({

## Development

1. `nvm use`
1. `npm i`
1. `npm t -- --watch`
1. `npm run build -- --watch` in one terminal
1. `npm t -- --watch` in another one

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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"merge"
],
"engines": {
"node": ">=12.0.0"
"node": ">=10.0.0"
},
"jest": {
"collectCoverage": true
Expand Down
2 changes: 1 addition & 1 deletion test/customize.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import assert from "assert";
import { mergeWithCustomize, customizeArray, customizeObject } from "../src";
import { mergeWithCustomize, customizeArray, customizeObject } from "../";
import customizeTests from "../helpers/customize-tests";

describe("Merge strategy", function () {
Expand Down
2 changes: 1 addition & 1 deletion test/merge-with-customize.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from "assert";
import webpack from "webpack";
import { mergeWithCustomize } from "../src";
import { mergeWithCustomize } from "../";

describe("Merge", function () {
customizeMergeTests(mergeWithCustomize);
Expand Down
2 changes: 1 addition & 1 deletion test/merge.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import assert from "assert";
import { merge } from "../src";
import { merge } from "../";
import mergeTests from "../helpers/merge-tests";
import loadersKeys from "../helpers/loaders-keys";

Expand Down
2 changes: 1 addition & 1 deletion test/unique.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import assert from "assert";
import webpack from "webpack";
import { mergeWithCustomize, unique } from "../src";
import { mergeWithCustomize, unique } from "../";

describe("Unique", function () {
it("should allow unique definitions", function () {
Expand Down

0 comments on commit 7bdd036

Please sign in to comment.