From 2d47cf327b0193365a18aace2c7c823e5b09cf2d Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Thu, 1 Jul 2021 13:45:57 +0200 Subject: [PATCH] fix: don't exclude node_modules from worker processing --- .../configuration/__snapshots__/angular.spec.ts.snap | 12 ++++-------- .../configuration/__snapshots__/base.spec.ts.snap | 6 ------ .../__snapshots__/javascript.spec.ts.snap | 6 ------ .../configuration/__snapshots__/react.spec.ts.snap | 12 ------------ .../configuration/__snapshots__/svelte.spec.ts.snap | 6 ------ .../__snapshots__/typescript.spec.ts.snap | 6 ------ .../configuration/__snapshots__/vue.spec.ts.snap | 6 ------ packages/webpack5/src/configuration/base.ts | 2 -- 8 files changed, 4 insertions(+), 52 deletions(-) diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap index dfbf4011b..76cdb10fa 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap @@ -104,9 +104,6 @@ exports[`angular configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -358,7 +355,8 @@ exports[`angular configuration for android 1`] = ` /* config.plugin('AngularWebpackPlugin') */ new AngularWebpackPlugin( { - tsconfig: '__jest__/tsconfig.json' + tsconfig: '__jest__/tsconfig.json', + directTemplateLoading: false } ) ], @@ -477,9 +475,6 @@ exports[`angular configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -731,7 +726,8 @@ exports[`angular configuration for ios 1`] = ` /* config.plugin('AngularWebpackPlugin') */ new AngularWebpackPlugin( { - tsconfig: '__jest__/tsconfig.json' + tsconfig: '__jest__/tsconfig.json', + directTemplateLoading: false } ) ], diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap index e8082333b..584b94a3c 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap @@ -113,9 +113,6 @@ exports[`base configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -423,9 +420,6 @@ exports[`base configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap index 3f7484158..4135f11db 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap @@ -113,9 +113,6 @@ exports[`javascript configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -445,9 +442,6 @@ exports[`javascript configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap index d81be1944..e1e15a5f2 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap @@ -128,9 +128,6 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -449,9 +446,6 @@ exports[`react configuration > android > base config 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -770,9 +764,6 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -1092,9 +1083,6 @@ exports[`react configuration > ios > base config 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap index 167912318..2066d45fa 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap @@ -115,9 +115,6 @@ exports[`svelte configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -444,9 +441,6 @@ exports[`svelte configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap index a345c07c9..d1634f7e5 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap @@ -113,9 +113,6 @@ exports[`typescript configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -445,9 +442,6 @@ exports[`typescript configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap index 2eac51a40..fa67cedf2 100644 --- a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap +++ b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap @@ -119,9 +119,6 @@ exports[`vue configuration for android 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { @@ -455,9 +452,6 @@ exports[`vue configuration for ios 1`] = ` /* config.module.rule('workers') */ { test: /\\\\.(js|ts)$/, - exclude: [ - /node_modules/ - ], use: [ /* config.module.rule('workers').use('nativescript-worker-loader') */ { diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts index b7e44ec99..8e9408ef2 100644 --- a/packages/webpack5/src/configuration/base.ts +++ b/packages/webpack5/src/configuration/base.ts @@ -250,8 +250,6 @@ export default function (config: Config, env: IWebpackEnv = _env): Config { config.module .rule('workers') .test(/\.(js|ts)$/) - .exclude.add(/node_modules/) - .end() .use('nativescript-worker-loader') .loader('nativescript-worker-loader');