From bac6bfd045200b2c4e588a8092d96581a5ea6de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Molleda?= Date: Wed, 19 Feb 2020 19:14:38 -0800 Subject: [PATCH 1/5] chore: create sourcemaps --- .gitignore | 1 + babel.config.js | 1 + jest.config.js | 1 + packages/cli/package.json | 1 + packages/debugger-ui/package.json | 3 ++- packages/platform-android/package.json | 1 + packages/platform-ios/package.json | 1 + packages/tools/package.json | 8 ++++++-- scripts/build.js | 12 ++++++++++-- 9 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3c34f29ac..03c14b3cf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ build/ *.tsbuildinfo .cache .watchmanconfig +coverage diff --git a/babel.config.js b/babel.config.js index d590727a4..c5246556b 100644 --- a/babel.config.js +++ b/babel.config.js @@ -28,4 +28,5 @@ module.exports = { }), ], ], + sourceMaps: true, }; diff --git a/jest.config.js b/jest.config.js index 00f379057..5efa27582 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,4 +15,5 @@ module.exports = { testMatch: ['/**/__tests__/*{.,-}test.[jt]s'], }, ], + collectCoverageFrom: ['packages/**/src/**/*.ts'], }; diff --git a/packages/cli/package.json b/packages/cli/package.json index 544b70616..faad4fe51 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -12,6 +12,7 @@ }, "files": [ "build", + "!build/**/*.map", "setup_env.sh" ], "engineStrict": true, diff --git a/packages/debugger-ui/package.json b/packages/debugger-ui/package.json index 48723372c..8fc44421e 100644 --- a/packages/debugger-ui/package.json +++ b/packages/debugger-ui/package.json @@ -9,7 +9,8 @@ "build:middleware": "tsc" }, "files": [ - "build" + "build", + "!build/**/*.map" ], "devDependencies": { "@babel/core": "^7.6.4", diff --git a/packages/platform-android/package.json b/packages/platform-android/package.json index bd49ba609..c9874a336 100644 --- a/packages/platform-android/package.json +++ b/packages/platform-android/package.json @@ -17,6 +17,7 @@ }, "files": [ "build", + "!build/**/*.map", "native_modules.gradle" ], "devDependencies": { diff --git a/packages/platform-ios/package.json b/packages/platform-ios/package.json index 8cbb0e66d..b73aa0f87 100644 --- a/packages/platform-ios/package.json +++ b/packages/platform-ios/package.json @@ -19,6 +19,7 @@ }, "files": [ "build", + "!build/**/*.map", "native_modules.rb" ] } diff --git a/packages/tools/package.json b/packages/tools/package.json index 382487f03..5e1206441 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -18,6 +18,10 @@ "@types/node-fetch": "^2.3.3" }, "files": [ - "build" - ] + "build", + "!build/**/*.map" + ], + "scripts": { + "link-package": "yarn link" + } } diff --git a/scripts/build.js b/scripts/build.js index b0c10568d..fc2f39d5a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -93,9 +93,17 @@ function buildFile(file, silent) { ); } else { const options = Object.assign({}, transformOptions); - const transformed = babel.transformFileSync(file, options).code; + const filename = path.basename(destPath); - fs.writeFileSync(destPath, transformed); + let {code, map} = babel.transformFileSync(file, options); + + if (!file.endsWith('.d.ts') && map.sources.length > 0) { + code = `${code}\n\n//# sourceMappingURL=${filename}.map`; + map.sources = [path.relative(path.dirname(destPath), file)]; + fs.writeFileSync(`${destPath}.map`, JSON.stringify(map)); + } + + fs.writeFileSync(destPath, code); silent || process.stdout.write( From c57f6af10703165a441b2f8e96933338a8b94305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Molleda?= Date: Thu, 20 Feb 2020 04:10:45 -0800 Subject: [PATCH 2/5] chore: get coverage for all files --- jest.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 5efa27582..ccca74041 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,5 +15,8 @@ module.exports = { testMatch: ['/**/__tests__/*{.,-}test.[jt]s'], }, ], - collectCoverageFrom: ['packages/**/src/**/*.ts'], + collectCoverageFrom: [ + '/packages/**/src/**/*.ts', + '/!packages/cli-types/src/**/*.ts', + ], }; From 3c349725a1bbeec23a623005b5ddd4da294acbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Mon, 24 Feb 2020 20:07:57 +0100 Subject: [PATCH 3/5] update collectCoverageFrom --- jest.config.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jest.config.js b/jest.config.js index ccca74041..09aa62018 100644 --- a/jest.config.js +++ b/jest.config.js @@ -16,7 +16,9 @@ module.exports = { }, ], collectCoverageFrom: [ - '/packages/**/src/**/*.ts', - '/!packages/cli-types/src/**/*.ts', + '**/packages/*/**/*.ts', + '!**/__mocks__/**', + '!**/__tests__/**', + '!**/build/**', ], }; From 8acf81c89c6353f69123b43eb1db9588e5d33255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Mon, 24 Feb 2020 20:31:10 +0100 Subject: [PATCH 4/5] add files entry to cli-types --- packages/cli-types/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/cli-types/package.json b/packages/cli-types/package.json index d128a06f9..932812119 100644 --- a/packages/cli-types/package.json +++ b/packages/cli-types/package.json @@ -5,6 +5,10 @@ "publishConfig": { "access": "public" }, + "files": [ + "build", + "!build/**/*.map" + ], "types": "build/index.d.ts", "license": "MIT" } From e20d5c62f9b4e761566091c5d1d9da703d63c760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Mon, 24 Feb 2020 20:36:17 +0100 Subject: [PATCH 5/5] remove scripts from tools --- packages/tools/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/tools/package.json b/packages/tools/package.json index 5e1206441..e99ac14eb 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -20,8 +20,5 @@ "files": [ "build", "!build/**/*.map" - ], - "scripts": { - "link-package": "yarn link" - } + ] }