Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 1e74bbf

Browse files
committed
Merge pull request #1 from nginnever/magic-externals
test(browser): Use externals for node-forge
2 parents ace47a0 + 3c7dac2 commit 1e74bbf

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

Diff for: karma.conf.js

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
module.exports = function (config) {
22
var path = require('path')
3-
var node_modules_dir = path.join(__dirname, 'node_modules')
4-
var deps = [
5-
'peer-id/deps/forge.bundle.js'
6-
]
7-
3+
var nodeForgePath = path.resolve(__dirname, 'node_modules/peer-id/deps/forge.bundle.js')
4+
85
config.set({
96
basePath: '',
107
frameworks: ['mocha'],
118

129
files: [
10+
nodeForgePath,
1311
'tests/test-core/browser.js'
1412
],
1513

@@ -19,21 +17,20 @@ module.exports = function (config) {
1917

2018
webpack: {
2119
resolve: {
22-
extensions: ['', '.js', '.json'],
23-
alias: {'node-forge': node_modules_dir+'/peer-id/deps/forge.bundle.js' }
20+
extensions: ['', '.js', '.json']
2421
},
2522
externals: {
26-
fs: '{}'
23+
fs: '{}',
24+
'node-forge': 'forge'
2725
},
2826
node: {
2927
Buffer: true
3028
},
3129
module: {
3230
loaders: [
3331
{ test: /\.json$/, loader: 'json' }
34-
],
35-
noParse: []
36-
},
32+
]
33+
}
3734
},
3835

3936
webpackMiddleware: {
@@ -50,9 +47,4 @@ module.exports = function (config) {
5047
browsers: process.env.TRAVIS ? ['Firefox'] : ['Chrome'],
5148
singleRun: true
5249
})
53-
54-
deps.forEach(function (dep) {
55-
var depPath = path.resolve(node_modules_dir, dep)
56-
config.webpack.module.noParse.push(depPath)
57-
})
5850
}

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"rimraf": "^2.4.4",
6060
"standard": "^5.4.1",
6161
"transform-loader": "^0.2.3",
62-
"webpack": "^2.0.5-beta"
62+
"webpack": "^2.0.7-beta"
6363
},
6464
"dependencies": {
6565
"bl": "^1.0.0",

0 commit comments

Comments
 (0)