From 23aa6c564b32f20a3b3f040dee509d68b8f3b916 Mon Sep 17 00:00:00 2001 From: DimitarTachev Date: Wed, 12 Feb 2020 13:51:10 +0200 Subject: [PATCH 1/7] fix: `The provided Android NDK is vnull while the recommended one is v21.0.6113669` error in some cases --- snapshot/android/snapshot-generator.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js index d3b54d22..eb055dcd 100644 --- a/snapshot/android/snapshot-generator.js +++ b/snapshot/android/snapshot-generator.js @@ -400,7 +400,11 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir, } SnapshotGenerator.prototype.getRecommendedNdkWarning = function (localNdkRevision, recommendedAndroidNdkRevision) { - return `The provided Android NDK is v${localNdkRevision} while the recommended one is v${recommendedAndroidNdkRevision}`; + if (localNdkRevision) { + return `The provided Android NDK is v${localNdkRevision} while the required one is v${recommendedAndroidNdkRevision}`; + } else { + return `The provided Android NDK version is different than the required one - v${recommendedAndroidNdkRevision}`; + } } SnapshotGenerator.prototype.runMksnapshotTool = function (tool, mksnapshotParams, inputFile, snapshotInDocker, snapshotToolsPath, buildCSource) { From 45ef0042b6e2ed9f818f0723428c56b60e9bfa8f Mon Sep 17 00:00:00 2001 From: DimitarTachev Date: Wed, 12 Feb 2020 13:55:56 +0200 Subject: [PATCH 2/7] chore: bump version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dc2d3e6f..1956f9aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-dev-webpack", - "version": "1.5.0", + "version": "1.5.1", "main": "index", "description": "", "homepage": "http://www.telerik.com", @@ -100,4 +100,4 @@ "tns-core-modules": "next", "typescript": "~3.5.3" } -} +} \ No newline at end of file From 6e145a401c3038fa9378bf92a2962fae4cb8dbf7 Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Fri, 21 Feb 2020 11:53:44 +0200 Subject: [PATCH 3/7] feat: Add .kt extension to known ones --- bundle-config-loader.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle-config-loader.ts b/bundle-config-loader.ts index a3e3cdb8..34b4de27 100644 --- a/bundle-config-loader.ts +++ b/bundle-config-loader.ts @@ -4,7 +4,7 @@ import { getOptions } from "loader-utils"; import * as escapeRegExp from "escape-string-regexp"; // Matches all source, markup and style files that are not in App_Resources and in tests folder -const defaultMatch = "(? Date: Fri, 21 Feb 2020 11:55:59 +0200 Subject: [PATCH 4/7] feat: Add .kt extension to known entry types --- index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 766d4af4..fe84f777 100644 --- a/index.js +++ b/index.js @@ -79,12 +79,14 @@ exports.getEntryModule = function (appDirectory, platform) { const entry = getPackageJsonEntry(appDirectory); const tsEntryPath = path.resolve(appDirectory, `${entry}.ts`); + const ktEntryPath = path.resolve(appDirectory, `${entry}.kt`); const jsEntryPath = path.resolve(appDirectory, `${entry}.js`); - let entryExists = existsSync(tsEntryPath) || existsSync(jsEntryPath); + let entryExists = existsSync(tsEntryPath) || existsSync(ktEntryPath) || existsSync(jsEntryPath); if (!entryExists && platform) { const platformTsEntryPath = path.resolve(appDirectory, `${entry}.${platform}.ts`); + const platformKtEntryPath = path.resolve(appDirectory, `${entry}.${platform}.kt`); const platformJsEntryPath = path.resolve(appDirectory, `${entry}.${platform}.js`); - entryExists = existsSync(platformTsEntryPath) || existsSync(platformJsEntryPath); + entryExists = existsSync(platformTsEntryPath) || existsSync(platformKtEntryPath) || existsSync(platformJsEntryPath); } if (!entryExists) { From a04c0f8e457ae3c48a925324f4cbebe2403abc2b Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Fri, 21 Feb 2020 11:56:50 +0200 Subject: [PATCH 5/7] fix: replace extension coming from package.json --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index fe84f777..4846dc02 100644 --- a/index.js +++ b/index.js @@ -210,7 +210,7 @@ function getPackageJsonEntry(appDirectory) { throw new Error(`${appDirectory}/package.json must contain a 'main' attribute!`); } - return entry.replace(/\.js$/i, ""); + return entry.replace(/\.js$/i, "").replace(/\.kt$/i, ""); } function verifyEntryModuleDirectory(appDirectory) { From af5cb843ecf792cf32a6521434c2ae88f9baca4a Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Fri, 21 Feb 2020 13:11:16 +0200 Subject: [PATCH 6/7] fix: AOT compilation of multiple workers should work In case you have multiple TypeScript workers in Angular app, trying to build the project with AOT fails. The fix is in 0.11.0 version in nativescript-worker-loader, so update it to resolve the issue. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1956f9aa..c4b42a23 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "loader-utils": "^1.2.3", "minimatch": "3.0.4", "nativescript-hook": "0.2.4", - "nativescript-worker-loader": "~0.10.0", + "nativescript-worker-loader": "~0.11.0", "properties-reader": "0.3.1", "proxy-lib": "0.4.0", "raw-loader": "~0.5.1", @@ -100,4 +100,4 @@ "tns-core-modules": "next", "typescript": "~3.5.3" } -} \ No newline at end of file +} From dea6defac9a8fceee6b1c1fbd2d458d10b32055c Mon Sep 17 00:00:00 2001 From: Dimitar Topuzov Date: Tue, 25 Feb 2020 14:37:59 +0200 Subject: [PATCH 7/7] release: cut the 1.5.1 release --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62949386..66b0d205 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ + +## [1.5.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/v1.5.0...v1.5.1) (2020-02-25) + + +### Bug Fixes + +* `The provided Android NDK is vnull while the recommended one is v21.0.6113669` error in some cases ([23aa6c5](https://github.com/NativeScript/nativescript-dev-webpack/commit/23aa6c5)) +* AOT compilation of multiple workers should work ([af5cb84](https://github.com/NativeScript/nativescript-dev-webpack/commit/af5cb84)) +* replace extension coming from package.json ([a04c0f8](https://github.com/NativeScript/nativescript-dev-webpack/commit/a04c0f8)) + + +### Features + +* Add .kt extension to known entry types ([55b56c8](https://github.com/NativeScript/nativescript-dev-webpack/commit/55b56c8)) +* Add .kt extension to known ones ([6e145a4](https://github.com/NativeScript/nativescript-dev-webpack/commit/6e145a4)) + + + # [1.5.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.4.1...1.5.0) (2020-02-04)