|
1 | 1 | const { RawSource } = require("webpack-sources"); |
2 | 2 | const { getPackageJson } = require("../projectHelpers"); |
3 | | -const { SNAPSHOT_ENTRY_MODULE } = require("./NativeScriptSnapshotPlugin"); |
| 3 | +const { SNAPSHOT_ENTRY_NAME } = require("./NativeScriptSnapshotPlugin"); |
| 4 | + |
4 | 5 |
|
5 | 6 | exports.GenerateNativeScriptEntryPointsPlugin = (function () { |
| 7 | + const GenerationFailedError = "Unable to generate entry files."; |
| 8 | + |
6 | 9 | function GenerateNativeScriptEntryPointsPlugin(appEntryName) { |
7 | 10 | this.appEntryName = appEntryName; |
8 | 11 | this.files = {}; |
@@ -39,26 +42,39 @@ exports.GenerateNativeScriptEntryPointsPlugin = (function () { |
39 | 42 | } |
40 | 43 |
|
41 | 44 | GenerateNativeScriptEntryPointsPlugin.prototype.generateEntryFile = function (compilation, entryPoint) { |
42 | | - const entryPointFileName = `${entryPoint.options.name}.js`; |
43 | | - if (entryPointFileName === SNAPSHOT_ENTRY_MODULE) { |
| 45 | + const entryPointName = entryPoint.options.name; |
| 46 | + let entryChunk; |
| 47 | + if (entryPointName === SNAPSHOT_ENTRY_NAME) { |
44 | 48 | // Do not require the snapshot entry dependencies as the snapshot will fail. |
45 | 49 | return; |
46 | 50 | } |
47 | 51 |
|
48 | 52 | const requireDeps = |
49 | 53 | entryPoint.chunks.map(chunk => { |
50 | 54 | let requireChunkFiles = ""; |
51 | | - chunk.files.forEach(fileName => { |
52 | | - if (fileName !== entryPointFileName) { |
| 55 | + if (chunk.name === entryPointName) { |
| 56 | + entryChunk = chunk; |
| 57 | + } else { |
| 58 | + chunk.files.forEach(fileName => { |
53 | 59 | requireChunkFiles += `require("./${fileName}");`; |
54 | | - } |
55 | | - }); |
| 60 | + }); |
| 61 | + } |
56 | 62 |
|
57 | 63 | return requireChunkFiles; |
58 | | - }).join("\n"); |
| 64 | + }).join(""); |
| 65 | + |
| 66 | + if (!entryChunk) { |
| 67 | + throw new Error(`${GenerationFailedError} Entry chunk not found for entry "${entryPointName}".`); |
| 68 | + } |
| 69 | + |
| 70 | + entryChunk.files.forEach(fileName => { |
| 71 | + if (!compilation.assets[fileName]) { |
| 72 | + throw new Error(`${GenerationFailedError} File "${fileName}" not found for entry "${entryPointName}".`); |
| 73 | + } |
59 | 74 |
|
60 | | - const currentEntryPointContent = compilation.assets[entryPointFileName].source(); |
61 | | - compilation.assets[entryPointFileName] = new RawSource(`${requireDeps}${currentEntryPointContent}`); |
| 75 | + const currentEntryFileContent = compilation.assets[fileName].source(); |
| 76 | + compilation.assets[fileName] = new RawSource(`${requireDeps}${currentEntryFileContent}`); |
| 77 | + }); |
62 | 78 | } |
63 | 79 |
|
64 | 80 | GenerateNativeScriptEntryPointsPlugin.prototype.addAsset = function (compilation, name, content) { |
|
0 commit comments