|
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'; |
3 | 4 | import {
|
4 | 5 | TwingEnvironment,
|
5 | 6 | TwingLoaderArray,
|
6 | 7 | TwingLoaderChain,
|
7 | 8 | TwingNodeModule,
|
8 | 9 | TwingSource, TwingTokenStream
|
9 | 10 | } from 'twing';
|
10 |
| -import {Visitor} from "./visitor"; |
| 11 | +import { Visitor } from "./visitor"; |
11 | 12 |
|
12 | 13 | const sha256 = require('crypto-js/sha256');
|
13 | 14 | const hex = require('crypto-js/enc-hex');
|
@@ -56,7 +57,7 @@ export default function (this: loader.LoaderContext, source: string) {
|
56 | 57 | let environmentModulePath: string = options.environmentModulePath;
|
57 | 58 | let renderContext: any = options.renderContext;
|
58 | 59 |
|
59 |
| - this.addDependency(slash(environmentModulePath)); |
| 60 | + this.addDependency(resolve(slash(environmentModulePath))); |
60 | 61 |
|
61 | 62 | // require takes module name separated with forward slashes
|
62 | 63 | let environment: TwingEnvironment = require(slash(environmentModulePath));
|
@@ -114,7 +115,8 @@ module.exports = (context = {}) => {
|
114 | 115 | ]));
|
115 | 116 |
|
116 | 117 | 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())); |
118 | 120 | });
|
119 | 121 |
|
120 | 122 | environment.render(resourcePath, renderContext).then((result) => {
|
|
0 commit comments