Release 0.2.10

creolingo · Mar 6, 2016 · 689ebcf · 689ebcf
1 parent fde2690
commit 689ebcf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "translate-maker-loader",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Locale loader module for webpack",
   "author": {
     "name": "Zlatko Fedor",

diff --git a/src/getLocalIdent.js b/src/getLocalIdent.js
@@ -1,6 +1,6 @@
 import dropRightWhile from 'lodash/dropRightWhile';
 import path from 'path';
-import { interpolateName, stringifyRequest } from 'loader-utils';
+import { interpolateName } from 'loader-utils';
 
 const LOCALE_DIRNAME = 'locale';
 
@@ -11,13 +11,18 @@ function getPath(filepath) {
   return dropRightWhile(parts, (part) => part === LOCALE_DIRNAME).join('/');
 }
 
-export default function getLocalIdent(context, filepath, type) {
+export default function getLocalIdent(loaderContext, filepath, type) {
   // ext is required in the interpolateName
-  const resourcePath = stringifyRequest(context, getPath(filepath) + '.js');
+  const context = loaderContext.options && typeof loaderContext.options.context === 'string'
+    ? loaderContext.options.context
+    : loaderContext.context;
+
+  const filePathJS = getPath(filepath) + '.js';
+  const resourcePath = path.relative(context, filePathJS);
 
   return interpolateName({
     resourcePath,
   }, type, {
-    content: filepath,
+    content: resourcePath,
   });
 }