Skip to content

Commit 657a637

Browse files
authored
Merge pull request #201 from bholloway/release-v4
Prepare to release v4
2 parents fef805b + 7dc584e commit 657a637

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8
1+
8.9

README.md

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
# Resolve URL Loader
22

3-
The **version 4** is in **beta** on `master` branch. 🥳
3+
We're working on **version 5** right now.
4+
* Update `node` to recent LTS.
5+
* Update `postcss` to latest
6+
* Remove `rework` completely
47

5-
Install `resolve-url-loader@next` in your project!
8+
Stay tuned for a `resolve-url-loader@next` coming soon.
69

7-
* Better resolution of the original source location - You can more successfully use url() in variables and mixins. 🎉
8-
* Dependencies now accept a wider range and explicit dependency on `rework` and `rework-visit` has been removed. 😌
9-
* Tested for webpack 5. 👍
10+
----
11+
12+
The **version 4** is released. 🥳
1013

11-
Read the [improved documentation](packages/resolve-url-loader/README.md).
14+
Install `resolve-url-loader@latest` in your project!
1215

13-
Migrate using the [changelog](packages/resolve-url-loader/CHANGELOG.md).
16+
Read the [documentation](../v4-maintenance/packages/resolve-url-loader/README.md).
17+
Migrate using the [changelog](../v4-maintenance/packages/resolve-url-loader/CHANGELOG.md).
1418

1519
----
1620

17-
The **version 3** is now maintenance only, refer to [v3-maintenance](../v3-maintenance/packages/resolve-url-loader/README.md) branch.
21+
The **version 3** is now maintenance only.
22+
23+
Refer to [v3-maintenance](../v3-maintenance/packages/resolve-url-loader/README.md) branch.

package.json

+4
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,9 @@
3939
},
4040
"engines": {
4141
"node": ">=8.9"
42+
},
43+
"resolutions": {
44+
"diff": "^3.5.0",
45+
"lodash": "^4.17.21"
4246
}
4347
}

packages/resolve-url-loader/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ When you use **fully relative paths** in `url()` statements then Webpack expects
4141

4242
To illustrate here are 3 simple examples of SASS and Webpack _without_ `resolve-url-loader`.
4343

44-
[![the basic problem](https://raw.githubusercontent.com/bholloway/resolve-url-loader/master/packages/resolve-url-loader/docs/basic-problem.svg)](docs/basic-problem.svg)
44+
[![the basic problem](https://raw.githubusercontent.com/bholloway/resolve-url-loader/v4-maintenance/packages/resolve-url-loader/docs/basic-problem.svg)](docs/basic-problem.svg)
4545

4646
The first 2 cases are trivial and work fine. The asset is specified in the root SCSS file and Webpack finds it.
4747

packages/resolve-url-loader/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"bugs": {
2626
"url": "https://github.com/bholloway/resolve-url-loader/issues"
2727
},
28-
"homepage": "https://github.com/bholloway/resolve-url-loader/tree/master/packages/resolve-url-loader",
28+
"homepage": "https://github.com/bholloway/resolve-url-loader/tree/v4-maintenance/packages/resolve-url-loader",
2929
"engines": {
3030
"node": ">=8.9"
3131
},

packages/test-my-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"micromatch": "^4.0.2",
3232
"mkdirp": "^0.5.1",
3333
"ms": "^2.1.2",
34-
"object-path-immutable": "^4.0.2",
34+
"object-path-immutable": "^4.1.1",
3535
"promise-compose": "^1.1.2",
3636
"recursive-readdir": "^2.2.2",
3737
"rimraf": "^3.0.0"

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,10 @@ lodash.get@^4.4.2:
662662
resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
663663
integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
664664

665-
lodash@~4.17.19:
666-
version "4.17.19"
667-
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
668-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
665+
lodash@^4.17.21, lodash@~4.17.19:
666+
version "4.17.21"
667+
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
668+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
669669

670670
lolex@^5.0.1, lolex@^5.1.2:
671671
version "5.1.2"

0 commit comments

Comments
 (0)