Skip to content

Commit 5b05cc1

Browse files
committed
Use new defaults
1 parent 1e59b6c commit 5b05cc1

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/browser/bundles/rollbar.snippet.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/* global __DEFAULT_ROLLBARJS_URL__:false */
21
/* global _rollbarConfig:true */
32

43
import * as Shim from '../shim.js';
54
import snippetCallback from '../snippet_callback.js';
5+
import { defaultRollbarJsUrl } from '../defaults.js';
66

77
_rollbarConfig = _rollbarConfig || {};
8-
_rollbarConfig.rollbarJsUrl = _rollbarConfig.rollbarJsUrl || __DEFAULT_ROLLBARJS_URL__;
8+
_rollbarConfig.rollbarJsUrl = _rollbarConfig.rollbarJsUrl || defaultRollbarJsUrl;
99
_rollbarConfig.async = _rollbarConfig.async === undefined || _rollbarConfig.async;
1010

1111
var shim = Shim.setupShim(window, _rollbarConfig);

src/browser/plugins/jquery.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* globals jQuery */
2-
/* globals __JQUERY_PLUGIN_VERSION__ */
2+
3+
import { jqueryPluginVersion } from '../defaults.js';
34

45
(function (jQuery, window, document) {
56
var rb = window.Rollbar;
67
if (!rb) {
78
return;
89
}
910

10-
var JQUERY_PLUGIN_VERSION = __JQUERY_PLUGIN_VERSION__;
11+
var JQUERY_PLUGIN_VERSION = jqueryPluginVersion;
1112

1213
rb.configure({
1314
payload: {

src/react-native/rollbar.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import packageJson from '../../package.json' with { type: 'json' };
21
import Client from '../rollbar.js';
32
import * as _ from '../utility.js';
43
import API from '../api.js';
54
import logger from './logger.js';
5+
import * as rnDefaults from './defaults.js';
6+
import { version, reportLevel } from '../defaults.js';
67

78
import Transport from './transport.js';
89
import * as urllib from '../browser/url.js';
@@ -330,14 +331,13 @@ Rollbar.defaultOptions = {
330331
framework: 'react-native',
331332
showReportedMessageTraces: false,
332333
notifier: {
333-
name: 'rollbar-react-native',
334-
version: packageJson.version,
334+
name: rnDefaults.notifierName,
335+
version: version,
335336
},
336-
scrubHeaders: packageJson.defaults.server.scrubHeaders,
337-
scrubFields: packageJson.defaults.server.scrubFields,
338-
reportLevel: packageJson.defaults.reportLevel,
339-
rewriteFilenamePatterns:
340-
packageJson.defaults.reactNative.rewriteFilenamePatterns,
337+
scrubHeaders: rnDefaults.scrubHeaders,
338+
scrubFields: rnDefaults.scrubFields,
339+
reportLevel: reportLevel,
340+
rewriteFilenamePatterns: rnDefaults.rewriteFilenamePatterns,
341341
verbose: false,
342342
enabled: true,
343343
transmit: true,

src/server/rollbar.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import util from 'util';
22
import os from 'os';
33

4-
import { createRequire } from 'module';
5-
const packageJson = createRequire(import.meta.url)('../../package.json');
6-
74
import Client from '../rollbar.js';
85
import * as _ from '../utility.js';
96
import API from '../api.js';
107
import logger from './logger.js';
8+
import * as serverDefaults from './defaults.js';
9+
import { version, reportLevel } from '../defaults.js';
1110

1211
import Transport from './transport.js';
1312
import urllib from 'url';
@@ -739,13 +738,13 @@ Rollbar.defaultOptions = {
739738
framework: 'node-js',
740739
showReportedMessageTraces: false,
741740
notifier: {
742-
name: 'node_rollbar',
743-
version: packageJson.version,
741+
name: serverDefaults.notifierName,
742+
version: version,
744743
},
745-
scrubHeaders: packageJson.defaults.server.scrubHeaders,
746-
scrubFields: packageJson.defaults.server.scrubFields,
744+
scrubHeaders: serverDefaults.scrubHeaders,
745+
scrubFields: serverDefaults.scrubFields,
747746
addRequestData: null,
748-
reportLevel: packageJson.defaults.reportLevel,
747+
reportLevel: reportLevel,
749748
verbose: false,
750749
enabled: true,
751750
transmit: true,

0 commit comments

Comments
 (0)