@tarojs/rn-runner 3.5.1 → 3.5.2-aplha.1

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.
@@ -33,7 +33,6 @@ const rn_transformer_1 = require("@tarojs/rn-transformer");
33
33
  const jsx = require("acorn-jsx");
34
34
  const path = require("path");
35
35
  const rollup_1 = require("rollup");
36
- const clear = require("rollup-plugin-clear");
37
36
  const rollup_plugin_image_file_1 = require("rollup-plugin-image-file");
38
37
  const DEFAULT_CONFIG = {
39
38
  external: [/^react(\/.*)?$/, /^react-native(\/.*)?$/, /^@react-native/],
@@ -88,7 +87,6 @@ const build = (projectConfig, componentConfig) => __awaiter(void 0, void 0, void
88
87
  // @ts-ignore react native 相关的一些库中可能包含 jsx 语法
89
88
  acornInjectPlugins: [jsx()],
90
89
  plugins: [
91
- clear({ targets: [output] }),
92
90
  // TODO: 使用 react-native-svg-transformer 处理
93
91
  // @ts-ignore
94
92
  (0, rollup_plugin_image_file_1.default)({
@@ -97,7 +95,8 @@ const build = (projectConfig, componentConfig) => __awaiter(void 0, void 0, void
97
95
  // @ts-ignore
98
96
  json(),
99
97
  (0, rn_supporter_1.rollupResolver)({
100
- externalResolve
98
+ externalResolve,
99
+ platform: projectConfig.deviceType // ios|android
101
100
  }),
102
101
  (0, plugin_node_resolve_1.default)({
103
102
  extensions: ['.mjs', '.js', '.json', '.node', '.ts', '.tsx']
@@ -123,7 +122,22 @@ const build = (projectConfig, componentConfig) => __awaiter(void 0, void 0, void
123
122
  ],
124
123
  extensions: ['js', 'ts', 'jsx', 'tsx']
125
124
  }),
126
- (0, rn_style_transformer_1.rollupTransform)({ config: projectConfig })
125
+ (0, rn_style_transformer_1.rollupTransform)({
126
+ platform: projectConfig.deviceType,
127
+ config: {
128
+ designWidth: projectConfig.designWidth,
129
+ deviceRatio: projectConfig.deviceRatio,
130
+ // TODO: config.ass 和 rn.sass 命名重复,合并导致 global sass 丢失了,rn config sass 考虑更换字段,比如 sassOption.
131
+ // sass: projectConfig.sass,
132
+ alias: projectConfig.alias,
133
+ rn: {
134
+ postcss: projectConfig.postcss,
135
+ sass: projectConfig.sass,
136
+ less: projectConfig.less,
137
+ stylus: projectConfig.stylus
138
+ }
139
+ },
140
+ })
127
141
  ]
128
142
  };
129
143
  const newRollupOptions = modifyRollupConfig(rollupOptions, {
@@ -149,14 +163,12 @@ function likeDependent(str) {
149
163
  return !str.match(/^\.?\.\//) && !path.isAbsolute(str);
150
164
  }
151
165
  function default_1(projectPath, config) {
152
- return __awaiter(this, void 0, void 0, function* () {
153
- const { sourceRoot, entry, nativeComponents } = config;
154
- const appPath = path.join(projectPath, sourceRoot, entry);
155
- const appConfig = (0, rn_transformer_1.getAppConfig)(appPath);
156
- const { output = DEFAULT_CONFIG.output } = nativeComponents || {};
157
- const componentConfig = Object.assign(Object.assign({}, nativeComponents), { input: appConfig === null || appConfig === void 0 ? void 0 : appConfig.components, output: path.join(projectPath, output), sourceRootPath: path.join(projectPath, sourceRoot) });
158
- return (0, exports.build)(config, componentConfig);
159
- });
166
+ const { sourceRoot, entry, nativeComponents } = config;
167
+ const appPath = path.join(projectPath, sourceRoot, entry);
168
+ const appConfig = (0, rn_transformer_1.getAppConfig)(appPath);
169
+ const { output = DEFAULT_CONFIG.output } = nativeComponents || {};
170
+ const componentConfig = Object.assign(Object.assign({}, nativeComponents), { input: appConfig === null || appConfig === void 0 ? void 0 : appConfig.components, output: path.join(projectPath, output), sourceRootPath: path.join(projectPath, sourceRoot) });
171
+ return (0, exports.build)(config, componentConfig);
160
172
  }
161
173
  exports.default = default_1;
162
174
  //# sourceMappingURL=build-component.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"build-component.js","sourceRoot":"","sources":["../../src/config/build-component.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build-component.js","sourceRoot":"","sources":["../../src/config/build-component.ts"],"names":[],"mappings":"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"}
@@ -10,14 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.defaultConfig = void 0;
13
- const findProjectRoot_1 = require("@react-native-community/cli/build/tools/config/findProjectRoot");
14
- const resolveReactNativePath_1 = require("@react-native-community/cli/build/tools/config/resolveReactNativePath");
13
+ const resolveReactNativePath_1 = require("@react-native-community/cli-config/build/resolveReactNativePath");
14
+ const cli_tools_1 = require("@react-native-community/cli-tools");
15
15
  const rn_supporter_1 = require("@tarojs/rn-supporter");
16
16
  const Metro = require("metro");
17
17
  const os = require("os");
18
18
  const path = require("path");
19
19
  const conditional_file_store_1 = require("./conditional-file-store");
20
- const reactNativePath = (0, resolveReactNativePath_1.default)((0, findProjectRoot_1.default)());
20
+ const reactNativePath = (0, resolveReactNativePath_1.default)((0, cli_tools_1.findProjectRoot)());
21
21
  const defaultConfig = getDefaultConfig();
22
22
  exports.defaultConfig = defaultConfig;
23
23
  function getDefaultConfig() {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oGAA4F;AAC5F,kHAA0G;AAC1G,uDAAgD;AAChD,+BAA8B;AAC9B,yBAAwB;AACxB,6BAA4B;AAE5B,qEAA2D;AAE3D,MAAM,eAAe,GAAW,IAAA,gCAAsB,EAAC,IAAA,yBAAe,GAAE,CAAC,CAAA;AAyBzE,MAAM,aAAa,GAAgB,gBAAgB,EAAE,CAAA;AAyC5C,sCAAa;AAvCtB,SAAS,gBAAgB;IACvB,MAAM,SAAS,GAAG,IAAI,wBAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,MAAM,eAAe,GAAG,SAAS,CAAC,cAAc,EAAE,CAAA;IAClD,MAAM,WAAW,GAAgB;QAC/B,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,UAAU,EAAE;YACV,2EAA2E;YAC3E,oDAAoD;YACpD,6BAA6B,EAAE,GAAG,EAAE,CAAC;gBACnC,OAAO,CAAC,OAAO,CACb,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,+BAA+B,CAAC,CAC5D;aACF;YACD,YAAY,EAAE,GAAG,EAAE,CACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,EAAE;SAC5D;QACD,WAAW,EAAE,CAAC,IAAI,gCAAoB,CAAM;gBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC;aAC5C,CAAC,CAAC;QACH,MAAM,EAAE;YACN,IAAI,EAAE,IAAI;SACX;KACF,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,kBAAe,CAAO,MAAW,EAAE,EAAE;IACnC,MAAM,WAAW,GAAG,gBAAgB,EAAE,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;IACnD,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,gCAAoB,CAAC,EAAE;QAC/G,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;KACxE;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAA;KAC5C;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4GAAoG;AACpG,iEAAmE;AACnE,uDAAgD;AAChD,+BAA8B;AAC9B,yBAAwB;AACxB,6BAA4B;AAE5B,qEAA2D;AAE3D,MAAM,eAAe,GAAW,IAAA,gCAAsB,EAAC,IAAA,2BAAe,GAAE,CAAC,CAAA;AAyBzE,MAAM,aAAa,GAAgB,gBAAgB,EAAE,CAAA;AAyC5C,sCAAa;AAvCtB,SAAS,gBAAgB;IACvB,MAAM,SAAS,GAAG,IAAI,wBAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,MAAM,eAAe,GAAG,SAAS,CAAC,cAAc,EAAE,CAAA;IAClD,MAAM,WAAW,GAAgB;QAC/B,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,UAAU,EAAE;YACV,2EAA2E;YAC3E,oDAAoD;YACpD,6BAA6B,EAAE,GAAG,EAAE,CAAC;gBACnC,OAAO,CAAC,OAAO,CACb,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,+BAA+B,CAAC,CAC5D;aACF;YACD,YAAY,EAAE,GAAG,EAAE,CACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,EAAE;SAC5D;QACD,WAAW,EAAE,CAAC,IAAI,gCAAoB,CAAM;gBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC;aAC5C,CAAC,CAAC;QACH,MAAM,EAAE;YACN,IAAI,EAAE,IAAI;SACX;KACF,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,kBAAe,CAAO,MAAW,EAAE,EAAE;IACnC,MAAM,WAAW,GAAG,gBAAgB,EAAE,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;IACnD,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,gCAAoB,CAAC,EAAE;QAC/G,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;KACxE;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAA;KAC5C;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/rn-runner",
3
- "version": "3.5.1",
3
+ "version": "3.5.2-aplha.1",
4
4
  "description": "ReactNative build tool for taro",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -21,34 +21,35 @@
21
21
  "npm": ">=6.0.0"
22
22
  },
23
23
  "dependencies": {
24
- "@react-native-community/cli": "^7.0.3",
25
- "@react-native-community/cli-plugin-metro": "^7.0.0",
26
- "@react-native-community/cli-server-api": "^7.0.0",
24
+ "@react-native-community/cli": "^8.0.0",
25
+ "@react-native-community/cli-config": "^8.0.0",
26
+ "@react-native-community/cli-plugin-metro": "^8.0.0",
27
+ "@react-native-community/cli-tools": "^8.0.0",
28
+ "@react-native-community/cli-server-api": "^8.0.0",
27
29
  "@rollup/plugin-babel": "^5.3.1",
28
30
  "@rollup/plugin-commonjs": "^20.0.0",
29
31
  "@rollup/plugin-json": "^4.1.0",
30
32
  "@rollup/plugin-node-resolve": "^13.3.0",
31
33
  "@rollup/plugin-replace": "^4.0.0",
32
- "@tarojs/helper": "3.5.1",
33
- "@tarojs/rn-style-transformer": "3.5.1",
34
- "@tarojs/rn-supporter": "3.5.1",
35
- "@tarojs/rn-transformer": "3.5.1",
34
+ "@tarojs/helper": "3.5.2-aplha.1",
35
+ "@tarojs/rn-style-transformer": "3.5.2-aplha.1",
36
+ "@tarojs/rn-supporter": "3.5.2-aplha.1",
37
+ "@tarojs/rn-transformer": "3.5.2-aplha.1",
36
38
  "acorn-jsx": "^5.3.2",
37
39
  "fs-extra": "^8.0.1",
38
40
  "lodash": "^4.17.21",
39
- "metro": "^0.67.0",
40
- "metro-cache": "^0.67.0",
41
- "metro-config": "^0.67.0",
42
- "metro-core": "^0.67.0",
43
- "metro-react-native-babel-transformer": "^0.67.0",
44
- "metro-resolver": "^0.67.0",
41
+ "metro": "^0.70.3",
42
+ "metro-cache": "^0.70.3",
43
+ "metro-config": "^0.70.3",
44
+ "metro-core": "^0.70.3",
45
+ "metro-react-native-babel-transformer": "^0.70.3",
46
+ "metro-resolver": "^0.70.3",
45
47
  "mime-types": "^2.1.27",
46
48
  "qrcode-terminal": "^0.12.0",
47
- "rollup-plugin-clear": "^2.0.7",
48
49
  "rollup-plugin-image-file": "^1.0.2"
49
50
  },
50
51
  "devDependencies": {
51
- "expo-file-system": "~14.0.0",
52
+ "expo-file-system": "~14.1.0",
52
53
  "react-is": "^16.13.0",
53
54
  "react-native-root-siblings": "^4.1.1"
54
55
  },
@@ -10,7 +10,6 @@ import { getAppConfig } from '@tarojs/rn-transformer'
10
10
  import * as jsx from 'acorn-jsx'
11
11
  import * as path from 'path'
12
12
  import { rollup, RollupOptions } from 'rollup'
13
- import * as clear from 'rollup-plugin-clear'
14
13
  import image from 'rollup-plugin-image-file'
15
14
 
16
15
  type ExternalFn = (arr: Array<string | RegExp>) => Array<string | RegExp>
@@ -91,7 +90,6 @@ export const build = async (projectConfig, componentConfig: IComponentConfig) =>
91
90
  // @ts-ignore react native 相关的一些库中可能包含 jsx 语法
92
91
  acornInjectPlugins: [jsx()],
93
92
  plugins: [
94
- clear({ targets: [output] }),
95
93
  // TODO: 使用 react-native-svg-transformer 处理
96
94
  // @ts-ignore
97
95
  image({
@@ -100,7 +98,8 @@ export const build = async (projectConfig, componentConfig: IComponentConfig) =>
100
98
  // @ts-ignore
101
99
  json(),
102
100
  taroResolver({
103
- externalResolve
101
+ externalResolve,
102
+ platform: projectConfig.deviceType // ios|android
104
103
  }),
105
104
  nodeResolve({
106
105
  extensions: ['.mjs', '.js', '.json', '.node', '.ts', '.tsx']
@@ -126,7 +125,22 @@ export const build = async (projectConfig, componentConfig: IComponentConfig) =>
126
125
  ],
127
126
  extensions: ['js', 'ts', 'jsx', 'tsx']
128
127
  }),
129
- styleTransformer({ config: projectConfig })
128
+ styleTransformer({
129
+ platform: projectConfig.deviceType,
130
+ config: {
131
+ designWidth: projectConfig.designWidth,
132
+ deviceRatio: projectConfig.deviceRatio,
133
+ // TODO: config.ass 和 rn.sass 命名重复,合并导致 global sass 丢失了,rn config sass 考虑更换字段,比如 sassOption.
134
+ // sass: projectConfig.sass,
135
+ alias: projectConfig.alias,
136
+ rn: {
137
+ postcss: projectConfig.postcss,
138
+ sass: projectConfig.sass,
139
+ less: projectConfig.less,
140
+ stylus: projectConfig.stylus
141
+ }
142
+ },
143
+ })
130
144
  ]
131
145
  }
132
146
 
@@ -154,7 +168,7 @@ function likeDependent (str: string) {
154
168
  return !str.match(/^\.?\.\//) && !path.isAbsolute(str)
155
169
  }
156
170
 
157
- export default async function (projectPath: string, config: any) {
171
+ export default function (projectPath: string, config: any) {
158
172
  const { sourceRoot, entry, nativeComponents } = config
159
173
  const appPath = path.join(projectPath, sourceRoot, entry)
160
174
  const appConfig = getAppConfig(appPath)
@@ -1,5 +1,5 @@
1
- import findProjectRoot from '@react-native-community/cli/build/tools/config/findProjectRoot'
2
- import resolveReactNativePath from '@react-native-community/cli/build/tools/config/resolveReactNativePath'
1
+ import resolveReactNativePath from '@react-native-community/cli-config/build/resolveReactNativePath'
2
+ import { findProjectRoot } from '@react-native-community/cli-tools'
3
3
  import { Supporter } from '@tarojs/rn-supporter'
4
4
  import * as Metro from 'metro'
5
5
  import * as os from 'os'