diff options
Diffstat (limited to 'src/Loader.purs')
-rw-r--r-- | src/Loader.purs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Loader.purs b/src/Loader.purs index aae51c0..fedc424 100644 --- a/src/Loader.purs +++ b/src/Loader.purs | |||
@@ -26,7 +26,7 @@ import PursLoader.Glob (Glob(), glob) | |||
26 | import PursLoader.LoaderRef (LoaderRef(), Loader(), async, cacheable, clearDependencies, addDependency, query, resourcePath) | 26 | import PursLoader.LoaderRef (LoaderRef(), Loader(), async, cacheable, clearDependencies, addDependency, query, resourcePath) |
27 | import PursLoader.LoaderUtil (getRemainingRequest, parseQuery) | 27 | import PursLoader.LoaderUtil (getRemainingRequest, parseQuery) |
28 | import PursLoader.OS (eol) | 28 | import PursLoader.OS (eol) |
29 | import PursLoader.Options (pscMakeOptions, pscMakeDefaultOutput, pscMakeOutputOption) | 29 | import PursLoader.Options (loaderSrcOption, pscMakeOptions, pscMakeDefaultOutput, pscMakeOutputOption) |
30 | import PursLoader.Path (dirname, join, relative, resolve) | 30 | import PursLoader.Path (dirname, join, relative, resolve) |
31 | 31 | ||
32 | foreign import cwd "var cwd = process.cwd();" :: String | 32 | foreign import cwd "var cwd = process.cwd();" :: String |
@@ -43,8 +43,8 @@ indexFilename = "index.js" | |||
43 | 43 | ||
44 | (!!!) = flip (!!) | 44 | (!!!) = flip (!!) |
45 | 45 | ||
46 | pursPattern :: String -> String | 46 | pursPattern :: [String] -> String |
47 | pursPattern root = join [ "{" ++ joinWith "," [ bowerPattern, root ] ++ "}" | 47 | pursPattern srcs = join [ "{" ++ joinWith "," ([ bowerPattern ] <> srcs) ++ "}" |
48 | , "**" | 48 | , "**" |
49 | , "*.purs" | 49 | , "*.purs" |
50 | ] | 50 | ] |
@@ -86,10 +86,10 @@ loader' ref source = do | |||
86 | liftEff $ cacheable ref | 86 | liftEff $ cacheable ref |
87 | 87 | ||
88 | let request = getRemainingRequest ref | 88 | let request = getRemainingRequest ref |
89 | root = dirname $ relative cwd request | ||
90 | parsed = parseQuery $ query ref | 89 | parsed = parseQuery $ query ref |
90 | srcs = loaderSrcOption parsed | ||
91 | opts = pscMakeOptions parsed | 91 | opts = pscMakeOptions parsed |
92 | pattern = pursPattern root | 92 | pattern = pursPattern $ fromMaybe [] srcs |
93 | key = match moduleRegex source >>= (!!!) 1 | 93 | key = match moduleRegex source >>= (!!!) 1 |
94 | 94 | ||
95 | files <- glob pattern | 95 | files <- glob pattern |