Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✅ [RUMF-1090] update minimal version to 3.8.2 #1219

Merged
merged 4 commits into from
Dec 16, 2021
Merged

✅ [RUMF-1090] update minimal version to 3.8.2 #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a8cdd8
✅ [RUMF-1090] update minimal version to 3.8.2
BenoitZugmeyer Dec 14, 2021
71127e1
👌 update mentions of TS 3.0
BenoitZugmeyer Dec 15, 2021
48e29b3
🔥 remove typings utilities now available in TS
BenoitZugmeyer Dec 15, 2021
1352032
Merge remote-tracking branch 'origin/prerelease-v4' into benoit/incre…
BenoitZugmeyer Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/domain/internalMonitoring/internalMonitoring.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Context } from '../../tools/context'
import { display } from '../../tools/display'
import { toStackTraceString } from '../../tools/error'
import { assign, combine, jsonStringify, Parameters, ThisParameterType } from '../../tools/utils'
import { assign, combine, jsonStringify } from '../../tools/utils'
import { canUseEventBridge, getEventBridge } from '../../transport'
import { Configuration } from '../configuration'
import { computeStackTrace } from '../tracekit'
Expand Down
8 changes: 0 additions & 8 deletions packages/core/src/tools/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,3 @@ export function combine(...sources: any[]): unknown {

return destination as unknown
}

// Define those utilities for TS 3.0 compatibility
// https://www.typescriptlang.org/docs/handbook/utility-types.html#thisparametertypetype
export type ThisParameterType<T> = T extends (this: infer U, ...args: any[]) => any ? U : unknown
// https://www.typescriptlang.org/docs/handbook/utility-types.html#parameterstype
export type Parameters<T extends (...args: any[]) => any> = T extends (...args: infer P) => any ? P : never
// https://www.typescriptlang.org/docs/handbook/utility-types.html#omittype-keys
export type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>
2 changes: 1 addition & 1 deletion packages/logs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ To receive all logs and errors, load and configure the SDK at the beginning of t

### TypeScript

Types are compatible with TypeScript >= 3.0. For earlier versions, import JS sources and use global variables to avoid any compilation issues:
Types are compatible with TypeScript >= 3.8.2. For earlier versions, import JS sources and use global variables to avoid any compilation issues:

```typescript
import '@datadog/browser-logs/bundle/datadog-logs'
Expand Down
1 change: 0 additions & 1 deletion packages/rum-core/src/browser/performanceCollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
getRelativeTime,
isNumber,
monitor,
Omit,
relativeNow,
RelativeTime,
runOnReadyState,
Expand Down
1 change: 0 additions & 1 deletion packages/rum-core/src/domainContext.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Keep these types in a separate file in order to reference it from the official doc
*/

import { Omit } from '@datadog/browser-core'
import { RumEventType } from './rawRumEvent.types'

export type RumEventDomainContext<T extends RumEventType = any> = T extends RumEventType.VIEW
Expand Down
2 changes: 1 addition & 1 deletion packages/rum/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Add the generated code snippet to the head tag (in front of any other script tag

### TypeScript

Types are compatible with TypeScript >= 3.0. For earlier versions, import JS sources and use global variables to avoid any compilation issues:
Types are compatible with TypeScript >= 3.8.2. For earlier versions, import JS sources and use global variables to avoid any compilation issues:

```javascript
import '@datadog/browser-rum/bundle/datadog-rum'
Expand Down
2 changes: 1 addition & 1 deletion scripts/cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ cmd_check_typescript_compatibility () {
yarn build
cd test/app
rm -rf node_modules
check_typescript_3_compatibility || fail 'typescript@3.0 compatibility broken'
check_typescript_3_compatibility || fail 'typescript@3.8.2 compatibility broken'
check_typescript_latest_compatibility || fail 'typescript@latest compatibility broken'
}

Expand Down
2 changes: 1 addition & 1 deletion test/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"ts-loader": "6.2.1",
"typescript": "3.0.1",
"typescript": "3.8.2",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stable 3.8.0 and 3.8.1 don't exist: they were used as dev and rc versions. Let's use the first 3.8 stable version, which is 3.8.2

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update RUM and Logs Readme where we mention:

Types are compatible with TypeScript >= 3.0

"webpack": "5.28.0"
}
}
8 changes: 4 additions & 4 deletions test/app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,10 @@ tslib@^1.10.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

typescript@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
integrity sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==
typescript@3.8.2:
version "3.8.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==

uri-js@^4.2.2:
version "4.4.1"
Expand Down