Skip to content

Commit da537ef

Browse files
author
farfromrefug
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .gitignore # CHANGELOG.md # demo-snippets/vue/install.ts # demo-snippets/webpack.config.vue.js # demo-vue # docs/assets/navigation.js # docs/assets/search.js # lerna.json # packages/sentry/CHANGELOG.md # packages/sentry/integrations/default.js # packages/sentry/package.json # src/sentry/client.ts # src/sentry/index.ts # src/sentry/integrations/default.ts # src/sentry/wrapper.ios.ts # tools # yarn.lock
2 parents ce2893f + 0c77c99 commit da537ef

File tree

17 files changed

+719
-70
lines changed

17 files changed

+719
-70
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ packages/typings
5858
packages/**/*.ngsummary.json
5959
packages/**/*.metadata.json
6060

61+
.vscode/settings.json
6162
/blueprint.md

.vscode/launch.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Launch on iOS",
9+
"type": "nativescript",
10+
"request": "launch",
11+
"platform": "ios",
12+
"appRoot": "${workspaceRoot}",
13+
"sourceMaps": true,
14+
"watch": true
15+
},
16+
{
17+
"name": "Attach on iOS",
18+
"type": "nativescript",
19+
"request": "attach",
20+
"platform": "ios",
21+
"appRoot": "${workspaceRoot}",
22+
"sourceMaps": true,
23+
"watch": false
24+
},
25+
{
26+
"name": "Launch on Android",
27+
"type": "nativescript",
28+
"request": "launch",
29+
"platform": "android",
30+
"appRoot": "${workspaceRoot}",
31+
"sourceMaps": true,
32+
"watch": true
33+
},
34+
{
35+
"name": "Attach on Android",
36+
"type": "nativescript",
37+
"request": "attach",
38+
"platform": "android",
39+
"appRoot": "${workspaceRoot}",
40+
"sourceMaps": true,
41+
"watch": false
42+
}
43+
]
44+
}

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.6.26](https://github.com/nativescript-community/sentry/compare/v4.6.25...v4.6.26) (2024-03-01)
7+
8+
### Bug Fixes
9+
10+
* **ios:** try to get callstack/sourcemaps to work all the time ([0e55045](https://github.com/nativescript-community/sentry/commit/0e55045b636791783937edb386ddd0865b780479))
11+
12+
## [4.6.25](https://github.com/nativescript-community/sentry/compare/v4.6.24...v4.6.25) (2024-02-29)
13+
14+
### Bug Fixes
15+
16+
* **ios:** better error handling ([21f6386](https://github.com/nativescript-community/sentry/commit/21f638672e980843c847322bab5a3276e4dbbd64))
17+
618
## [4.6.24](https://github.com/nativescript-community/sentry/compare/v4.6.23...v4.6.24) (2024-02-28)
719

820
**Note:** Version bump only for package sentry

demo-snippets/vue/install.ts

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'nativescript-vue';
22
import * as Sentry from '@nativescript-community/sentry';
33
import * as Tracing from '@nativescript-community/sentry/tracing';
4-
import { Application, NavigatedData, Page, Trace, Utils, View } from '@nativescript/core';
4+
import { Application, NavigatedData, Page, Trace, TraceErrorHandler, Utils, View } from '@nativescript/core';
55
import { on as applicationOn, launchEvent } from '@nativescript/core/application';
66
import Basic from './Basic';
77

@@ -19,23 +19,25 @@ async function startSentry() {
1919
dsn: SENTRY_DSN,
2020
debug: true,
2121
enablePerformanceV2: true,
22+
appPrefix: '~/',
2223
release: `${__APP_ID__}@${__APP_VERSION__}+${__APP_BUILD_NUMBER__}`,
2324
dist: `${__APP_BUILD_NUMBER__}.${__ANDROID__ ? 'android' : 'ios'}`,
2425
flushSendEvent: true,
2526
enableNativeCrashHandling: true,
2627
attachScreenshot: true,
27-
tracesSampleRate: 1.0,
28-
sampleRate: 1.0,
29-
enableAutoPerformanceTracking: true,
30-
enableAutoSessionTracking: true,
31-
integrations: [
32-
new Tracing.NativescriptTracing({
33-
enableAppStartTracking: true,
34-
enableNativeFramesTracking: true,
35-
// routingInstrumentation: HttpService.sentryTracing,
36-
enableStallTracking: true
37-
})
38-
],
28+
// tracesSampleRate: 1.0,
29+
// sampleRate: 1.0,
30+
enableCrashHandler: false, // iOS
31+
// enableAutoPerformanceTracking: true,
32+
// enableAutoSessionTracking: true,
33+
// integrations: [
34+
// new Tracing.NativescriptTracing({
35+
// enableAppStartTracking: true,
36+
// enableNativeFramesTracking: true,
37+
// // routingInstrumentation: HttpService.sentryTracing,
38+
// enableStallTracking: true
39+
// })
40+
// ],
3941
enableUIViewControllerTracing: false,
4042
enableUserInteractionTracing: false,
4143
enableAutoBreadcrumbTracking: false
@@ -76,6 +78,18 @@ async function startSentry() {
7678
}
7779
});
7880
});
81+
const errorHandler: TraceErrorHandler = {
82+
handlerError(err) {
83+
Sentry.captureException(err);
84+
}
85+
};
86+
Application.on(Application.uncaughtErrorEvent, (event) => {
87+
Sentry.captureException(event.error);
88+
});
89+
Application.on(Application.discardedErrorEvent, (event) => {
90+
Sentry.captureException(event.error);
91+
});
92+
Trace.setErrorHandler(errorHandler);
7993
setTimeout(() => {
8094
Sentry.withScope((scope) => {
8195
try {

demo-snippets/webpack.config.vue.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ module.exports.onWebpackConfig = function (config, env, params) {
1414
console.log('test', env, params, dist);
1515
const projectRoot = nsWebpack.Utils.project.getProjectRootPath();
1616
const appResourcesPath = env.appResourcesPath;
17-
18-
const coreModulesPackageName = env.fork ? '@akylas/nativescript' : '@nativescript/core';
19-
if (env.fork) {
20-
config.resolve.modules = [resolve(projectRoot, `node_modules/${coreModulesPackageName}`), resolve(projectRoot, 'node_modules'), `node_modules/${coreModulesPackageName}`, 'node_modules'];
21-
Object.assign(config.resolve.alias, {
22-
'@nativescript/core': `${coreModulesPackageName}`,
23-
'tns-core-modules': `${coreModulesPackageName}`
24-
});
25-
}
26-
2717
let appVersion;
2818
let buildNumber;
2919
if (platform === 'android') {
@@ -65,7 +55,7 @@ module.exports.onWebpackConfig = function (config, env, params) {
6555
cleanArtifacts: true
6656
},
6757
sourcemaps: {
68-
rewriteSources: (source, map) => source.replace('webpack:///', 'webpack://'),
58+
rewriteSources: (source, map) => source.replace('webpack:///', '~/'),
6959
ignore: ['tns-java-classes', 'hot-update'],
7060
assets: [dist + '/**/*.js', join(dist, process.env.SOURCEMAP_REL_DIR) + '/*.map']
7161
}

docs/assets/navigation.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/search.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)