ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

ref!: Don't polyfill optional chaining and nullish coalescing#14603

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

Merged
lforst merged 6 commits into from
Dec 13, 2024
Merged

ref!: Don't polyfill optional chaining and nullish coalescing #14603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7846b24
ci(v9): Ensure CI runs on v8 & v9 branches (#14604)
mydea Dec 6, 2024
b9498ca
ref!: Don't polyfill optional chaining and nullish coalescing
Dec 6, 2024
d1ee444
feat(vue/nuxt)!: No longer create `"update"` spans for component trac…
Dec 10, 2024
26119bf
feat(nextjs)!: Remove `experimental_captureRequestError` (#14607)
Dec 10, 2024
47c0e13
Merge branch 'v9' into lforst-rip-polyfills
Dec 10, 2024
d7d8fc2
Remove lint rules
Dec 11, 2024
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
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ on:
branches:
- develop
- master
- v9

@mydeamydeaDec 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm why is this showing up here like this, are these changes not already on the v9 branch? is this just a GH UI problem?

@lforstlforstDec 12, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

yeah super weird, idk 🤔 the changes are definitely on v9

- v8
- release/**
pull_request:
merge_group:
Expand DownExpand Up@@ -105,7 +107,7 @@ jobs:
outputs:
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
Expand All@@ -126,7 +128,7 @@ jobs:
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
needs.job_get_metadata.outputs.is_develop == 'true' ||
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true' ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
steps:
Expand DownExpand Up@@ -171,7 +173,7 @@ jobs:
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
restore-keys:
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}

- name: Build packages
# Set the CODECOV_TOKEN for Bundle Analysis
Expand DownExpand Up@@ -219,7 +221,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-20.04
if:
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
needs.job_get_metadata.outputs.is_release == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/enforce-license-compliance.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"

on:
push:
branches: [master, develop, release/*]
branches:
- develop
- master
- v9
- v8
- release/**
pull_request:
branches: [master, develop]
branches:
- develop
- master
- v9
- v8

jobs:
enforce-license-compliance:
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,9 @@
"@trpc/react-query": "^11.0.0-rc.446",
"@trpc/server": "^11.0.0-rc.446",
"geist": "^1.3.0",
"next": "^14.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/nextjs-t3/src/trpc/server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
Expand All@@ -12,16 +11,16 @@ import { createQueryClient } from './query-client';
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = cache(() => {
const createContext = () => {
const heads = new Headers(headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
});
};

const getQueryClient = cache(createQueryClient);
const getQueryClient = createQueryClient;
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
6 changes: 0 additions & 6 deletions dev-packages/rollup-utils/npmHelpers.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ import { defineConfig } from 'rollup';
import {
makeCleanupPlugin,
makeDebugBuildStatementReplacePlugin,
makeExtractPolyfillsPlugin,
makeImportMetaUrlReplacePlugin,
makeNodeResolvePlugin,
makeRrwebBuildPlugin,
Expand DownExpand Up@@ -44,7 +43,6 @@ export function makeBaseNPMConfig(options = {}) {
const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
const cleanupPlugin = makeCleanupPlugin();
const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
const rrwebBuildPlugin = makeRrwebBuildPlugin({
excludeShadowDom: undefined,
excludeIframe: undefined,
Expand DownExpand Up@@ -121,10 +119,6 @@ export function makeBaseNPMConfig(options = {}) {
],
};

if (addPolyfills) {
defaultBaseConfig.plugins.push(extractPolyfillsPlugin);
}

return deepMerge(defaultBaseConfig, packageSpecificConfig, {
// Plugins have to be in the correct order or everything breaks, so when merging we have to manually re-order them
customMerge: key => (key === 'plugins' ? mergePlugins : undefined),
Expand Down
214 changes: 0 additions & 214 deletions dev-packages/rollup-utils/plugins/extractPolyfillsPlugin.mjs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dev-packages/rollup-utils/plugins/npmPlugins.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,5 +173,3 @@ export function makeCodeCovPlugin() {
uploadToken: process.env.CODECOV_TOKEN,
});
}

export { makeExtractPolyfillsPlugin } from './extractPolyfillsPlugin.mjs';
8 changes: 0 additions & 8 deletions dev-packages/test-utils/.eslintrc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,4 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['**/*.ts'],
rules: {
'@sentry-internal/sdk/no-optional-chaining': 'off',
},
},
],
};
22 changes: 22 additions & 0 deletions docs/migration/draft-v9-migration-guide.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,28 @@
});
```

## `@sentry/nuxt` and `@sentry/vue`

- When component tracking is enabled, "update" spans are no longer created by default.
Add an `"update"` item to the `tracingOptions.hooks` option via the `vueIntegration()` to restore this behavior.

```ts
Sentry.init({
integrations: [
Sentry.vueIntegration({
tracingOptions: {
trackComponents: true,
hooks: [
'mount',
'update', // <--
'unmount',
],
},
}),
],
});
```

## `@sentry/astro`

- Deprecated passing `dsn`, `release`, `environment`, `sampleRate`, `tracesSampleRate`, `replaysSessionSampleRate` to the integration. Use the runtime-specific `Sentry.init()` calls for passing these options instead.
Expand Down
Loading