Skip to content

Commit

Permalink
chore(ts): Replace sentry/typescript by sentry-internal/typescript (
Browse files Browse the repository at this point in the history
#3407)

Co-authored-by: Krystof Woldrich <krystof.woldrich@sentry.io>
  • Loading branch information
lucas-zimerman and krystofwoldrich authored Nov 29, 2023
1 parent 058f59d commit 886c728
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 104 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "7.81.1",
"@sentry-internal/eslint-plugin-sdk": "7.81.1",
"@sentry/typescript": "^5.20.1",
"@sentry-internal/typescript": "7.80.0",
"@sentry/wizard": "3.16.3",
"@types/jest": "^29.5.3",
"@types/node": "^20.9.3",
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-javascript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

tagPrefix=''
repo="https://github.com/getsentry/sentry-javascript.git"
packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/types' '@sentry/utils')
packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/types' '@sentry/utils' '@sentry-internal/typescript')
packages+=('@sentry-internal/eslint-config-sdk' '@sentry-internal/eslint-plugin-sdk')

. $(dirname "$0")/update-package-json.sh
7 changes: 3 additions & 4 deletions src/js/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {
export type {
Breadcrumb,
Request,
SdkInfo,
Expand Down Expand Up @@ -51,7 +51,7 @@ export { lastEventId } from '@sentry/browser';

import * as Integrations from './integrations';
import { SDK_NAME, SDK_VERSION } from './version';
export { ReactNativeOptions } from './options';
export type { ReactNativeOptions } from './options';
export { ReactNativeClient } from './client';

export {
Expand All @@ -78,8 +78,7 @@ export {
ReactNavigationInstrumentation,
ReactNativeNavigationInstrumentation,
RoutingInstrumentation,
ReactNavigationTransactionContext,
sentryTraceGesture,
} from './tracing';

export type { ReactNavigationTransactionContext } from './tracing';
export { Integrations, SDK_NAME, SDK_VERSION };
5 changes: 3 additions & 2 deletions src/js/tracing/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export { ReactNativeTracing } from './reactnativetracing';

export { RoutingInstrumentation, RoutingInstrumentationInstance } from './routingInstrumentation';
export type { RoutingInstrumentationInstance } from './routingInstrumentation';
export { RoutingInstrumentation } from './routingInstrumentation';

export {
ReactNavigationInstrumentation,
Expand All @@ -10,7 +11,7 @@ export {
export { ReactNavigationV4Instrumentation } from './reactnavigationv4';
export { ReactNativeNavigationInstrumentation } from './reactnativenavigation';

export { ReactNavigationCurrentRoute, ReactNavigationRoute, ReactNavigationTransactionContext } from './types';
export type { ReactNavigationCurrentRoute, ReactNavigationRoute, ReactNavigationTransactionContext } from './types';

export { ReactNativeProfiler } from './reactnativeprofiler';

Expand Down
21 changes: 6 additions & 15 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
{
"extends": "./node_modules/@sentry/typescript/tsconfig.json",
"include": [
"src/js/*.ts",
"typings/react-native.d.ts"
],
"exclude": [
"node_modules"
],
"extends": "./node_modules/@sentry-internal/typescript/tsconfig.json",
"include": ["src/js/*.ts", "typings/react-native.d.ts"],
"exclude": ["node_modules"],
"compilerOptions": {
"baseUrl": ".",
"outDir": "dist",
"rootDir": "src",
"lib": [
"es7"
],
"lib": ["es7"],
"jsx": "react-native",
"types": [
"react-native"
],
"types": ["react-native"],
"target": "es6",
"module": "es6",
"skipLibCheck": true,
"allowSyntheticDefaultImports": true,
"strictBindCallApply": true,
"strictBindCallApply": true
}
}
20 changes: 6 additions & 14 deletions tsconfig.build.tools.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
{
"extends": "./node_modules/@sentry/typescript/tsconfig.json",
"include": [
"src/js/tools/**/*.ts"
],
"exclude": [
"node_modules"
],
"extends": "./node_modules/@sentry-internal/typescript/tsconfig.json",
"include": ["src/js/tools/**/*.ts"],
"exclude": ["node_modules"],
"compilerOptions": {
"baseUrl": ".",
"outDir": "dist",
"rootDir": "src",
"lib": [
"es7"
],
"types": [
"node"
],
"lib": ["es7"],
"types": ["node"],
"target": "es6",
"module": "CommonJS",
"skipLibCheck": true,
"allowSyntheticDefaultImports": true,
"allowSyntheticDefaultImports": true
}
}
74 changes: 7 additions & 67 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1309,25 +1309,6 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"

"@fimbul/bifrost@^0.21.0":
version "0.21.0"
resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
dependencies:
"@fimbul/ymir" "^0.21.0"
get-caller-file "^2.0.0"
tslib "^1.8.1"
tsutils "^3.5.0"

"@fimbul/ymir@^0.21.0":
version "0.21.0"
resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
dependencies:
inversify "^5.0.0"
reflect-metadata "^0.1.12"
tslib "^1.8.1"

"@hapi/hoek@^9.0.0":
version "9.3.0"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
Expand Down Expand Up @@ -1975,6 +1956,11 @@
"@sentry/types" "7.81.1"
"@sentry/utils" "7.81.1"

"@sentry-internal/typescript@7.80.0":
version "7.80.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-7.80.0.tgz#30cae7c5bd8049f1a4083de351f396091d749e60"
integrity sha512-CXXh8vm4a0ZJhlMv4YcapeDmJh1pGtlO7wsdmur4Pu2YF+32z8lDxE5sKrItSdgu7RX5eR7aGQGiJI+YKZgsDQ==

"@sentry-internal/typescript@7.81.1":
version "7.81.1"
resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-7.81.1.tgz#135fe95602eeae338f8decc57cd8ab4deae6e251"
Expand Down Expand Up @@ -2091,14 +2077,6 @@
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.81.1.tgz#2b2551fc291e1089651fd574a68f7c4175878bd5"
integrity sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==

"@sentry/typescript@^5.20.1":
version "5.20.1"
resolved "https://registry.yarnpkg.com/@sentry/typescript/-/typescript-5.20.1.tgz#84133b3b8152367c936dbd573afe9e7a80c5f442"
integrity sha512-RX3552k9LTANNXs9TeE1KhKOD+jfmVGpq81LT568cYmzv+fVVK/m2pynuh7SoAGqrJHirurA/IVLpt3bpnA4pw==
dependencies:
tslint-config-prettier "^1.18.0"
tslint-consistent-codestyle "^1.15.1"

"@sentry/utils@7.76.0":
version "7.76.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.76.0.tgz#6b540b387d3ac539abd20978f4d3ae235114f6ab"
Expand Down Expand Up @@ -4381,7 +4359,7 @@ gensync@^1.0.0-beta.2:
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==

get-caller-file@^2.0.0, get-caller-file@^2.0.1, get-caller-file@^2.0.5:
get-caller-file@^2.0.1, get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
Expand Down Expand Up @@ -4779,11 +4757,6 @@ invariant@*, invariant@^2.2.4:
dependencies:
loose-envify "^1.0.0"

inversify@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.0.1.tgz#500d709b1434896ce5a0d58915c4a4210e34fb6e"
integrity sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ==

ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
Expand Down Expand Up @@ -7382,11 +7355,6 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"

reflect-metadata@^0.1.12:
version "0.1.13"
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==

regenerate-unicode-properties@^10.1.0:
version "10.1.0"
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
Expand Down Expand Up @@ -8285,7 +8253,7 @@ tsconfig-paths@^3.9.0:
minimist "^1.2.0"
strip-bom "^3.0.0"

tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
tslib@^1.8.1, tslib@^1.9.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
Expand All @@ -8300,41 +8268,13 @@ tslib@^2.3.1:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

tslint-config-prettier@^1.18.0:
version "1.18.0"
resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==

tslint-consistent-codestyle@^1.15.1:
version "1.16.0"
resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
dependencies:
"@fimbul/bifrost" "^0.21.0"
tslib "^1.7.1"
tsutils "^2.29.0"

tsutils@^2.29.0:
version "2.29.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
dependencies:
tslib "^1.8.1"

tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
dependencies:
tslib "^1.8.1"

tsutils@^3.5.0:
version "3.17.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
dependencies:
tslib "^1.8.1"

type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
Expand Down

0 comments on commit 886c728

Please sign in to comment.