Skip to content

Commit 26dc038

Browse files
authored
Merge pull request #1 from ofabel/bugfix/issue_30
fix issue NightlyCommit#30
2 parents f5fffa8 + 038ca9e commit 26dc038

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/index.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import {getOptions} from 'loader-utils';
2-
import {loader} from 'webpack';
1+
import { getOptions } from 'loader-utils';
2+
import { resolve } from 'path';
3+
import { loader } from 'webpack';
34
import {
45
TwingEnvironment,
56
TwingLoaderArray,
67
TwingLoaderChain,
78
TwingNodeModule,
89
TwingSource, TwingTokenStream
910
} from 'twing';
10-
import {Visitor} from "./visitor";
11+
import { Visitor } from "./visitor";
1112

1213
const sha256 = require('crypto-js/sha256');
1314
const hex = require('crypto-js/enc-hex');
@@ -56,7 +57,7 @@ export default function (this: loader.LoaderContext, source: string) {
5657
let environmentModulePath: string = options.environmentModulePath;
5758
let renderContext: any = options.renderContext;
5859

59-
this.addDependency(slash(environmentModulePath));
60+
this.addDependency(resolve(slash(environmentModulePath)));
6061

6162
// require takes module name separated with forward slashes
6263
let environment: TwingEnvironment = require(slash(environmentModulePath));
@@ -114,7 +115,8 @@ module.exports = (context = {}) => {
114115
]));
115116

116117
environment.on('template', async (name: string, from: TwingSource) => {
117-
this.addDependency(await environment.getLoader().resolve(name, from));
118+
let sourceContext = await environment.getLoader().getSourceContext(name, from);
119+
this.addDependency(resolve(sourceContext.getResolvedName()));
118120
});
119121

120122
environment.render(resourcePath, renderContext).then((result) => {

0 commit comments

Comments
 (0)