Skip to content

Commit b6c429a

Browse files
HazATHazAT
committed
feat: Remove rollup plugins
1 parent b278be8 commit b6c429a

File tree

6 files changed

+26
-62
lines changed

6 files changed

+26
-62
lines changed

‎packages/browser/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@
4242
"prettier-check": "^2.0.0",
4343
"rimraf": "^2.6.3",
4444
"rollup": "^1.2.1",
45-
"rollup-plugin-commonjs": "^9.1.3",
4645
"rollup-plugin-license": "^0.8.1",
47-
"rollup-plugin-node-resolve": "^4.0.0",
48-
"rollup-plugin-npm": "^2.0.0",
4946
"rollup-plugin-typescript2": "^0.19.2",
5047
"rollup-plugin-terser": "^4.0.4",
5148
"sinon": "^7.2.3",

‎packages/browser/rollup.config.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import commonjs from 'rollup-plugin-commonjs';
21
import { terser } from 'rollup-plugin-terser';
3-
import resolve from 'rollup-plugin-node-resolve';
42
import typescript from 'rollup-plugin-typescript2';
53
import license from 'rollup-plugin-license';
64

@@ -35,7 +33,6 @@ const bundleConfig = {
3533
tsconfigOverride: {
3634
compilerOptions: {
3735
declaration: false,
38-
module: 'ES2015',
3936
paths: {
4037
'@sentry/utils/*': ['../utils/src/*'],
4138
'@sentry/core': ['../core/src'],
@@ -47,12 +44,6 @@ const bundleConfig = {
4744
},
4845
include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
4946
}),
50-
resolve({
51-
jsnext: true,
52-
main: true,
53-
browser: true,
54-
}),
55-
commonjs(),
5647
license({
5748
sourcemap: true,
5849
banner: `/*! @sentry/browser <%= pkg.version %> (${commitHash}) | https://github.com/getsentry/sentry-javascript */`,
@@ -70,23 +61,31 @@ export default [
7061
interop: false,
7162
sourcemap: true,
7263
},
73-
external: ['@sentry/core', '@sentry/hub', '@sentry/minimal', 'tslib'],
64+
external: [
65+
'@sentry/core',
66+
'@sentry/hub',
67+
'@sentry/minimal',
68+
'@sentry/types',
69+
'@sentry/utils/logger',
70+
'@sentry/utils/misc',
71+
'@sentry/utils/is',
72+
'@sentry/utils/supports',
73+
'@sentry/utils/syncpromise',
74+
'@sentry/utils/object',
75+
'@sentry/utils/string',
76+
'@sentry/utils/error',
77+
'@sentry/utils/promisebuffer',
78+
'tslib',
79+
],
7480
plugins: [
7581
typescript({
7682
tsconfig: 'tsconfig.build.json',
7783
tsconfigOverride: {
7884
compilerOptions: {
79-
module: 'ES2015',
8085
rootDir: 'src',
8186
},
8287
},
8388
}),
84-
resolve({
85-
jsnext: true,
86-
main: true,
87-
browser: true,
88-
}),
89-
commonjs(),
9089
],
9190
},
9291
Object.assign({}, bundleConfig, {

‎packages/browser/test/manual/npm-build.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ const fs = require('fs');
22
const path = require('path');
33
const webpack = require('webpack');
44
const { JSDOM } = require('jsdom');
5-
5+
// runTests();
66
webpack(
77
{
88
entry: path.join(__dirname, 'test-code.js'),
99
output: {
1010
path: __dirname,
1111
filename: 'tmp.js',
1212
},
13-
mode: 'production',
13+
mode: 'development',
1414
},
1515
(err, stats) => {
1616
if (err) {
@@ -39,9 +39,9 @@ function runTests() {
3939
const bundlePath = path.join(__dirname, 'tmp.js');
4040
const { window } = new JSDOM(``, { runScripts: 'dangerously' });
4141

42-
window.onerror = function(error) {
42+
window.onerror = function() {
4343
console.error('ERROR thrown in manual test:');
44-
console.error(error);
44+
console.error(arguments);
4545
console.error('------------------');
4646
process.exit(1);
4747
};

‎packages/browser/tsconfig.build.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"baseUrl": ".",
5-
"outDir": "dist"
5+
"outDir": "dist",
6+
"target": "es6",
7+
"module": "es6"
68
},
79
"include": ["src/**/*"]
810
}

‎packages/core/src/sdk.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ export type ClientClass<F extends Client, O extends Options> = new (options: O)
1111
*
1212
* @param clientClass The client class to instanciate.
1313
* @param options Options to pass to the client.
14-
* @returns The installed and bound client instance.
1514
*/
1615
export function initAndBind<F extends Client, O extends Options>(clientClass: ClientClass<F, O>, options: O): void {
1716
if (options.debug === true) {
1817
logger.enable();
1918
}
20-
21-
const client = new clientClass(options);
22-
getCurrentHub().bindClient(client);
19+
getCurrentHub().bindClient(new clientClass(options));
2320
}

‎yarn.lock

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,11 +2472,6 @@ builtin-modules@^1.1.1:
24722472
version "1.1.1"
24732473
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
24742474

2475-
builtin-modules@^3.0.0:
2476-
version "3.0.0"
2477-
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
2478-
integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
2479-
24802475
builtin-status-codes@^3.0.0:
24812476
version "3.0.0"
24822477
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -5459,10 +5454,6 @@ is-glob@^4.0.0:
54595454
dependencies:
54605455
is-extglob "^2.1.1"
54615456

5462-
is-module@^1.0.0:
5463-
version "1.0.0"
5464-
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
5465-
54665457
is-npm@^1.0.0:
54675458
version "1.0.0"
54685459
resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -8867,7 +8858,7 @@ resolve@1.1.7, resolve@1.1.x:
88678858
version "1.1.7"
88688859
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
88698860

8870-
resolve@1.8.1, resolve@1.x, resolve@^1.8.1:
8861+
resolve@1.8.1, resolve@1.x:
88718862
version "1.8.1"
88728863
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
88738864
dependencies:
@@ -8941,15 +8932,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
89418932
hash-base "^3.0.0"
89428933
inherits "^2.0.1"
89438934

8944-
rollup-plugin-commonjs@^9.1.3:
8945-
version "9.2.0"
8946-
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
8947-
dependencies:
8948-
estree-walker "^0.5.2"
8949-
magic-string "^0.25.1"
8950-
resolve "^1.8.1"
8951-
rollup-pluginutils "^2.3.3"
8952-
89538935
rollup-plugin-license@^0.8.1:
89548936
version "0.8.1"
89558937
resolved "https://registry.yarnpkg.com/rollup-plugin-license/-/rollup-plugin-license-0.8.1.tgz#cdcfee2a32f27790e5019a2a7abd9234476ac589"
@@ -8961,19 +8943,6 @@ rollup-plugin-license@^0.8.1:
89618943
mkdirp "0.5.1"
89628944
moment "2.23.0"
89638945

8964-
rollup-plugin-node-resolve@^4.0.0:
8965-
version "4.0.0"
8966-
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz#9bc6b8205e9936cc0e26bba2415f1ecf1e64d9b2"
8967-
integrity sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==
8968-
dependencies:
8969-
builtin-modules "^3.0.0"
8970-
is-module "^1.0.0"
8971-
resolve "^1.8.1"
8972-
8973-
rollup-plugin-npm@^2.0.0:
8974-
version "2.0.0"
8975-
resolved "https://registry.yarnpkg.com/rollup-plugin-npm/-/rollup-plugin-npm-2.0.0.tgz#8a28ffdb5160bc8e1e371de39ed71faf009d655c"
8976-
89778946
rollup-plugin-terser@^4.0.4:
89788947
version "4.0.4"
89798948
resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e"
@@ -8994,7 +8963,7 @@ rollup-plugin-typescript2@^0.19.2:
89948963
rollup-pluginutils "2.3.3"
89958964
tslib "1.9.3"
89968965

8997-
rollup-pluginutils@2.3.3, rollup-pluginutils@^2.3.3:
8966+
rollup-pluginutils@2.3.3:
89988967
version "2.3.3"
89998968
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
90008969
dependencies:

0 commit comments

Comments
 (0)