Skip to content

Commit d5f468a

Browse files
committed
fix gradle check
1 parent 04f75cd commit d5f468a

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-update-cli",
3-
"version": "1.30.4",
3+
"version": "1.31.0",
44
"description": "Command tools for javaScript updater with `pushy` service for react native apps.",
55
"main": "index.js",
66
"bin": {

src/bundle.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async function runReactNativeBundleCommand(
3333
gradleConfig = await checkGradleConfig();
3434
if (gradleConfig.crunchPngs !== false) {
3535
console.warn(
36-
'android的crunchPngs选项似乎尚未禁用(如已禁用则请忽略此提示),这可能导致热更包体积异常增大,具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
36+
'android 的 crunchPngs 选项似乎尚未禁用(如已禁用则请忽略此提示),这可能导致热更包体积异常增大,具体请参考 https://pushy.reactnative.cn/docs/getting-started.html#%E7%A6%81%E7%94%A8-android-%E7%9A%84-crunch-%E4%BC%98%E5%8C%96 \n',
3737
);
3838
}
3939
}
@@ -177,17 +177,19 @@ async function checkGradleConfig() {
177177
let crunchPngs;
178178
try {
179179
const gradleConfig = await g2js.parseFile('android/app/build.gradle');
180+
crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
180181
const projectConfig = gradleConfig['project.ext.react'];
181-
for (const packagerConfig of projectConfig) {
182-
if (
183-
packagerConfig.includes('enableHermes') &&
184-
packagerConfig.includes('true')
185-
) {
186-
enableHermes = true;
187-
break;
182+
if (projectConfig) {
183+
for (const packagerConfig of projectConfig) {
184+
if (
185+
packagerConfig.includes('enableHermes') &&
186+
packagerConfig.includes('true')
187+
) {
188+
enableHermes = true;
189+
break;
190+
}
188191
}
189192
}
190-
crunchPngs = gradleConfig.android.buildTypes.release.crunchPngs;
191193
} catch (e) {}
192194
return {
193195
enableHermes,
@@ -609,7 +611,6 @@ export const commands = {
609611
const { version, major, minor } = getRNVersion();
610612

611613
console.log('Bundling with react-native: ', version);
612-
printVersionCommand();
613614

614615
await runReactNativeBundleCommand(
615616
bundleName,

src/versions.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ export const commands = {
134134
let minPkgVersion = options.minPackageVersion;
135135
let maxPkgVersion = options.maxPackageVersion;
136136
let rollout = options.rollout;
137-
if (rollout !== undefined) {
137+
if (rollout === undefined) {
138+
rollout = null;
139+
} else {
138140
try {
139141
rollout = parseInt(rollout);
140142
} catch (e) {

0 commit comments

Comments
 (0)