Skip to content

Commit ff84d4a

Browse files
author
David Sheldrick
committed
revert to old version of source-map
1 parent 58c3d70 commit ff84d4a

File tree

3 files changed

+17
-35
lines changed

3 files changed

+17
-35
lines changed

index.js

+16-27
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ function loadJsonFile(jsonFilename) {
5252
}
5353

5454
// only used with RN >= 52
55-
async function sourceMapAstInPlace(tsMap, babelAst) {
56-
const tsConsumer = await new SourceMapConsumer(tsMap)
55+
function sourceMapAstInPlace(tsMap, babelAst) {
56+
const tsConsumer = new SourceMapConsumer(tsMap)
5757
traverse.default.cheap(babelAst, node => {
5858
if (node.loc) {
5959
const originalStart = tsConsumer.originalPositionFor(node.loc.start)
@@ -70,8 +70,8 @@ async function sourceMapAstInPlace(tsMap, babelAst) {
7070
})
7171
}
7272

73-
async function composeRawSourceMap(tsMap, babelMap) {
74-
const tsConsumer = await new SourceMapConsumer(tsMap)
73+
function composeRawSourceMap(tsMap, babelMap) {
74+
const tsConsumer = new SourceMapConsumer(tsMap)
7575
const composedMap = []
7676
babelMap.forEach(
7777
([generatedLine, generatedColumn, originalLine, originalColumn, name]) => {
@@ -104,15 +104,9 @@ async function composeRawSourceMap(tsMap, babelMap) {
104104
return composedMap
105105
}
106106

107-
async function composeSourceMaps(
108-
tsMap,
109-
babelMap,
110-
tsFileName,
111-
tsContent,
112-
babelCode
113-
) {
114-
const tsConsumer = await new SourceMapConsumer(tsMap)
115-
const babelConsumer = await new SourceMapConsumer(babelMap)
107+
function composeSourceMaps(tsMap, babelMap, tsFileName, tsContent, babelCode) {
108+
const tsConsumer = new SourceMapConsumer(tsMap)
109+
const babelConsumer = new SourceMapConsumer(babelMap)
116110
const map = new SourceMapGenerator()
117111
map.setSourceContent(tsFileName, tsContent)
118112
babelConsumer.eachMapping(
@@ -204,7 +198,7 @@ module.exports.getCacheKey = function() {
204198
return key.digest('hex')
205199
}
206200

207-
module.exports.transform = async function(src, filename, options) {
201+
module.exports.transform = function(src, filename, options) {
208202
if (typeof src === 'object') {
209203
// handle RN >= 0.46
210204
;({ src, filename, options } = src)
@@ -244,23 +238,18 @@ module.exports.transform = async function(src, filename, options) {
244238
}
245239
}
246240

247-
const babelCompileResult = await Promise.resolve(
248-
upstreamTransformer.transform({
249-
src: tsCompileResult.outputText,
250-
filename,
251-
options,
252-
})
253-
)
241+
const babelCompileResult = upstreamTransformer.transform({
242+
src: tsCompileResult.outputText,
243+
filename,
244+
options,
245+
})
254246

255247
if (reactNativeMinorVersion >= 52) {
256-
await sourceMapAstInPlace(
257-
tsCompileResult.sourceMapText,
258-
babelCompileResult.ast
259-
)
248+
sourceMapAstInPlace(tsCompileResult.sourceMapText, babelCompileResult.ast)
260249
return babelCompileResult
261250
}
262251

263-
const composedMap = await (Array.isArray(babelCompileResult.map)
252+
const composedMap = Array.isArray(babelCompileResult.map)
264253
? composeRawSourceMap(
265254
tsCompileResult.sourceMapText,
266255
babelCompileResult.map
@@ -271,7 +260,7 @@ module.exports.transform = async function(src, filename, options) {
271260
filename,
272261
src,
273262
babelCompileResult.code
274-
))
263+
)
275264

276265
return Object.assign({}, babelCompileResult, {
277266
map: composedMap,

package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
"repository": "https://github.com/ds300/react-native-typescript-transformer",
77
"author": "David Sheldrick",
88
"license": "MIT",
9-
"engines": {
10-
"node": ">=8.0.0"
11-
},
129
"dependencies": {
1310
"chalk": "^2.4.0",
1411
"find-root": "^1.1.0",
1512
"jju": "^1.3.0",
1613
"semver": "^5.4.1",
17-
"source-map": "^0.7.3"
14+
"source-map": "^0.5.6"
1815
},
1916
"peerDependencies": {
2017
"react-native": ">=0.45.0",

yarn.lock

-4
Original file line numberDiff line numberDiff line change
@@ -4582,10 +4582,6 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
45824582
version "0.5.6"
45834583
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
45844584

4585-
source-map@^0.7.3:
4586-
version "0.7.3"
4587-
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
4588-
45894585
source-map@~0.2.0:
45904586
version "0.2.0"
45914587
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"

0 commit comments

Comments
 (0)