Catch not found errors in combine/scripts/styles

Fixes laravel-mix#3052
thecrypticace · Oct 10, 2021 · be946e7 · be946e7
1 parent c539c01
commit be946e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/src/webpackPlugins/CustomTasksPlugin.js b/src/webpackPlugins/CustomTasksPlugin.js
@@ -16,23 +16,22 @@ class CustomTasksPlugin {
      * @param {import("webpack").Compiler} compiler
      */
     apply(compiler) {
-        compiler.hooks.done.tapAsync(this.constructor.name, (stats, callback) => {
-            this.runTasks(stats).then(async () => {
-                if (this.mix.components.get('version') && !this.mix.isUsing('hmr')) {
-                    this.applyVersioning();
-                }
-
-                if (this.mix.inProduction()) {
-                    await this.minifyAssets();
-                }
-
-                if (this.mix.isWatching()) {
-                    this.mix.tasks.forEach(task => task.watch(this.mix.isPolling()));
-                }
-
-                this.mix.manifest.refresh();
-                callback();
-            });
+        compiler.hooks.done.tapPromise(this.constructor.name, async stats => {
+            await this.runTasks(stats);
+
+            if (this.mix.components.get('version') && !this.mix.isUsing('hmr')) {
+                this.applyVersioning();
+            }
+
+            if (this.mix.inProduction()) {
+                await this.minifyAssets();
+            }
+
+            if (this.mix.isWatching()) {
+                this.mix.tasks.forEach(task => task.watch(this.mix.isPolling()));
+            }
+
+            this.mix.manifest.refresh();
         });
     }
 

diff --git a/test/features/combine.js b/test/features/combine.js
@@ -166,3 +166,12 @@ test('it can concat files produced by the build', async t => {
         t
     );
 });
+
+test('combine with missing files throws an error', async t => {
+    mix.combine(
+        [`test/fixtures/app/src/css/i-do-not-exist.css`],
+        `test/fixtures/app/dist/all.css`
+    );
+
+    await t.throwsAsync(() => webpack.compile(), { code: 'ENOENT' });
+});