Skip to content

Commit 610a791

Browse files
committed
Don't crash the webpack hook on ios.
1 parent 01ad066 commit 610a791

File tree

2 files changed

+34
-7
lines changed

2 files changed

+34
-7
lines changed

ng-sample/hooks/after-prepare/webpack.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
77
process.env.PROJECT_DIR = outDir;
88

99
var gradleScript = path.join(outDir, "../../../", "build.gradle");
10-
shelljs.sed("-i", /aaptOptions.*\{[^\}]+\}/, "", gradleScript);
10+
var hasGradle = shelljs.test("-e", gradleScript);
11+
12+
if (hasGradle) {
13+
//clean up any previous settings
14+
shelljs.sed("-i", /aaptOptions.*\{[^\}]+\}/, "", gradleScript);
15+
}
1116

1217
if (!process.env.WEBPACK_BUILD) {
1318
console.log('Not webpacking...');
@@ -24,7 +29,9 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
2429
var packageJson = path.join(outDir, "app", "starter.js");
2530
shelljs.sed("-i", /require.*app\.js.*;/, "require('./index.js');", packageJson);
2631

27-
shelljs.sed("-i", /^android\s+\{/m, 'android {\n\taaptOptions { ignoreAssetsPattern "<dir>tns_modules" }', gradleScript);
32+
if (hasGradle) {
33+
shelljs.sed("-i", /^android\s+\{/m, 'android {\n\taaptOptions { ignoreAssetsPattern "<dir>tns_modules" }', gradleScript);
34+
}
2835

2936
resolve();
3037
} else {

startup-test/hooks/after-prepare/webpack.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,34 @@ var shelljs = require("shelljs");
44
module.exports = function (logger, platformsData, projectData, hookArgs) {
55
var platformData = platformsData.getPlatformData(hookArgs.platform.toLowerCase());
66
var outDir = platformData.appDestinationDirectoryPath;
7-
console.log('outDir: ' + outDir);
8-
console.log('pwd: ' + shelljs.pwd());
7+
process.env.PROJECT_DIR = outDir;
8+
9+
var gradleScript = path.join(outDir, "../../../", "build.gradle");
10+
var hasGradle = shelljs.test("-e", gradleScript);
11+
12+
if (hasGradle) {
13+
//clean up any previous settings
14+
shelljs.sed("-i", /aaptOptions.*\{[^\}]+\}/, "", gradleScript);
15+
}
16+
17+
if (!process.env.WEBPACK_BUILD) {
18+
console.log('Not webpacking...');
19+
return;
20+
}
921

1022
return new Promise(function (resolve, reject) {
1123
return shelljs.exec("webpack", function(code, output) {
12-
if (code == 0) {
24+
if (code === 0) {
1325
//shelljs.rm("-rf", path.join(outDir, "app", "*"))
14-
shelljs.mv("bundle.js", path.join(outDir, "app", "index.js"))
26+
shelljs.rm("-rf", path.join(outDir, "app", "main-page*"));
27+
shelljs.mv("bundle.js", path.join(outDir, "app", "index.js"));
28+
29+
var packageJson = path.join(outDir, "app", "starter.js");
30+
shelljs.sed("-i", /require.*app\.js.*;/, "require('./index.js');", packageJson);
31+
32+
if (hasGradle) {
33+
shelljs.sed("-i", /^android\s+\{/m, 'android {\n\taaptOptions { ignoreAssetsPattern "<dir>tns_modules" }', gradleScript);
34+
}
1535

1636
resolve();
1737
} else {
@@ -20,4 +40,4 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
2040
}
2141
});
2242
});
23-
}
43+
};

0 commit comments

Comments
 (0)