Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

fix: fix module import of local css files #1099

Merged
merged 1 commit into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css2json-loader.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions css2json-loader.ts
Original file line number Diff line number Diff line change
@@ -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\(([^\)]+)\)/;
Expand Down Expand Up @@ -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)
};
}

Expand Down