RNV TS migration

package.json

@@ -95,6 +95,14 @@
         "@flexn/build-hooks-git": "0.1.0",
         "@types/jest": "~27.0.2",
         "@types/node": "~16.11.7",
+        "@types/node-fetch": "2.6.4",
+        "@types/lodash.set": "4.3.7",
+        "@types/lodash.get": "4.4.7",
+        "@types/lodash.intersection": "4.4.7",
+        "@types/kill-port": "2.0.0",
+        "@types/tar": "6.1.5",
+        "@types/shelljs": "0.8.12",
+        "@types/ncp": "2.0.5",
         "@typescript-eslint/eslint-plugin": "^5.4.0",
         "@typescript-eslint/parser": "^5.4.0",
         "babel-jest": "26.6.3",
@@ -164,4 +172,4 @@
         "ejs": "3.1.7",
         "shell-quote": "1.7.3"
     }
-}
+}

packages/engine-lightning/package.json

@@ -54,4 +54,4 @@
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}

packages/engine-lightning/src/index.js → packages/engine-lightning/src/index.ts

@@ -1,4 +1,5 @@
-import { Config, EngineManager } from 'rnv';
+import { Config, EngineManager, RnvEngine } from 'rnv';
+//@ts-ignore
 import CNF from '../renative.engine.json';
 // import taskRnvPackage from './tasks/task.rnv.package';
 import taskRnvBuild from './tasks/task.rnv.build';
@@ -11,7 +12,7 @@ import taskRnvRun from './tasks/task.rnv.run';
 
 const { generateEngineTasks, generateEngineExtensions } = EngineManager;
 
-export default {
+const Engine: RnvEngine = {
     initializeRuntimeConfig: (c) => Config.initializeConfig(c),
     tasks: generateEngineTasks([
         taskRnvRun,
@@ -26,7 +27,8 @@ export default {
     config: CNF,
     projectDirName: 'project',
     serverDirName: 'server',
-    ejectPlatform: null,
+    runtimeExtraProps: {},
+    // ejectPlatform: null,
     platforms: {
         tizen: {
             defaultPort: 8087,
@@ -40,3 +42,5 @@ export default {
         },
     },
 };
+
+export default Engine;

packages/engine-lightning/src/sdks/sdk-lightning/index.js → packages/engine-lightning/src/sdks/sdk-lightning/index.ts

@@ -8,6 +8,7 @@ import {
     Logger,
     PlatformManager,
     ProjectManager,
+    RnvContext,
     SDKManager,
 } from 'rnv';
 import semver from 'semver';
@@ -33,8 +34,8 @@ const { writeCleanFile } = FileUtils;
 const { runTizenSimOrDevice, DEFAULT_SECURITY_PROFILE_NAME } = SDKManager.Tizen;
 const { runWebosSimOrDevice } = SDKManager.Webos;
 
-export const runLightningProject = async (c, target) => {
-    logTask('runLightningProject', `target:${target}`);
+export const runLightningProject = async (c: RnvContext) => {
+    logTask('runLightningProject');
     const entryFile = getConfigProp(c, c.platform, 'entryFile');
     const { platform } = c;
     const { hosted } = c.program;
@@ -63,18 +64,18 @@ export const runLightningProject = async (c, target) => {
     return true;
 };
 
-export const buildLightningProject = async (c) => {
+export const buildLightningProject = async (c: RnvContext) => {
     logTask('buildLightningProject');
 
     const { platform } = c;
-    const platformConfig = c.buildConfig.platforms[platform];
+    const platformConfig = c.buildConfig.platforms?.[platform];
 
     const entryFile = getConfigProp(c, c.platform, 'entryFile');
     const target = getConfigProp(c, platform, 'target', 'es6');
     const tBuild = getPlatformProjectDir(c);
 
-    const tOut = path.join(tBuild, 'output');
-    const certProfile = platformConfig.certificateProfile ?? DEFAULT_SECURITY_PROFILE_NAME;
+    const tOut = path.join(tBuild || '', 'output');
+    const certProfile = platformConfig?.certificateProfile ?? DEFAULT_SECURITY_PROFILE_NAME;
 
     await executeAsync(c, `lng dist --${target}`, {
         stdio: 'inherit',
@@ -99,7 +100,7 @@ export const buildLightningProject = async (c) => {
     return true;
 };
 
-export const configureLightningProject = async (c) => {
+export const configureLightningProject = async (c: RnvContext) => {
     logTask('configureLightningProject');
     const { platform } = c;
     c.runtime.platformBuildsProjectPath = `${getPlatformBuildDir(c)}`;
@@ -111,18 +112,18 @@ export const configureLightningProject = async (c) => {
     return copyBuildsFolder(c, platform);
 };
 
-const _configureProject = (c) =>
-    new Promise((resolve) => {
+const _configureProject = (c: RnvContext) =>
+    new Promise<void>((resolve) => {
         logTask('_configureProject');
         const { platform } = c;
-        const p = c.buildConfig.platforms[platform];
+        const p = c.buildConfig.platforms?.[platform];
 
         const injects =
             platform === TIZEN
                 ? [
-                      { pattern: '{{PACKAGE}}', override: p.package },
-                      { pattern: '{{ID}}', override: p.id },
-                      { pattern: '{{APP_NAME}}', override: p.appName },
+                      { pattern: '{{PACKAGE}}', override: p?.package },
+                      { pattern: '{{ID}}', override: p?.id },
+                      { pattern: '{{APP_NAME}}', override: p?.appName },
                       { pattern: '{{APP_VERSION}}', override: semver.coerce(getAppVersion(c, platform)) },
                   ]
                 : [
@@ -138,8 +139,8 @@ const _configureProject = (c) =>
         addSystemInjects(c, injects);
 
         const configFile = platform === TIZEN ? 'config.xml' : 'appinfo.json';
-        const file = path.join(getPlatformProjectDir(c), configFile);
-        writeCleanFile(file, file, injects, null, c);
+        const file = path.join(getPlatformProjectDir(c) || '', configFile);
+        writeCleanFile(file, file, injects, undefined, c);
 
         resolve();
     });

packages/engine-lightning/src/tasks/task.rnv.build.js → packages/engine-lightning/src/tasks/task.rnv.build.ts

@@ -1,4 +1,4 @@
-import { Constants, Logger, PlatformManager, TaskManager } from 'rnv';
+import { Constants, Logger, PlatformManager, RnvTaskFn, TaskManager } from 'rnv';
 import { SDKLightning } from '../sdks';
 
 const { logErrorPlatform } = PlatformManager;
@@ -7,7 +7,7 @@ const { TIZEN, WEBOS, TASK_BUILD, TASK_CONFIGURE, PARAMS } = Constants;
 const { buildLightningProject } = SDKLightning;
 const { executeOrSkipTask, shouldSkipTask } = TaskManager;
 
-export const taskRnvBuild = async (c, parentTask, originTask) => {
+export const taskRnvBuild: RnvTaskFn = async (c, parentTask, originTask) => {
     logTask('taskRnvBuild', `parent:${parentTask}`);
     const { platform } = c;
     c.runtime.forceBundleAssets = true;

packages/engine-lightning/src/tasks/task.rnv.configure.js → packages/engine-lightning/src/tasks/task.rnv.configure.ts

@@ -1,4 +1,4 @@
-import { Constants, Logger, PlatformManager, TaskManager } from 'rnv';
+import { Constants, Logger, PlatformManager, RnvTaskFn, TaskManager } from 'rnv';
 import { SDKLightning } from '../sdks';
 
 const { logErrorPlatform } = PlatformManager;
@@ -7,7 +7,7 @@ const { TIZEN, WEBOS, TASK_PLATFORM_CONFIGURE, TASK_CONFIGURE, PARAMS } = Consta
 const { configureLightningProject } = SDKLightning;
 const { executeTask } = TaskManager;
 
-export const taskRnvConfigure = async (c, parentTask, originTask) => {
+export const taskRnvConfigure: RnvTaskFn = async (c, parentTask, originTask) => {
     logTask('taskRnvConfigure');
 
     await executeTask(c, TASK_PLATFORM_CONFIGURE, TASK_CONFIGURE, originTask);

packages/engine-lightning/src/tasks/task.rnv.run.js → packages/engine-lightning/src/tasks/task.rnv.run.ts

@@ -1,4 +1,4 @@
-import { Constants, Logger, PlatformManager, TaskManager } from 'rnv';
+import { Constants, Logger, PlatformManager, RnvTaskFn, TaskManager } from 'rnv';
 import { SDKLightning } from '../sdks';
 
 const { logErrorPlatform } = PlatformManager;
@@ -7,7 +7,7 @@ const { TIZEN, WEBOS, TASK_RUN, TASK_CONFIGURE, PARAMS } = Constants;
 const { runLightningProject } = SDKLightning;
 const { executeOrSkipTask } = TaskManager;
 
-export const taskRnvRun = async (c, parentTask, originTask) => {
+export const taskRnvRun: RnvTaskFn = async (c, parentTask, originTask) => {
     const { platform } = c;
     const { port } = c.runtime;
     const { target } = c.runtime;

packages/engine-lightning/tsconfig.json

@@ -3,7 +3,6 @@
     "compilerOptions": {
         "outDir": "./dist",
         "rootDir": "./src",
-        "allowJs": true,
         "resolveJsonModule": false
     },
     "include": ["./src/**/*", "./src/**/*.json", "./types.d.ts", "./package.json"]

packages/engine-rn-electron/package.json

@@ -61,4 +61,4 @@
         "access": "public"
     },
     "gitHead": "930edaf234cc321ad9f1e296c5d394e3144845e2"
-}
+}

packages/engine-rn-electron/src/adapter.js → packages/engine-rn-electron/src/adapter.ts

@@ -1,4 +1,4 @@
-export const withRNVBabel = (cnf) => {
+export const withRNVBabel = (cnf: any) => {
     const plugins = cnf?.plugins || [];
     return {
         retainLines: true,

packages/engine-rn-electron/src/index.js → packages/engine-rn-electron/src/index.ts

@@ -1,4 +1,5 @@
-import { Config, EngineManager } from 'rnv';
+import { Config, EngineManager, RnvContext, RnvEngine } from 'rnv';
+//@ts-ignore
 import CNF from '../renative.engine.json';
 import taskRnvBuild from './tasks/task.rnv.build';
 import taskRnvConfigure from './tasks/task.rnv.configure';
@@ -12,8 +13,8 @@ import { withRNVBabel } from './adapter';
 
 const { generateEngineTasks, generateEngineExtensions } = EngineManager;
 
-export default {
-    initializeRuntimeConfig: (c) => Config.initializeConfig(c),
+const Engine: RnvEngine = {
+    initializeRuntimeConfig: (c: RnvContext) => Config.initializeConfig(c),
     tasks: generateEngineTasks([
         taskRnvRun,
         taskRnvPackage,
@@ -27,7 +28,8 @@ export default {
     config: CNF,
     projectDirName: '',
     serverDirName: '',
-    ejectPlatform: null,
+    // ejectPlatform: null,
+    runtimeExtraProps: {},
     platforms: {
         macos: {
             defaultPort: 8086,
@@ -57,3 +59,5 @@ export default {
 };
 
 export { withRNVBabel };
+
+export default Engine;