Skip to content

Commit 78393f6

Browse files
committed
update branch references to v5
1 parent 8091b2d commit 78393f6

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

README.md

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

3-
We're working on **version 5** right now.
4-
* Update `node` to recent LTS.
5-
* Update `postcss` to latest (resolves security vulnerabilities).
6-
* Remove `rework` completely.
3+
The **version 5** is released. 🥳
74

8-
Install `resolve-url-loader@next` today! 🤓
5+
Install `resolve-url-loader@latest` in your project!
96

107
Read the [documentation](../v5/packages/resolve-url-loader/README.md).
118
Migrate using the [changelog](../v5/packages/resolve-url-loader/CHANGELOG.md).
129

1310
----
1411

15-
The **version 4** is released. 🥳
16-
17-
Install `resolve-url-loader@latest` in your project!
12+
The **version 4** is now maintenance only.
1813

19-
Read the [documentation](../v4-maintenance/packages/resolve-url-loader/README.md).
20-
Migrate using the [changelog](../v4-maintenance/packages/resolve-url-loader/CHANGELOG.md).
14+
Refer to [v4-maintenance](../v4-maintenance/packages/resolve-url-loader/README.md) branch.
2115

2216
----
2317

packages/resolve-url-loader/README.md

+10-11
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/v4-maintenance/packages/resolve-url-loader/docs/basic-problem.svg)](docs/basic-problem.svg)
44+
[![the basic problem](https://raw.githubusercontent.com/bholloway/resolve-url-loader/v5/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

@@ -99,8 +99,7 @@ rules: [
9999
}, {
100100
loader: 'sass-loader',
101101
options: {
102-
sourceMap: true,
103-
sourceMapContents: false
102+
sourceMap: true, // <-- !!IMPORTANT!!
104103
}
105104
}
106105
]
@@ -113,14 +112,14 @@ rules: [
113112

114113
The loader should work without options but use these as required.
115114

116-
| option | type | default | | description |
117-
|-------------|----------|-----------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
118-
| `sourceMap` | boolean | `false` | | Generate an outgoing source-map. |
119-
| `removeCR` | boolean | `true` Windows OS<br/>`false` otherwise | | Convert orphan CR to whitespace.<br/>See known issues below. |
120-
| `debug` | boolean | `false` | | Display debug information. |
121-
| `silent` | boolean | `false` | | Do **not** display warnings or deprecation messages. |
122-
| `root` | string | _unset_ | | Similar to the (now defunct) option in `css-loader`.<br/>This string, possibly empty, is prepended to absolute URIs.<br/>Absolute URIs are only processed if this option is set. |
123-
| `join` | function | _inbuilt_ | advanced | Custom join function.<br/>Use custom javascript to fix asset paths on a per-case basis.<br/>Refer to the [advanced features](docs/advanced-features.md) docs. |
115+
| option | type | default | | description |
116+
|-------------|----------|-----------------------------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
117+
| `sourceMap` | boolean | `false` | | Generate an outgoing source-map. |
118+
| `removeCR` | boolean | `true` Windows OS<br/>`false` otherwise | | Convert orphan CR to whitespace.<br/>See known issues below. |
119+
| `debug` | boolean | `false` | | Display debug information. |
120+
| `silent` | boolean | `false` | | Do **not** display warnings or deprecation messages. |
121+
| `root` | string | _unset_ | | Similar to the (now defunct) option in `css-loader`.<br/>This string, possibly empty, is prepended to absolute URIs.<br/>Absolute URIs are only processed if this option is set. |
122+
| `join` | function | _inbuilt_ | advanced | Custom join function.<br/>Use custom javascript to fix asset paths on a per-case basis.<br/>Refer to the [advanced features](docs/advanced-features.md) docs. |
124123

125124
## Limitations
126125

0 commit comments

Comments
 (0)