@tarojs/rn-runner 3.5.0-alpha.13 → 3.5.0-alpha.16

package/src/config/preview.ts

@@ -1,10 +1,11 @@
-import * as mime from 'mime-types'
-import { createServer } from 'http'
 import { readFile } from 'fs'
-import { generate } from 'qrcode-terminal'
-import { getOpenHost, PLAYGROUNDINFO } from '../utils'
+import { createServer } from 'http'
+import * as mime from 'mime-types'
+import { extname, join } from 'path'
+import * as qr from 'qrcode-terminal'
 import { URL } from 'url'
-import { join, extname } from 'path'
+
+import { getOpenHost, PLAYGROUNDINFO } from '../utils'
 
 interface PreviewOption {
   out: string
@@ -109,5 +110,5 @@ export default (opt: PreviewOption):void => {
   const url = `${host}/index.js`
   console.log(PLAYGROUNDINFO)
   console.log(`print qrcode of ${opt.platform} bundle '${url}':`)
-  generate(url, { small: true })
+  qr.generate(url, { small: true })
 }

package/src/config/terminal-reporter.ts

@@ -1,6 +1,6 @@
-import { Terminal } from 'metro-core'
+import { emptyModulePath } from '@tarojs/rn-supporter'
 import * as MetroTerminalReporter from 'metro/src/lib/TerminalReporter'
-import * as ModuleResolution from 'metro/src/node-haste/DependencyGraph/ModuleResolution'
+import { Terminal } from 'metro-core'
 
 export class TerminalReporter {
   _reporter: any
@@ -38,7 +38,7 @@ export class TerminalReporter {
         break
       case 'bundle_build_done': {
         this._reporter.update(args)
-        const realEntryPath = ModuleResolution.ModuleResolver.EMPTY_MODULE
+        const realEntryPath = require.resolve(emptyModulePath)
         if (this._initialized) {
           // 恢复入口页面的缓存
           this._reporter.ignoreEntryFileCache = false

package/src/index.ts

@@ -1,22 +1,22 @@
-import * as Metro from 'metro'
-import getMetroConfig from './config'
-import { getRNConfigEntry } from './config/config-holder'
-import { getOpenHost, PLAYGROUNDINFO } from './utils'
-import preview from './config/preview'
-
+import saveAssets from '@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets'
+import { createDevServerMiddleware } from '@react-native-community/cli-server-api'
 import { PLATFORMS } from '@tarojs/helper'
-import * as path from 'path'
 import * as fse from 'fs-extra'
-import * as url from 'url'
-import * as qr from 'qrcode-terminal'
-
-import * as readline from 'readline'
-import { createDevServerMiddleware } from '@react-native-community/cli-server-api'
-import { TerminalReporter } from './config/terminal-reporter'
+import * as Metro from 'metro'
 import { getResolveDependencyFn } from 'metro/src/lib/transformHelpers'
 import * as Server from 'metro/src/Server'
-import saveAssets from '@react-native-community/cli-plugin-metro/build/commands/bundle/saveAssets'
 import * as outputBundle from 'metro/src/shared/output/bundle'
+import * as path from 'path'
+import * as qr from 'qrcode-terminal'
+import * as readline from 'readline'
+import * as url from 'url'
+
+import getMetroConfig from './config'
+import buildComponent from './config/build-component'
+import { getRNConfigEntry } from './config/config-holder'
+import preview from './config/preview'
+import { TerminalReporter } from './config/terminal-reporter'
+import { getOpenHost, PLAYGROUNDINFO } from './utils'
 
 function concatOutputFileName (config: any): string {
   // 优先级：--bundle-output > config.output > config.outputRoot
@@ -109,7 +109,12 @@ export default async function build (_appPath: string, config: any): Promise<any
     if (error instanceof Error) throw error
   }
 
-  if (config.isWatch) {
+  if (config.isBuildNativeComp) {
+    return buildComponent(
+      _appPath,
+      config
+    )
+  } else if (config.isWatch) {
     if (!metroConfig.server || (metroConfig.server.useGlobalHotkey === undefined)) {
       if (!metroConfig.server) {
         metroConfig.server = {}
@@ -120,7 +125,11 @@ export default async function build (_appPath: string, config: any): Promise<any
       metroConfig.server.port = config.port
     }
 
-    const { middleware, attachToServer } = createDevServerMiddleware({
+    const {
+      middleware,
+      messageSocketEndpoint,
+      websocketEndpoints
+    } = createDevServerMiddleware({
       port: metroConfig.server.port,
       watchFolders: metroConfig.watchFolders
     })
@@ -145,22 +154,21 @@ export default async function build (_appPath: string, config: any): Promise<any
     // 支持host
     return Metro.runServer(metroConfig, {
       ...commonOptions,
-      hmrEnabled: true
+      hmrEnabled: true,
+      websocketEndpoints
     }).then(server => {
       console.log(`React-Native Dev server is running on port: ${metroConfig.server.port}`)
       console.log('\n\nTo reload the app press "r"\nTo open developer menu press "d"\n')
 
-      const { messageSocket } = attachToServer(server)
-
       readline.emitKeypressEvents(process.stdin)
       process.stdin.setRawMode && process.stdin.setRawMode(true)
       process.stdin.on('keypress', (_key, data) => {
         const { ctrl, name } = data
         if (name === 'r') {
-          messageSocket.broadcast('reload')
+          messageSocketEndpoint.broadcast('reload')
           console.log('Reloading app...')
         } else if (name === 'd') {
-          messageSocket.broadcast('devMenu')
+          messageSocketEndpoint.broadcast('devMenu')
           console.log('Opening developer menu...')
         } else if (ctrl && (name === 'c')) {
           process.exit()
@@ -192,7 +200,10 @@ export default async function build (_appPath: string, config: any): Promise<any
     const savedBuildFunc = outputBundle.build
     outputBundle.build = async (packagerClient, requestOptions) => {
       const resolutionFn = await getResolveDependencyFn(packagerClient.getBundler().getBundler(), requestOptions.platform)
-      requestOptions.entryFile = resolutionFn(metroConfig.projectRoot, requestOptions.entryFile)
+      // try for test case build_noWatch
+      try {
+        requestOptions.entryFile = resolutionFn(metroConfig.projectRoot, requestOptions.entryFile)
+      } catch (e) {}
       return savedBuildFunc(packagerClient, requestOptions)
     }
 

package/src/types/index.ts

@@ -1,55 +1,55 @@
 // https://taro-docs.jd.com/taro/docs/config-detail/
 interface Output {
-  android: string,
+  android: string
   ios: string
 }
 
 interface Copy {
-  patterns: [],
+  patterns: []
   options: Record<string, any>
 }
 
 interface Csso {
-  enable: boolean,
+  enable: boolean
   config: Record<string, any>
 }
 
 interface Sass {
-  resource: [],
-  projectDirectory: string,
+  resource: []
+  projectDirectory: string
   data: string
 }
 
 export interface Config {
-  projectName?: string,
-  date?: string,
-  designWidth?: number,
-  deviceRatio?: Record<string, any>,
-  sourceRoot?: string,
-  outputRoot?: string,
-  defineConstants?: Record<string, any>,
-  alias?: Record<string, any>,
-  env?: Record<string, any>,
-  sass?: Sass,
-  copy?: Copy,
-  plugins?: [],
-  presets?: [],
-  terser?: Record<string, any>,
-  csso?: Csso,
-  framework?: Record<string, any>,
-  mini?: Record<string, any>,
-  h5?: Record<string, any>,
-  rn?: Record<string, any>,
+  projectName?: string
+  date?: string
+  designWidth?: number
+  deviceRatio?: Record<string, any>
+  sourceRoot?: string
+  outputRoot?: string
+  defineConstants?: Record<string, any>
+  alias?: Record<string, any>
+  env?: Record<string, any>
+  sass?: Sass
+  copy?: Copy
+  plugins?: []
+  presets?: []
+  terser?: Record<string, any>
+  csso?: Csso
+  framework?: Record<string, any>
+  mini?: Record<string, any>
+  h5?: Record<string, any>
+  rn?: Record<string, any>
 }
 
 export interface RNConfig extends Config {
-  appName?: boolean,
-  entry?: string,
-  output?: Output,
-  sourceDir?: string,
-  postcss?: Record<string, any>,
-  less?: Record<string, any>,
-  stylus?: Record<string, any>,
-  transformer?: any,
-  babelPlugin?: any,
+  appName?: boolean
+  entry?: string
+  output?: Output
+  sourceDir?: string
+  postcss?: Record<string, any>
+  less?: Record<string, any>
+  stylus?: Record<string, any>
+  transformer?: any
+  babelPlugin?: any
 }

package/src/utils.ts

@@ -6,7 +6,7 @@ export function getOpenHost () {
   for (const devName in interfaces) {
     const isEnd = interfaces[devName]?.some(item => {
       // 取IPv4, 不为127.0.0.1的内网ip
-      if (item.family === 'IPv4' && item.address !== '127.0.0.1' && !item.internal) {
+      if (['IPv4', 4, '4'].includes(item.family) && item.address !== '127.0.0.1' && !item.internal) {
         result = item.address
         return true
       }

package/tsconfig.json

@@ -1,12 +1,10 @@
 {
   "extends": "../../tsconfig.root.json",
   "compilerOptions": {
-    "rootDir": "./src",
+    "jsx": "react",
     "outDir": "./dist",
     "sourceMap": true,
-    "types": ["node"],
-    "module": "commonjs",
-    "typeRoots": ["./node_modules/@types"]
+    "module": "commonjs"
   },
-  "include": ["./src"],
+  "include": ["./src"]
 }