From 038ca9e937ae699d1a8d5a050c98c8731e7d947d Mon Sep 17 00:00:00 2001
From: Oliver Fabel <Oliver.Fabel@bsi-software.com>
Date: Mon, 21 Jun 2021 07:22:41 +0200
Subject: [PATCH] fix issue #30

---
 src/index.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index ee13306..9dc9a52 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,6 @@
-import {getOptions} from 'loader-utils';
-import {loader} from 'webpack';
+import { getOptions } from 'loader-utils';
+import { resolve } from 'path';
+import { loader } from 'webpack';
 import {
     TwingEnvironment,
     TwingLoaderArray,
@@ -7,7 +8,7 @@ import {
     TwingNodeModule,
     TwingSource, TwingTokenStream
 } from 'twing';
-import {Visitor} from "./visitor";
+import { Visitor } from "./visitor";
 
 const sha256 = require('crypto-js/sha256');
 const hex = require('crypto-js/enc-hex');
@@ -56,7 +57,7 @@ export default function (this: loader.LoaderContext, source: string) {
     let environmentModulePath: string = options.environmentModulePath;
     let renderContext: any = options.renderContext;
 
-    this.addDependency(slash(environmentModulePath));
+    this.addDependency(resolve(slash(environmentModulePath)));
 
     // require takes module name separated with forward slashes
     let environment: TwingEnvironment = require(slash(environmentModulePath));
@@ -114,7 +115,8 @@ module.exports = (context = {}) => {
         ]));
 
         environment.on('template', async (name: string, from: TwingSource) => {
-            this.addDependency(await environment.getLoader().resolve(name, from));
+            let sourceContext = await environment.getLoader().getSourceContext(name, from);
+            this.addDependency(resolve(sourceContext.getResolvedName()));
         });
 
         environment.render(resourcePath, renderContext).then((result) => {