@tarojs/rn-runner 3.5.7-alpha.1 → 3.5.7-alpha.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/__tests__/__snapshots__/components.spec.ts.snap +3 -3
  2. package/dist/index.js +13 -5
  3. package/dist/index.js.map +1 -1
  4. package/package.json +8 -7
  5. package/src/index.ts +17 -9
package/__tests__/__snapshots__/components.spec.ts.snap CHANGED
@@ -207,7 +207,7 @@ export { Navbar as default };
207
207
 
208
208
  exports[`build_components named export 1`] = `
209
209
  Array [
210
- "import { Platform as Platform$1, NativeEventEmitter } from 'react-native';
210
+ "import { Platform as Platform$1, NativeModules, NativeEventEmitter } from 'react-native';
211
211
  import 'react-native/Libraries/EventEmitter/RCTDeviceEventEmitter';
212
212
  import 'react';
213
213
  import require$$0 from 'crypto';
@@ -236,7 +236,7 @@ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof win
236
236
 
237
237
  var invariant=function(condition,format,a,b,c,d,e,f){if(!condition){var error;if(format===undefined){error=new Error('Minified exception occurred; use the non-minified dev environment '+'for the full error message and additional helpful warnings.');}else {var args=[a,b,c,d,e,f];var argIndex=0;error=new Error(format.replace(/%s/g,function(){return args[argIndex++];}));error.name='Invariant Violation';}error.framesToPop=1;throw error;}};var invariant_1=invariant;
238
238
 
239
- var nativeEmitterSubscriptionKey='@@nativeEmitterSubscription@@';var EventEmitter=function(){function EventEmitter(nativeModule){_classCallCheck(this,EventEmitter);this._listenerCount=0;this._nativeModule=nativeModule;this._eventEmitter=new NativeEventEmitter(nativeModule);}_createClass(EventEmitter,[{key:\\"addListener\\",value:function addListener(eventName,listener){var _this=this,_subscription;if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.startObserving){this._nativeModule.startObserving();}this._listenerCount++;var nativeEmitterSubscription=this._eventEmitter.addListener(eventName,listener);var subscription=(_subscription={},_defineProperty(_subscription,nativeEmitterSubscriptionKey,nativeEmitterSubscription),_defineProperty(_subscription,\\"remove\\",function remove(){_this.removeSubscription(subscription);}),_subscription);return subscription;}},{key:\\"removeAllListeners\\",value:function removeAllListeners(eventName){var removedListenerCount=this._eventEmitter.listenerCount?this._eventEmitter.listenerCount(eventName):this._eventEmitter.listeners(eventName).length;this._eventEmitter.removeAllListeners(eventName);this._listenerCount-=removedListenerCount;invariant_1(this._listenerCount>=0,\\"EventEmitter must have a non-negative number of listeners\\");if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.stopObserving){this._nativeModule.stopObserving();}}},{key:\\"removeSubscription\\",value:function removeSubscription(subscription){var nativeEmitterSubscription=subscription[nativeEmitterSubscriptionKey];if(!nativeEmitterSubscription){return;}if('remove'in nativeEmitterSubscription){nativeEmitterSubscription.remove();}else if('removeSubscription'in this._eventEmitter){this._eventEmitter.removeSubscription(nativeEmitterSubscription);}this._listenerCount--;delete subscription[nativeEmitterSubscriptionKey];subscription.remove=function(){};if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.stopObserving){this._nativeModule.stopObserving();}}},{key:\\"emit\\",value:function emit(eventName){var _this$_eventEmitter;for(var _len=arguments.length,params=new Array(_len>1?_len-1:0),_key=1;_key<_len;_key++){params[_key-1]=arguments[_key];}(_this$_eventEmitter=this._eventEmitter).emit.apply(_this$_eventEmitter,[eventName].concat(params));}}]);return EventEmitter;}();
239
+ var nativeEmitterSubscriptionKey='@@nativeEmitterSubscription@@';var EventEmitter=function(){function EventEmitter(nativeModule){_classCallCheck(this,EventEmitter);this._listenerCount=0;if(nativeModule.__expo_module_name__&&NativeModules.EXReactNativeEventEmitter){nativeModule.addListener=function(){var _NativeModules$EXReac;for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key];}return (_NativeModules$EXReac=NativeModules.EXReactNativeEventEmitter).addProxiedListener.apply(_NativeModules$EXReac,[nativeModule.__expo_module_name__].concat(args));};nativeModule.removeListeners=function(){var _NativeModules$EXReac2;for(var _len2=arguments.length,args=new Array(_len2),_key2=0;_key2<_len2;_key2++){args[_key2]=arguments[_key2];}return (_NativeModules$EXReac2=NativeModules.EXReactNativeEventEmitter).removeProxiedListeners.apply(_NativeModules$EXReac2,[nativeModule.__expo_module_name__].concat(args));};}if(Platform$1.OS==='android'){Object.defineProperties(nativeModule,{addListener:{value:function value(){},writable:true,enumerable:true},removeListeners:{value:function value(){},writable:true,enumerable:true}});}this._nativeModule=nativeModule;this._eventEmitter=new NativeEventEmitter(nativeModule);}_createClass(EventEmitter,[{key:\\"addListener\\",value:function addListener(eventName,listener){var _this=this,_subscription;if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.startObserving){this._nativeModule.startObserving();}this._listenerCount++;var nativeEmitterSubscription=this._eventEmitter.addListener(eventName,listener);var subscription=(_subscription={},_defineProperty(_subscription,nativeEmitterSubscriptionKey,nativeEmitterSubscription),_defineProperty(_subscription,\\"remove\\",function remove(){_this.removeSubscription(subscription);}),_subscription);return subscription;}},{key:\\"removeAllListeners\\",value:function removeAllListeners(eventName){var removedListenerCount=this._eventEmitter.listenerCount?this._eventEmitter.listenerCount(eventName):this._eventEmitter.listeners(eventName).length;this._eventEmitter.removeAllListeners(eventName);this._listenerCount-=removedListenerCount;invariant_1(this._listenerCount>=0,\\"EventEmitter must have a non-negative number of listeners\\");if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.stopObserving){this._nativeModule.stopObserving();}}},{key:\\"removeSubscription\\",value:function removeSubscription(subscription){var nativeEmitterSubscription=subscription[nativeEmitterSubscriptionKey];if(!nativeEmitterSubscription){return;}if('remove'in nativeEmitterSubscription){nativeEmitterSubscription.remove();}else if('removeSubscription'in this._eventEmitter){this._eventEmitter.removeSubscription(nativeEmitterSubscription);}this._listenerCount--;delete subscription[nativeEmitterSubscriptionKey];subscription.remove=function(){};if(!this._listenerCount&&Platform$1.OS!=='ios'&&this._nativeModule.stopObserving){this._nativeModule.stopObserving();}}},{key:\\"emit\\",value:function emit(eventName){var _this$_eventEmitter;for(var _len3=arguments.length,params=new Array(_len3>1?_len3-1:0),_key3=1;_key3<_len3;_key3++){params[_key3-1]=arguments[_key3];}(_this$_eventEmitter=this._eventEmitter).emit.apply(_this$_eventEmitter,[eventName].concat(params));}}]);return EventEmitter;}();
240
240
 
241
241
  var NativeModulesProxy = {};
242
242
 
@@ -258,7 +258,7 @@ function _createSuper$1(Derived){var hasNativeReflectConstruct=_isNativeReflectC
258
258
 
259
259
  var NativeErrorManager = NativeModulesProxy.ExpoModulesCoreErrorManager;
260
260
 
261
- if(__DEV__&&Platform.OS==='android'&&NativeErrorManager){var eventEmitter=new EventEmitter(NativeErrorManager);eventEmitter.addListener('ExpoModulesCoreErrorManager.onNewException',function(_ref){var message=_ref.message;console.error(message);});}
261
+ if(__DEV__&&Platform.OS==='android'&&NativeErrorManager){var eventEmitter=new EventEmitter(NativeErrorManager);eventEmitter.addListener('ExpoModulesCoreErrorManager.onNewException',function(_ref){var message=_ref.message;console.error(message);});}global.ExpoModulesCore_CodedError=CodedError;
262
262
 
263
263
  var compareVersions = {exports: {}};
264
264
 
package/dist/index.js CHANGED
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const rn_supporter_1 = require("@tarojs/rn-supporter");
13
13
  const child_process_1 = require("child_process");
14
14
  const fs_1 = require("fs");
15
+ const fse = require("fs-extra");
15
16
  const path_1 = require("path");
16
17
  const build_component_1 = require("./config/build-component");
17
18
  // 确认根目录下 metro.config.js index.js 是否存在
@@ -32,6 +33,8 @@ function confirmFiles() {
32
33
  });
33
34
  });
34
35
  }
36
+ const isWin = /^win/.test(process.platform);
37
+ const npxCmd = isWin ? 'npx.cmd' : 'npx';
35
38
  function build(_appPath, config) {
36
39
  return __awaiter(this, void 0, void 0, function* () {
37
40
  process.env.TARO_ENV = 'rn';
@@ -43,7 +46,7 @@ function build(_appPath, config) {
43
46
  cliParams.push('--reset-cache');
44
47
  }
45
48
  if (config.publicPath) {
46
- cliParams.push('--public-path', config.publicPath);
49
+ process.env.PUBLIC_PATH = config.publicPath;
47
50
  }
48
51
  const onFinish = function (error) {
49
52
  if (typeof config.onBuildFinish === 'function') {
@@ -64,7 +67,7 @@ function build(_appPath, config) {
64
67
  cliParams.push('--port', config.port);
65
68
  }
66
69
  try {
67
- (0, child_process_1.spawn)('react-native', ['start'].concat(cliParams), {
70
+ (0, child_process_1.spawn)(npxCmd, ['react-native', 'start'].concat(cliParams), {
68
71
  stdio: 'inherit'
69
72
  });
70
73
  if (config.qr) {
@@ -79,7 +82,10 @@ function build(_appPath, config) {
79
82
  }
80
83
  }
81
84
  else {
82
- const bundleOutput = config.bundleOutput ? config.bundleOutput : (isIos ? config.output.ios : config.output.android);
85
+ const defaultOutputDir = (0, path_1.join)(process.cwd(), config.outputRoot || 'dist');
86
+ const defaultBundleOutput = (0, path_1.join)(defaultOutputDir, 'index.bundle');
87
+ const bundleOutput = (config.bundleOutput ? config.bundleOutput : (isIos ? config.output.ios : config.output.android)) || defaultBundleOutput;
88
+ fse.ensureDirSync((0, path_1.dirname)(bundleOutput));
83
89
  cliParams.push('--bundle-output', bundleOutput);
84
90
  const sourcemapOutput = config.sourcemapOutput ? config.sourcemapOutput : (isIos ? config.output.iosSourcemapOutput : config.output.androidSourcemapOutput);
85
91
  if (sourcemapOutput) {
@@ -93,10 +99,12 @@ function build(_appPath, config) {
93
99
  if (sourcemapSourcesRoot) {
94
100
  cliParams.push('--sourcemap-sources-root', sourcemapSourcesRoot);
95
101
  }
96
- const assetsDest = config.assetsDest ? config.assetsDest : (isIos ? config.output.iosAssetsDest : config.output.androidAssetsDest);
102
+ const assetsDest = (config.assetsDest ? config.assetsDest : (isIos ? config.output.iosAssetsDest : config.output.androidAssetsDest)) || defaultOutputDir;
97
103
  cliParams.push('--assets-dest', assetsDest);
104
+ fse.ensureDirSync(assetsDest);
98
105
  try {
99
- (0, child_process_1.spawn)('react-native', [
106
+ (0, child_process_1.spawn)(npxCmd, [
107
+ 'react-native',
100
108
  'bundle',
101
109
  '--platform',
102
110
  config.deviceType,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/rn-runner",
3
- "version": "3.5.7-alpha.1",
3
+ "version": "3.5.7-alpha.11",
4
4
  "description": "ReactNative build tool for taro",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -26,11 +26,12 @@
26
26
  "@rollup/plugin-json": "^4.1.0",
27
27
  "@rollup/plugin-node-resolve": "^13.3.0",
28
28
  "@rollup/plugin-replace": "^4.0.0",
29
- "@tarojs/helper": "3.5.7-alpha.1",
30
- "@tarojs/rn-style-transformer": "3.5.7-alpha.1",
31
- "@tarojs/rn-supporter": "3.5.7-alpha.1",
32
- "@tarojs/rn-transformer": "3.5.7-alpha.1",
29
+ "@tarojs/helper": "3.5.7-alpha.11",
30
+ "@tarojs/rn-style-transformer": "3.5.7-alpha.11",
31
+ "@tarojs/rn-supporter": "3.5.7-alpha.11",
32
+ "@tarojs/rn-transformer": "3.5.7-alpha.11",
33
33
  "acorn-jsx": "^5.3.2",
34
+ "fs-extra": "^8.0.1",
34
35
  "lodash": "^4.17.21",
35
36
  "rollup-plugin-image-file": "^1.0.2"
36
37
  },
@@ -38,11 +39,11 @@
38
39
  "@babel/core": "^7.14.5",
39
40
  "@babel/preset-env": "^7.14.5",
40
41
  "acorn": "^8.0.4",
41
- "expo": "~47.0.0-beta.3",
42
+ "expo": "~47.0.3",
42
43
  "expo-file-system": "~15.1.1",
43
44
  "react": "18.1.0",
44
45
  "react-is": "^16.13.0",
45
- "react-native": "^0.70.4",
46
+ "react-native": "^0.70.5",
46
47
  "react-native-root-siblings": "^4.1.1",
47
48
  "react-test-renderer": "18.1.0",
48
49
  "rollup": "^2.79.0"
package/src/index.ts CHANGED
@@ -1,7 +1,8 @@
1
- import { previewDev,previewProd } from '@tarojs/rn-supporter'
1
+ import { previewDev, previewProd } from '@tarojs/rn-supporter'
2
2
  import { spawn } from 'child_process'
3
- import { constants,copyFile } from 'fs'
4
- import { join } from 'path'
3
+ import { constants, copyFile } from 'fs'
4
+ import * as fse from 'fs-extra'
5
+ import { dirname, join } from 'path'
5
6
 
6
7
  import buildComponent from './config/build-component'
7
8
 
@@ -23,6 +24,9 @@ function confirmFiles () {
23
24
  })
24
25
  }
25
26
 
27
+ const isWin = /^win/.test(process.platform)
28
+ const npxCmd = isWin ? 'npx.cmd' : 'npx'
29
+
26
30
  export default async function build (_appPath: string, config: any): Promise<any> {
27
31
  process.env.TARO_ENV = 'rn'
28
32
  const isIos = config.deviceType === 'ios'
@@ -33,7 +37,7 @@ export default async function build (_appPath: string, config: any): Promise<any
33
37
  cliParams.push('--reset-cache')
34
38
  }
35
39
  if (config.publicPath) {
36
- cliParams.push('--public-path', config.publicPath)
40
+ process.env.PUBLIC_PATH = config.publicPath
37
41
  }
38
42
  const onFinish = function (error?) {
39
43
  if (typeof config.onBuildFinish === 'function') {
@@ -56,7 +60,7 @@ export default async function build (_appPath: string, config: any): Promise<any
56
60
  cliParams.push('--port', config.port)
57
61
  }
58
62
  try {
59
- spawn('react-native', ['start'].concat(cliParams), {
63
+ spawn(npxCmd, ['react-native', 'start'].concat(cliParams), {
60
64
  stdio: 'inherit'
61
65
  })
62
66
  if(config.qr) {
@@ -69,14 +73,16 @@ export default async function build (_appPath: string, config: any): Promise<any
69
73
  onFinish(e)
70
74
  }
71
75
  } else {
72
- const bundleOutput = config.bundleOutput ? config.bundleOutput : (isIos ? config.output.ios : config.output.android)
76
+ const defaultOutputDir = join(process.cwd(), config.outputRoot || 'dist')
77
+ const defaultBundleOutput = join(defaultOutputDir, 'index.bundle')
78
+ const bundleOutput = (config.bundleOutput ? config.bundleOutput : (isIos ? config.output.ios : config.output.android)) || defaultBundleOutput
79
+ fse.ensureDirSync(dirname(bundleOutput))
73
80
  cliParams.push('--bundle-output', bundleOutput)
74
81
 
75
82
  const sourcemapOutput = config.sourcemapOutput ? config.sourcemapOutput : (isIos ? config.output.iosSourcemapOutput : config.output.androidSourcemapOutput)
76
83
  if (sourcemapOutput) {
77
84
  cliParams.push('--sourcemap-output', sourcemapOutput)
78
85
  }
79
-
80
86
  const sourceMapUrl = config.sourceMapUrl ? config.sourceMapUrl : (isIos ? config.output.iosSourceMapUrl : config.output.androidSourceMapUrl)
81
87
  if (sourceMapUrl) {
82
88
  cliParams.push('--sourcemap-use-absolute-path', sourceMapUrl)
@@ -87,11 +93,13 @@ export default async function build (_appPath: string, config: any): Promise<any
87
93
  cliParams.push('--sourcemap-sources-root', sourcemapSourcesRoot)
88
94
  }
89
95
 
90
- const assetsDest = config.assetsDest ? config.assetsDest : (isIos ? config.output.iosAssetsDest : config.output.androidAssetsDest)
96
+ const assetsDest = (config.assetsDest ? config.assetsDest : (isIos ? config.output.iosAssetsDest : config.output.androidAssetsDest)) || defaultOutputDir
91
97
  cliParams.push('--assets-dest', assetsDest)
98
+ fse.ensureDirSync(assetsDest)
92
99
 
93
100
  try {
94
- spawn('react-native', [
101
+ spawn(npxCmd, [
102
+ 'react-native',
95
103
  'bundle',
96
104
  '--platform',
97
105
  config.deviceType,