Skip to content

Commit

Permalink
fix: Remove shim for domain
Browse files Browse the repository at this point in the history
  • Loading branch information
HazAT committed Oct 24, 2018
1 parent 14a9095 commit 9cf2c4b
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"rollup-plugin-license": "^0.6.0",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-npm": "^2.0.0",
"rollup-plugin-shim": "^1.0.0",
"rollup-plugin-typescript2": "^0.13.0",
"rollup-plugin-uglify": "^3.0.0",
"sinon": "^5.0.3",
Expand Down
4 changes: 0 additions & 4 deletions packages/browser/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import uglify from 'rollup-plugin-uglify';
import resolve from 'rollup-plugin-node-resolve';
import typescript from 'rollup-plugin-typescript2';
import license from 'rollup-plugin-license';
import shim from 'rollup-plugin-shim';

const commitHash = require('child_process')
.execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
Expand All @@ -18,9 +17,6 @@ const bundleConfig = {
},
context: 'window',
plugins: [
shim({
domain: `export default {}`,
}),
typescript({
tsconfig: 'tsconfig.build.json',
tsconfigOverride: { compilerOptions: { declaration: false } },
Expand Down
2 changes: 1 addition & 1 deletion packages/hub/src/hub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ export function getCurrentHub(): Hub {

// Prefer domains over global if they are there
try {
const domain = require('domain');
const domain = (getGlobalObject() as any).module.require('domain');
const activeDomain = domain.active;

// If there no active domain, just return global hub
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7859,10 +7859,6 @@ rollup-plugin-npm@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-npm/-/rollup-plugin-npm-2.0.0.tgz#8a28ffdb5160bc8e1e371de39ed71faf009d655c"

rollup-plugin-shim@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-shim/-/rollup-plugin-shim-1.0.0.tgz#b00f5cb44cdae81358c5342fe82fa71a1602b56b"

rollup-plugin-typescript2@^0.13.0:
version "0.13.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.13.0.tgz#5fc838657d05af82e04554832cadf06cdb32f657"
Expand Down

0 comments on commit 9cf2c4b

Please sign in to comment.