Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix: Change Vue interface to be inline with the original types #2634

Merged
merged 3 commits into from Jun 5, 2020
Merged

fix: Change Vue interface to be inline with the original types #2634

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d000285
fix: Change Vue interface to be inline with the original types
kamilogorek Jun 3, 2020
ec6bce6
Merge branch 'master' into vue-types
HazAT Jun 4, 2020
ff87d93
Merge branch 'master' into vue-types
kamilogorek Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions packages/integrations/src/vue.ts
View file
Open in desktop
Expand Up @@ -11,11 +11,11 @@ const TRACING_GETTER = ({

/** Global Vue object limited to the methods/attributes we require */
interface VueInstance {
config?: {
config: {
errorHandler?(error: Error, vm?: ViewModel, info?: string): void; // tslint:disable-line:completed-docs
};
mixin(hooks: { [key: string]: () => void }): void; // tslint:disable-line:completed-docs
util: {
util?: {
warn(...input: any): void; // tslint:disable-line:completed-docs
};
}
Expand Down Expand Up @@ -338,11 +338,6 @@ export class Vue implements Integration {

/** Inject Sentry's handler into owns Vue's error handler */
private _attachErrorHandler(getCurrentHub: () => Hub): void {
if (!this._options.Vue.config) {
logger.error('Vue instance is missing required `config` attribute');
return;
}

const currentErrorHandler = this._options.Vue.config.errorHandler; // tslint:disable-line:no-unbound-method

this._options.Vue.config.errorHandler = (error: Error, vm?: ViewModel, info?: string): void => {
Expand Down Expand Up @@ -379,7 +374,9 @@ export class Vue implements Integration {
}

if (this._options.logErrors) {
this._options.Vue.util.warn(`Error in ${info}: "${error.toString()}"`, vm);
if (this._options.Vue.util) {
this._options.Vue.util.warn(`Error in ${info}: "${error.toString()}"`, vm);
}
console.error(error); // tslint:disable-line:no-console
}
};
Expand Down