diff --git a/css2json-loader.spec.ts b/css2json-loader.spec.ts index 76ce79e3..b5229cd8 100644 --- a/css2json-loader.spec.ts +++ b/css2json-loader.spec.ts @@ -38,7 +38,7 @@ describe("css2jsonLoader", () => { const loaderContext = { callback: (error, source: string, map) => { - expect(source).toContain(`global.registerModule("custom.css", () => require("custom.css"))`); + expect(source).toContain(`global.registerModule("./custom.css", () => require("./custom.css"))`); expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`); done(); @@ -52,7 +52,7 @@ describe("css2jsonLoader", () => { it("inlines css2json loader in imports if option is provided", (done) => { const loaderContext = { callback: (error, source: string, map) => { - expect(source).toContain(`global.registerModule("custom.css", () => require("!nativescript-dev-webpack/css2json-loader?useForImports!custom.css"))`); + expect(source).toContain(`global.registerModule("./custom.css", () => require("!nativescript-dev-webpack/css2json-loader?useForImports!./custom.css"))`); expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`); done(); diff --git a/css2json-loader.ts b/css2json-loader.ts index 545e349c..19f75bfa 100644 --- a/css2json-loader.ts +++ b/css2json-loader.ts @@ -1,6 +1,6 @@ import { parse, Import, Stylesheet } from "css"; import { loader } from "webpack"; -import { getOptions } from "loader-utils"; +import { getOptions, urlToRequest } from "loader-utils"; const betweenQuotesPattern = /('|")(.*?)\1/; const unpackUrlPattern = /url\(([^\)]+)\)/; @@ -53,7 +53,7 @@ function extractUrlFromRule(importRule: Import): string { function createRequireUri(uri): { uri: string, requireURI: string } { return { uri: uri, - requireURI: uri[0] === "~" && uri[1] !== "/" ? uri.substr(1) : uri + requireURI: urlToRequest(uri) }; }