Skip to content

Commit 0723120

Browse files
authored
Merge branch 'develop' into sig/next-bundler-optimization
2 parents 5e920b8 + fd49d0b commit 0723120

File tree

86 files changed

+1840
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1840
-533
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ jobs:
9696
profiling_node:
9797
- 'packages/profiling-node/**'
9898
- 'dev-packages/e2e-tests/test-applications/node-profiling/**'
99+
any_code:
100+
- '!**/*.md'
99101
100102
101103
- name: Get PR labels
@@ -109,6 +111,8 @@ jobs:
109111
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
110112
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
111113
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
114+
changed_any_code: ${{ steps.changed.outputs.any_code == 'true' }}
115+
112116
# When merging into master, or from master
113117
is_gitflow_sync: ${{ github.head_ref == 'master' || github.ref == 'refs/heads/master' }}
114118
has_gitflow_label:
@@ -123,6 +127,7 @@ jobs:
123127
runs-on: ubuntu-20.04
124128
timeout-minutes: 15
125129
if: |
130+
(needs.job_get_metadata.outputs.changed_any_code) &&
126131
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
127132
steps:
128133
- name: Check out base commit (${{ github.event.pull_request.base.sha }})
@@ -274,24 +279,37 @@ jobs:
274279

275280
job_check_format:
276281
name: Check file formatting
277-
needs: [job_get_metadata, job_build]
282+
needs: [job_get_metadata]
278283
timeout-minutes: 10
279284
runs-on: ubuntu-20.04
280285
steps:
281286
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
282287
uses: actions/checkout@v4
283288
with:
284289
ref: ${{ env.HEAD_COMMIT }}
290+
285291
- name: Set up Node
286292
uses: actions/setup-node@v4
287293
with:
288294
node-version-file: 'package.json'
295+
296+
# we use a hash of yarn.lock as our cache key, because if it hasn't changed, our dependencies haven't changed,
297+
# so no need to reinstall them
298+
- name: Compute dependency cache key
299+
id: compute_lockfile_hash
300+
run: echo "hash=${{ hashFiles('yarn.lock', '**/package.json') }}" >> "$GITHUB_OUTPUT"
301+
289302
- name: Check dependency cache
290-
uses: actions/cache/restore@v4
303+
uses: actions/cache@v4
304+
id: cache_dependencies
291305
with:
292306
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
293-
key: ${{ needs.job_build.outputs.dependency_cache_key }}
294-
fail-on-cache-miss: true
307+
key: ${{ steps.compute_lockfile_hash.outputs.hash }}
308+
309+
- name: Install dependencies
310+
if: steps.cache_dependencies.outputs.cache-hit != 'true'
311+
run: yarn install --ignore-engines --frozen-lockfile
312+
295313
- name: Check file formatting
296314
run: yarn lint:prettier && yarn lint:biome
297315

@@ -867,6 +885,7 @@ jobs:
867885
'create-remix-app-express',
868886
'create-remix-app-express-legacy',
869887
'create-remix-app-express-vite-dev',
888+
'default-browser',
870889
'node-express-esm-loader',
871890
'node-express-esm-preload',
872891
'node-express-esm-without-loader',

.size-limit.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module.exports = [
5555
path: 'packages/browser/build/npm/esm/index.js',
5656
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
5757
gzip: true,
58-
limit: '90 KB',
58+
limit: '91 KB',
5959
},
6060
{
6161
name: '@sentry/browser (incl. Tracing, Replay, Feedback, metrics)',
@@ -143,7 +143,7 @@ module.exports = [
143143
name: 'CDN Bundle (incl. Tracing)',
144144
path: createCDNPath('bundle.tracing.min.js'),
145145
gzip: true,
146-
limit: '37 KB',
146+
limit: '38 KB',
147147
},
148148
{
149149
name: 'CDN Bundle (incl. Tracing, Replay)',
@@ -170,7 +170,7 @@ module.exports = [
170170
path: createCDNPath('bundle.tracing.min.js'),
171171
gzip: false,
172172
brotli: false,
173-
limit: '110 KB',
173+
limit: '111 KB',
174174
},
175175
{
176176
name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
@@ -193,7 +193,7 @@ module.exports = [
193193
import: createImport('init'),
194194
ignore: ['next/router', 'next/constants'],
195195
gzip: true,
196-
limit: '38.03 KB',
196+
limit: '39 KB',
197197
},
198198
// SvelteKit SDK (ESM)
199199
{

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
1212

13-
Work in this release was contributed by @MonstraG. Thank you for your contribution!
13+
Work in this release was contributed by @MonstraG, @undead-voron and @Zen-cronic. Thank you for your contributions!
1414

1515
## 8.25.0
1616

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import * as Sentry from '@sentry/browser';
2+
3+
window.Sentry = Sentry;
4+
5+
Sentry.init({
6+
dsn: 'https://[email protected]/1337',
7+
integrations: [
8+
Sentry.browserTracingIntegration({
9+
idleTimeout: 9000,
10+
_experiments: {
11+
enableStandaloneClsSpans: true,
12+
},
13+
}),
14+
],
15+
tracesSampleRate: 1,
16+
debug: true,
17+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { simulateCLS } from '../../../../utils/web-vitals/cls.ts';
2+
3+
// Simulate Layout shift right at the beginning of the page load, depending on the URL hash
4+
// don't run if expected CLS is NaN
5+
const expectedCLS = Number(location.hash.slice(1));
6+
if (expectedCLS && expectedCLS >= 0) {
7+
simulateCLS(expectedCLS).then(() => window.dispatchEvent(new Event('cls-done')));
8+
}
9+
10+
// Simulate layout shift whenever the trigger-cls event is dispatched
11+
// Cannot trigger cia a button click because expected layout shift after
12+
// an interaction doesn't contribute to CLS.
13+
window.addEventListener('trigger-cls', () => {
14+
simulateCLS(0.1).then(() => {
15+
window.dispatchEvent(new Event('cls-done'));
16+
});
17+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
</head>
6+
<body>
7+
<div id="content"></div>
8+
<p>
9+
Some content
10+
</p>
11+
</body>
12+
</html>

0 commit comments

Comments
 (0)