Skip to content

Commit 014e65e

Browse files
sokrasokra
committed
rename webpackPrefetchPriority to webpackPrefetch
rename webpackPreloadPriority to webpackPreload allow true as parameter (equals 0)
1 parent 9cb1a66 commit 014e65e

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

‎lib/dependencies/ImportParserPlugin.js‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,36 @@ class ImportParserPlugin {
6161
mode = importOptions.webpackMode;
6262
}
6363
}
64-
if (typeof importOptions.webpackPrefetchPriority !== "undefined") {
65-
if (typeof importOptions.webpackPrefetchPriority !== "number") {
64+
if (typeof importOptions.webpackPrefetch !== "undefined") {
65+
if (importOptions.webpackPrefetch === true) {
66+
groupOptions.prefetchPriority = 0;
67+
} else if (typeof importOptions.webpackPrefetch === "number") {
68+
groupOptions.prefetchPriority = importOptions.webpackPrefetch;
69+
} else {
6670
parser.state.module.warnings.push(
6771
new UnsupportedFeatureWarning(
6872
parser.state.module,
69-
`\`webpackPrefetchPriority\` expected a number, but received: ${
70-
importOptions.webpackPrefetchPriority
73+
`\`webpackPrefetch\` expected true or a number, but received: ${
74+
importOptions.webpackPrefetch
7175
}.`
7276
)
7377
);
74-
} else {
75-
groupOptions.prefetchPriority =
76-
importOptions.webpackPrefetchPriority;
7778
}
7879
}
79-
if (typeof importOptions.webpackPreloadPriority !== "undefined") {
80-
if (typeof importOptions.webpackPreloadPriority !== "number") {
80+
if (typeof importOptions.webpackPreload !== "undefined") {
81+
if (importOptions.webpackPreload === true) {
82+
groupOptions.preloadPriority = 0;
83+
} else if (typeof importOptions.webpackPreload === "number") {
84+
groupOptions.preloadPriority = importOptions.webpackPreload;
85+
} else {
8186
parser.state.module.warnings.push(
8287
new UnsupportedFeatureWarning(
8388
parser.state.module,
84-
`\`webpackPreloadPriority\` expected a number, but received: ${
85-
importOptions.webpackPreloadPriority
89+
`\`webpackPreload\` expected true or a number, but received: ${
90+
importOptions.webpackPreload
8691
}.`
8792
)
8893
);
89-
} else {
90-
groupOptions.preloadPriority = importOptions.webpackPreloadPriority;
9194
}
9295
}
9396
if (typeof importOptions.webpackInclude !== "undefined") {

‎test/statsCases/prefetch/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import "./with-nested";
2-
import(/* webpackPrefetchPriority: 1, webpackChunkName: "prefetched" */ "./prefetched");
2+
import(/* webpackPrefetch: 1, webpackChunkName: "prefetched" */ "./prefetched");
33
setTimeout(() => {
44
import(/* webpackChunkName: "normal" */"./normal");
55
}, 500);

‎test/statsCases/prefetch/prefetched.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setTimeout(() => {
2-
import(/* webpackPrefetchPriority: 10, webpackChunkName: "inner" */"./inner");
3-
import(/* webpackPrefetchPriority: 20, webpackChunkName: "inner2" */"./inner2");
2+
import(/* webpackPrefetch: 10, webpackChunkName: "inner" */"./inner");
3+
import(/* webpackPrefetch: 20, webpackChunkName: "inner2" */"./inner2");
44
import(/* webpackChunkName: "inner2" */"./inner3");
55
}, 5000);

‎test/statsCases/prefetch/with-nested.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import(/* webpackPrefetchPriority: -20, webpackChunkName: "prefetched2" */"./prefetched2");
2-
import(/* webpackPrefetchPriority: 3, webpackChunkName: "prefetched2" */"./prefetched2");
3-
import(/* webpackPrefetchPriority: -10, webpackChunkName: "prefetched3" */"./prefetched3");
1+
import(/* webpackPrefetch: -20, webpackChunkName: "prefetched2" */"./prefetched2");
2+
import(/* webpackPrefetch: 3, webpackChunkName: "prefetched2" */"./prefetched2");
3+
import(/* webpackPrefetch: -10, webpackChunkName: "prefetched3" */"./prefetched3");

‎test/statsCases/preload/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import "./with-nested";
2-
import(/* webpackPreloadPriority: 1, webpackChunkName: "preloaded" */ "./preloaded");
2+
import(/* webpackPreload: 1, webpackChunkName: "preloaded" */ "./preloaded");
33
setTimeout(() => {
44
import(/* webpackChunkName: "normal" */"./normal");
55
}, 500);

‎test/statsCases/preload/preloaded.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setTimeout(() => {
2-
import(/* webpackPreloadPriority: 10, webpackChunkName: "inner" */"./inner");
3-
import(/* webpackPreloadPriority: 20, webpackChunkName: "inner2" */"./inner2");
2+
import(/* webpackPreload: 10, webpackChunkName: "inner" */"./inner");
3+
import(/* webpackPreload: 20, webpackChunkName: "inner2" */"./inner2");
44
import(/* webpackChunkName: "inner2" */"./inner3");
55
}, 5000);

‎test/statsCases/preload/with-nested.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import(/* webpackPreloadPriority: -20, webpackChunkName: "preloaded2" */"./preloaded2");
2-
import(/* webpackPreloadPriority: 3, webpackChunkName: "preloaded2" */"./preloaded2");
3-
import(/* webpackPreloadPriority: -10, webpackChunkName: "preloaded3" */"./preloaded3");
1+
import(/* webpackPreload: -20, webpackChunkName: "preloaded2" */"./preloaded2");
2+
import(/* webpackPreload: 3, webpackChunkName: "preloaded2" */"./preloaded2");
3+
import(/* webpackPreload: -10, webpackChunkName: "preloaded3" */"./preloaded3");

0 commit comments

Comments
 (0)