From 6e145a401c3038fa9378bf92a2962fae4cb8dbf7 Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Fri, 21 Feb 2020 11:53:44 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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) {