Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 8e33558

Browse files
authored
Merge pull request #10 from kirschbaum-development/windows-path-separator
Fixed path separator for windows envs
2 parents b9e7e1e + 4d4d4a2 commit 8e33558

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

all.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ const loaderUtils = require('loader-utils');
66
module.exports = function (indexContent) {
77
let options = {};
88
let baseDirectory;
9+
let loaderPath = 'node_modules' + path.sep + '@kirschbaum-development' + path.sep + 'laravel-translations-loader' + path.sep + 'all.js';
910

1011
try {
1112
options = loaderUtils.parseQuery(this.query);
1213
} catch (e) { }
1314

14-
if (path.dirname(this.resource).includes(path.dirname('node_modules/@kirschbaum-development/laravel-translations-loader/all.js'))) {
15-
baseDirectory = path.dirname(this.resource) + "/../../../resources/lang";
15+
if (path.dirname(this.resource).includes(loaderPath)) {
16+
baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
1617
} else {
1718
baseDirectory = path.dirname(this.resource);
1819
}

json.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ const jsonLoader = require('./json-loader');
66
module.exports = function (indexContent) {
77
let options = {};
88
let baseDirectory;
9+
let loaderPath = 'node_modules' + path.sep + '@kirschbaum-development' + path.sep + 'laravel-translations-loader' + path.sep + 'json.js';
910

1011
try {
1112
options = loaderUtils.parseQuery(this.query);
1213
} catch (e) { }
1314

14-
if (path.dirname(this.resource).includes(path.dirname('node_modules/@kirschbaum-development/laravel-translations-loader/json.js'))) {
15-
baseDirectory = path.dirname(this.resource) + "/../../../resources/lang";
15+
if (path.dirname(this.resource).includes(loaderPath)) {
16+
baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
1617
} else {
1718
baseDirectory = path.dirname(this.resource);
1819
}

php.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ const loaderUtils = require('loader-utils');
77
module.exports = function (indexContent) {
88
let options = {};
99
let baseDirectory;
10+
let loaderPath = 'node_modules' + path.sep + '@kirschbaum-development' + path.sep + 'laravel-translations-loader' + path.sep + 'php.js';
1011

1112
try {
1213
options = loaderUtils.parseQuery(this.query);
1314
} catch (e) { }
1415

15-
if (path.dirname(this.resource).includes(path.dirname('node_modules/@kirschbaum-development/laravel-translations-loader/php.js'))) {
16-
baseDirectory = path.dirname(this.resource) + "/../../../resources/lang";
16+
if (path.dirname(this.resource).includes(path.dirname(loaderPath))) {
17+
baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
1718
} else {
1819
baseDirectory = path.dirname(this.resource);
1920
}

0 commit comments

Comments
 (0)