Merge remote-tracking branch 'origin/master'

* origin/master: updated unittest initial commit
nWidart · Apr 13, 2020 · cf9df79 · cf9df79
2 parents c3c8997 + 4886efa
commit cf9df79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Commands/stubs/webpack.stub b/src/Commands/stubs/webpack.stub
@@ -1,3 +1,6 @@
+const dotenvExpand = require('dotenv-expand');
+dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/}));
+
 const mix = require('laravel-mix');
 require('laravel-mix-merge-manifest');
 
@@ -8,4 +11,4 @@ mix.js(__dirname + '/Resources/assets/js/app.js', 'js/$LOWER_NAME$.js')
 
 if (mix.inProduction()) {
     mix.version();
-}
+}
diff --git a/tests/Commands/__snapshots__/ModuleMakeCommandTest__it_generates_webpack_file__1.php b/tests/Commands/__snapshots__/ModuleMakeCommandTest__it_generates_webpack_file__1.php
@@ -1,4 +1,9 @@
-<?php return 'const mix = require(\'laravel-mix\');
+<?php
+
+return 'const dotenvExpand = require(\'dotenv-expand\');
+dotenvExpand(require(\'dotenv\').config({ path: \'../../.env\'/*, debug: true*/}));
+
+const mix = require(\'laravel-mix\');
 require(\'laravel-mix-merge-manifest\');
 
 mix.setPublicPath(\'../../public\').mergeManifest();
@@ -8,4 +13,5 @@
 
 if (mix.inProduction()) {
     mix.version();
-}';
+}
+';