Skip to content

Commit a1dbbc8

Browse files
authored
Merge pull request #7 from jesucarr/master
support for RN >= 0.56
2 parents 94bd5ae + e034af6 commit a1dbbc8

File tree

4 files changed

+3678
-1629
lines changed

4 files changed

+3678
-1629
lines changed

Diff for: README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Obfuscate selected source files when building for React Native.
55
## Installation
66

77
yarn add react-native-obfuscating-transformer --dev
8-
8+
99
or
1010

1111
npm install react-native-obfuscating-transformer --save-dev
@@ -16,8 +16,8 @@ or
1616

1717
```diff
1818
module.exports = {
19-
+ getTransformModulePath() {
20-
+ return require.resolve("./transformer")
19+
+ transformer {
20+
+ babelTransformerPath: require.resolve("./transformer")
2121
+ },
2222
}
2323
```

Diff for: package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@types/node": "^9.3.0",
1414
"@types/semver": "^5.4.0",
1515
"app-root-path": "^2.0.1",
16-
"babel-generator": "^6.26.0",
16+
"babel-generator": "^6.26.1",
1717
"javascript-obfuscator": "^0.13.0",
1818
"jju": "^1.3.0",
1919
"semver": "^5.4.1",
@@ -30,7 +30,7 @@
3030
"typings": "dist/index.d.ts",
3131
"lint-staged": {
3232
"**/*.ts": [
33-
"prettier --list-different --no-semi --trailing-comma all"
33+
"prettier --no-semi --trailing-comma all"
3434
]
3535
},
3636
"devDependencies": {
@@ -39,11 +39,11 @@
3939
"husky": "^0.13.3",
4040
"jest": "^22.0.6",
4141
"lint-staged": "^3.4.1",
42-
"metro": "^0.24.3",
43-
"metro-bundler": "^0.9.0",
42+
"metro": "^0.45.6",
43+
"metro-bundler": "^0.22.1",
4444
"np": "^2.18.3",
4545
"prettier": "^1.10.2",
46-
"react-native": "^0.45.1",
46+
"react-native": "^0.57.1",
4747
"ts-jest": "^22.0.1",
4848
"ts-node": "^4.1.0",
4949
"typescript": "^2.6.2"
@@ -66,4 +66,4 @@
6666
"json"
6767
]
6868
}
69-
}
69+
}

Diff for: src/getMetroTransformer.ts

+16-14
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ function getReactNativeMinorVersion(): number {
4444
export function getMetroTransformer(
4545
reactNativeMinorVersion: number = getReactNativeMinorVersion(),
4646
): MetroTransformer {
47-
if (reactNativeMinorVersion >= 52) {
47+
if (reactNativeMinorVersion >= 56) {
48+
return require("metro/src/reactNativeTransformer")
49+
} else if (reactNativeMinorVersion >= 52) {
4850
return require("metro/src/transformer")
4951
} else if (reactNativeMinorVersion >= 0.47) {
5052
return require("metro-bundler/src/transformer")
@@ -74,20 +76,20 @@ export function maybeTransformMetroResult(
7476
})
7577

7678
const mapConsumer = new SourceMapConsumer(map as any) // upstream types are wrong
77-
;(traverse as any).cheap(ast, (node: Node) => {
78-
if (node.loc) {
79-
const originalStart = mapConsumer.originalPositionFor(node.loc.start)
80-
if (originalStart.line) {
81-
node.loc.start.line = originalStart.line
82-
node.loc.start.column = originalStart.column
83-
}
84-
const originalEnd = mapConsumer.originalPositionFor(node.loc.end)
85-
if (originalEnd.line) {
86-
node.loc.end.line = originalEnd.line
87-
node.loc.end.column = originalEnd.column
79+
; (traverse as any).cheap(ast, (node: Node) => {
80+
if (node.loc) {
81+
const originalStart = mapConsumer.originalPositionFor(node.loc.start)
82+
if (originalStart.line) {
83+
node.loc.start.line = originalStart.line
84+
node.loc.start.column = originalStart.column
85+
}
86+
const originalEnd = mapConsumer.originalPositionFor(node.loc.end)
87+
if (originalEnd.line) {
88+
node.loc.end.line = originalEnd.line
89+
node.loc.end.column = originalEnd.column
90+
}
8891
}
89-
}
90-
})
92+
})
9193

9294
return { ast }
9395
} else if (Array.isArray(upstreamResult.map)) {

0 commit comments

Comments
 (0)