Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit b76ab7f

Browse files
committed
refactor: use semver for version checks
1 parent 9b2a22c commit b76ab7f

File tree

4 files changed

+14
-41
lines changed

4 files changed

+14
-41
lines changed

‎index.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const path = require("path");
22
const { existsSync } = require("fs");
33

44
const { getPackageJson, isAngular } = require("./projectHelpers");
5-
const { sanitize } = require("./utils");
65

76
const PROJECT_DIR = path.dirname(path.dirname(__dirname));
87
const APP_DIR = path.join(PROJECT_DIR, "app");
@@ -38,6 +37,11 @@ exports.getAppPath = platform => {
3837
}
3938
};
4039

40+
const sanitize = name => name
41+
.split("")
42+
.filter(char => /[a-zA-Z0-9]/.test(char))
43+
.join("");
44+
4145
function getPackageJsonEntry() {
4246
const packageJsonSource = getPackageJson(APP_DIR);
4347
const entry = packageJsonSource.main;

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"generate-android-snapshot": "./bin/generate-android-snapshot"
2727
},
2828
"dependencies": {
29+
"semver": "^5.4.1",
2930
"shelljs": "^0.6.0"
3031
},
3132
"devDependencies": {}

‎snapshot/android/project-snapshot-generator.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
const { join, isAbsolute, resolve } = require("path");
22
const fs = require("fs");
3-
const shelljs = require("shelljs");
43
const os = require("os");
54

5+
const shelljs = require("shelljs");
6+
const semver = require("semver");
7+
68
const SnapshotGenerator = require("./snapshot-generator");
79
const TnsJavaClassesGenerator = require("./tns-java-classes-generator");
8-
const { isVersionGte } = require("../../utils");
910
const { getPackageJson } = require("../../projectHelpers");
1011

1112
const MIN_ANDROID_RUNTIME_VERSION = "3.0.0";
@@ -102,12 +103,13 @@ ProjectSnapshotGenerator.prototype.getV8Version = function() {
102103
return;
103104
} else if (
104105
VALID_ANDROID_RUNTIME_TAGS.includes(runtimeVersion) ||
105-
isVersionGte(runtimeVersion, "3.1.0")
106+
107+
semver.gte(runtimeVersion, "3.1.0")
106108
) {
107109
return "5.5.372";
108-
} else if (isVersionGte(runtimeVersion, "2.4.0")) {
110+
} else if (semver.gte(runtimeVersion, "2.4.0")) {
109111
return "5.2.361";
110-
} else if (isVersionGte(runtimeVersion, "2.0.0")) {
112+
} else if (semver.gte(runtimeVersion, "2.0.0")) {
111113
return "4.7.80";
112114
}
113115
}
@@ -122,7 +124,7 @@ ProjectSnapshotGenerator.prototype.validateAndroidRuntimeVersion = function() {
122124
}
123125

124126
if (!VALID_ANDROID_RUNTIME_TAGS.includes(currentRuntimeVersion) &&
125-
!isVersionGte(currentRuntimeVersion, MIN_ANDROID_RUNTIME_VERSION)) {
127+
!semver.gte(currentRuntimeVersion, MIN_ANDROID_RUNTIME_VERSION)) {
126128

127129
throw new Error("In order to support heap snapshots, you must have at least tns-android@" + MIN_ANDROID_RUNTIME_VERSION +
128130
" installed. Current Android Runtime version is: " + currentRuntimeVersion + ".");

‎utils.js‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /