Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

chore: merge release in master #1031

Merged
merged 16 commits into from
Aug 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
<a name="1.1.0"></a>
# [1.1.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.0.2...1.1.0) (2019-08-19)


### Bug Fixes

* **hmr:** check for hot update should not create new file ([c9656a9](https://github.com/NativeScript/nativescript-dev-webpack/commit/c9656a9))


### Features

* update to angular 8.2 ([d13441a](https://github.com/NativeScript/nativescript-dev-webpack/commit/d13441a))



<a name="1.0.3"></a>
## [1.0.3](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.0.2...1.0.3) (2019-08-05)


### Bug Fixes

* crash with source-map instead of inline-source-map (https://github.com/NativeScript/nativescript-dev-webpack/issues/968) ([ff07d6c](https://github.com/NativeScript/nativescript-dev-webpack/commit/ff07d6c))
* **update-ns-webpack:** skip the update of tsconfig.tns.json in… ([#1001](https://github.com/NativeScript/nativescript-dev-webpack/issues/1001)) ([2ed9850](https://github.com/NativeScript/nativescript-dev-webpack/commit/2ed9850))



<a name="1.0.2"></a>
## [1.0.2](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.0.1...1.0.2) (2019-07-26)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
"tns-core-modules": "next",
"typescript": "~3.5.3"
}
}
}
6 changes: 4 additions & 2 deletions plugins/NativeScriptSnapshotPlugin/options.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@
"default": [
"arm",
"arm64",
"ia32"
"ia32",
"ia64"
],
"items": {
"type": "string",
"enum": [
"arm",
"arm64",
"ia32"
"ia32",
"ia64"
]
}
},
Expand Down
11 changes: 10 additions & 1 deletion snapshot/android/project-snapshot-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,18 @@ ProjectSnapshotGenerator.prototype.generate = function (generationOptions) {
throw new Error(noV8VersionFoundMessage);
}

// NOTE: Order is important! Add new archs at the end of the array
const defaultTargetArchs = ["arm", "arm64", "ia32", "ia64"];
const runtimeVersion = getAndroidRuntimeVersion(this.options.projectRoot);
if (runtimeVersion && semver.lt(semver.coerce(runtimeVersion), "6.0.2")) {
const indexOfIa64 = defaultTargetArchs.indexOf("ia64");
// Before 6.0.2 version of Android runtime we supported only arm, arm64 and ia32.
defaultTargetArchs.splice(indexOfIa64, defaultTargetArchs.length - indexOfIa64);
}

const options = {
snapshotToolsPath,
targetArchs: generationOptions.targetArchs || ["arm", "arm64", "ia32"],
targetArchs: generationOptions.targetArchs || defaultTargetArchs,
v8Version: generationOptions.v8Version || v8Version,
preprocessedInputFile: generationOptions.preprocessedInputFile,
useLibs: generationOptions.useLibs || false,
Expand Down
4 changes: 2 additions & 2 deletions snapshot/android/snapshot-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ SnapshotGenerator.prototype.preprocessInputFiles = function (inputFiles, outputF
// Example:
// (function() {
// some code here
// })()
// })()
// // sourceMapUrl......
// ** when we join without `;` here, the next IIFE is assumed as a function call to the result of the first IIFE
// (function() {
Expand Down Expand Up @@ -101,7 +101,7 @@ SnapshotGenerator.prototype.convertToAndroidArchName = function (archName) {
case "arm": return "armeabi-v7a";
case "arm64": return "arm64-v8a";
case "ia32": return "x86";
case "x64": return "x64";
case "ia64": return "x86_64";
default: return archName;
}
}
Expand Down