Using the new Laravel 9 path

kirschbaum-development · Mar 6, 2022 · 214851e · 214851e · sebastiaanluca · Mar 11, 2022
1 parent bb6b4ea
commit 214851e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/all.js b/all.js
@@ -1,3 +1,4 @@
+const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const phpLoader = require('./php-loader');
@@ -14,7 +15,11 @@ module.exports = function (indexContent) {
     } catch (e) { }
 
     if (path.dirname(this.resource).includes(path.dirname(loaderPath))) {
-        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang';
+
+        if (! fs.existsSync(baseDirectory)) {
+            baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        }
     } else {
         baseDirectory = path.dirname(this.resource);
     }

diff --git a/json.js b/json.js
@@ -13,7 +13,11 @@ module.exports = function (indexContent) {
     } catch (e) { }
 
     if (path.dirname(this.resource).includes(path.dirname(loaderPath))) {
-        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang';
+
+        if (! fs.existsSync(baseDirectory)) {
+            baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        }
     } else {
         baseDirectory = path.dirname(this.resource);
     }

diff --git a/php.js b/php.js
@@ -14,7 +14,11 @@ module.exports = function (indexContent) {
     } catch (e) { }
 
     if (path.dirname(this.resource).includes(path.dirname(loaderPath))) {
-        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'lang';
+
+        if (! fs.existsSync(baseDirectory)) {
+            baseDirectory = path.dirname(this.resource) + path.sep + '..' + path.sep + '..' + path.sep + '..' + path.sep + 'resources' + path.sep + 'lang';
+        }
     } else {
         baseDirectory = path.dirname(this.resource);
     }