Skip to content

Commit

Permalink
chore: bump enhanced-resolve version (#971)
Browse files Browse the repository at this point in the history
* fix: bump `enhanced-resolve` for upstream fix
* chore: bump enhanced-resolve version

---------

Co-authored-by: L Lllvvuu <git@llllvvuu.dev>
  • Loading branch information
43081j and llllvvuu committed May 29, 2024
1 parent bbd7b5b commit f029cf2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/tailwindcss-language-server/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ THE SOFTWARE.

================================================================================

enhanced-resolve-301@0.0.1
enhanced-resolve@5.15.0

Copyright JS Foundation and other contributors

Expand Down Expand Up @@ -1212,4 +1212,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion packages/tailwindcss-language-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
"deepmerge": "4.2.2",
"dlv": "1.1.3",
"dset": "3.1.2",
"enhanced-resolve-301": "0.0.1",
"esbuild": "^0.20.2",
"enhanced-resolve": "^5.16.1",
"fast-glob": "3.2.4",
"find-up": "5.0.0",
"is-builtin-module": "3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/tailwindcss-language-server/src/util/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ResolverFactory,
Resolver,
ResolveOptions,
} from 'enhanced-resolve-301'
} from 'enhanced-resolve'

export function createResolver(options: Partial<ResolveOptions> = {}): Resolver {
return ResolverFactory.createResolver({
Expand Down
3 changes: 1 addition & 2 deletions packages/tailwindcss-language-server/src/util/resolveFrom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ export default function resolveFrom(from?: string, id?: string): string {

let result = resolver.resolveSync({}, from, id)
if (result === false) throw Error()
// https://github.com/webpack/enhanced-resolve/issues/282
return result.replace(/\0#/g, '#')
return result
}

0 comments on commit f029cf2

Please sign in to comment.