Skip to content

Commit 05082b1

Browse files
edusperonirigor789
edusperoni
and
rigor789
authored
fix(webpack5): include hmr handling only when enabled (#9685)
* fix(webpack): respect hmr flag * fix(webpack): ensure correct loader order is used * chore: cleanup Co-authored-by: Igor Randjelovic <rigor789@gmail.com>
1 parent 57eac49 commit 05082b1

File tree

10 files changed

+190
-344
lines changed

10 files changed

+190
-344
lines changed

‎packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,9 @@ exports[`angular configuration for android 1`] = `
8484
options: {
8585
platform: 'android'
8686
}
87-
},
88-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
89-
{
90-
loader: 'nativescript-hot-loader',
91-
options: {
92-
injectHMRRuntime: true
93-
}
9487
}
9588
]
9689
},
97-
/* config.module.rule('js') */
98-
{
99-
test: /\\\\.js$/,
100-
exclude: [
101-
/node_modules/
102-
]
103-
},
10490
/* config.module.rule('workers') */
10591
{
10692
test: /\\\\.(js|ts)$/,
@@ -111,6 +97,13 @@ exports[`angular configuration for android 1`] = `
11197
}
11298
]
11399
},
100+
/* config.module.rule('js') */
101+
{
102+
test: /\\\\.js$/,
103+
exclude: [
104+
/node_modules/
105+
]
106+
},
114107
/* config.module.rule('xml') */
115108
{
116109
test: /\\\\.xml$/,
@@ -472,23 +465,9 @@ exports[`angular configuration for ios 1`] = `
472465
options: {
473466
platform: 'ios'
474467
}
475-
},
476-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
477-
{
478-
loader: 'nativescript-hot-loader',
479-
options: {
480-
injectHMRRuntime: true
481-
}
482468
}
483469
]
484470
},
485-
/* config.module.rule('js') */
486-
{
487-
test: /\\\\.js$/,
488-
exclude: [
489-
/node_modules/
490-
]
491-
},
492471
/* config.module.rule('workers') */
493472
{
494473
test: /\\\\.(js|ts)$/,
@@ -499,6 +478,13 @@ exports[`angular configuration for ios 1`] = `
499478
}
500479
]
501480
},
481+
/* config.module.rule('js') */
482+
{
483+
test: /\\\\.js$/,
484+
exclude: [
485+
/node_modules/
486+
]
487+
},
502488
/* config.module.rule('xml') */
503489
{
504490
test: /\\\\.xml$/,

‎packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ exports[`base configuration for android 1`] = `
7272
options: {
7373
platform: 'android'
7474
}
75-
},
76-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
75+
}
76+
]
77+
},
78+
/* config.module.rule('workers') */
79+
{
80+
test: /\\\\.(js|ts)$/,
81+
use: [
82+
/* config.module.rule('workers').use('nativescript-worker-loader') */
7783
{
78-
loader: 'nativescript-hot-loader',
79-
options: {
80-
injectHMRRuntime: true
81-
}
84+
loader: 'nativescript-worker-loader'
8285
}
8386
]
8487
},
@@ -110,16 +113,6 @@ exports[`base configuration for android 1`] = `
110113
/node_modules/
111114
]
112115
},
113-
/* config.module.rule('workers') */
114-
{
115-
test: /\\\\.(js|ts)$/,
116-
use: [
117-
/* config.module.rule('workers').use('nativescript-worker-loader') */
118-
{
119-
loader: 'nativescript-worker-loader'
120-
}
121-
]
122-
},
123116
/* config.module.rule('xml') */
124117
{
125118
test: /\\\\.xml$/,
@@ -383,13 +376,16 @@ exports[`base configuration for ios 1`] = `
383376
options: {
384377
platform: 'ios'
385378
}
386-
},
387-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
379+
}
380+
]
381+
},
382+
/* config.module.rule('workers') */
383+
{
384+
test: /\\\\.(js|ts)$/,
385+
use: [
386+
/* config.module.rule('workers').use('nativescript-worker-loader') */
388387
{
389-
loader: 'nativescript-hot-loader',
390-
options: {
391-
injectHMRRuntime: true
392-
}
388+
loader: 'nativescript-worker-loader'
393389
}
394390
]
395391
},
@@ -421,16 +417,6 @@ exports[`base configuration for ios 1`] = `
421417
/node_modules/
422418
]
423419
},
424-
/* config.module.rule('workers') */
425-
{
426-
test: /\\\\.(js|ts)$/,
427-
use: [
428-
/* config.module.rule('workers').use('nativescript-worker-loader') */
429-
{
430-
loader: 'nativescript-worker-loader'
431-
}
432-
]
433-
},
434420
/* config.module.rule('xml') */
435421
{
436422
test: /\\\\.xml$/,

‎packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap‎

Lines changed: 18 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ exports[`javascript configuration for android 1`] = `
7272
options: {
7373
platform: 'android'
7474
}
75-
},
76-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
75+
}
76+
]
77+
},
78+
/* config.module.rule('workers') */
79+
{
80+
test: /\\\\.(js|ts)$/,
81+
use: [
82+
/* config.module.rule('workers').use('nativescript-worker-loader') */
7783
{
78-
loader: 'nativescript-hot-loader',
79-
options: {
80-
injectHMRRuntime: true
81-
}
84+
loader: 'nativescript-worker-loader'
8285
}
8386
]
8487
},
@@ -110,16 +113,6 @@ exports[`javascript configuration for android 1`] = `
110113
/node_modules/
111114
]
112115
},
113-
/* config.module.rule('workers') */
114-
{
115-
test: /\\\\.(js|ts)$/,
116-
use: [
117-
/* config.module.rule('workers').use('nativescript-worker-loader') */
118-
{
119-
loader: 'nativescript-worker-loader'
120-
}
121-
]
122-
},
123116
/* config.module.rule('xml') */
124117
{
125118
test: /\\\\.xml$/,
@@ -183,23 +176,6 @@ exports[`javascript configuration for android 1`] = `
183176
loader: 'sass-loader'
184177
}
185178
]
186-
},
187-
/* config.module.rule('hmr-core') */
188-
{
189-
test: /\\\\.js$/,
190-
exclude: [
191-
/node_modules/,
192-
'__jest__/src/app.js'
193-
],
194-
use: [
195-
/* config.module.rule('hmr-core').use('nativescript-hot-loader') */
196-
{
197-
loader: 'nativescript-hot-loader',
198-
options: {
199-
appPath: '__jest__/src'
200-
}
201-
}
202-
]
203179
}
204180
]
205181
},
@@ -409,13 +385,16 @@ exports[`javascript configuration for ios 1`] = `
409385
options: {
410386
platform: 'ios'
411387
}
412-
},
413-
/* config.module.rule('bundle').use('nativescript-hot-loader') */
388+
}
389+
]
390+
},
391+
/* config.module.rule('workers') */
392+
{
393+
test: /\\\\.(js|ts)$/,
394+
use: [
395+
/* config.module.rule('workers').use('nativescript-worker-loader') */
414396
{
415-
loader: 'nativescript-hot-loader',
416-
options: {
417-
injectHMRRuntime: true
418-
}
397+
loader: 'nativescript-worker-loader'
419398
}
420399
]
421400
},
@@ -447,16 +426,6 @@ exports[`javascript configuration for ios 1`] = `
447426
/node_modules/
448427
]
449428
},
450-
/* config.module.rule('workers') */
451-
{
452-
test: /\\\\.(js|ts)$/,
453-
use: [
454-
/* config.module.rule('workers').use('nativescript-worker-loader') */
455-
{
456-
loader: 'nativescript-worker-loader'
457-
}
458-
]
459-
},
460429
/* config.module.rule('xml') */
461430
{
462431
test: /\\\\.xml$/,
@@ -520,23 +489,6 @@ exports[`javascript configuration for ios 1`] = `
520489
loader: 'sass-loader'
521490
}
522491
]
523-
},
524-
/* config.module.rule('hmr-core') */
525-
{
526-
test: /\\\\.js$/,
527-
exclude: [
528-
/node_modules/,
529-
'__jest__/src/app.js'
530-
],
531-
use: [
532-
/* config.module.rule('hmr-core').use('nativescript-hot-loader') */
533-
{
534-
loader: 'nativescript-hot-loader',
535-
options: {
536-
appPath: '__jest__/src'
537-
}
538-
}
539-
]
540492
}
541493
]
542494
},

0 commit comments

Comments
 (0)