Permalink
Browse files

(Closes #14) remove object-assign dep

  • Loading branch information...
jprichardson committed May 14, 2016
1 parent d587417 commit 480c91fcb7e7d9b766ef2a3bd54a187931008948
Showing with 4 additions and 7 deletions.
  1. +1 −2 lib/args.js
  2. +2 −3 lib/main.js
  3. +1 −2 package.json
View
@@ -1,5 +1,4 @@
var assert = require('assert')
var assign = require('object-assign')
var path = require('path')
var url = require('url')
@@ -18,7 +17,7 @@ function urlWithArgs (urlOrFile, args) {
if (urlOrFile.indexOf('http') === 0 || urlOrFile.indexOf('data') === 0) {
var urlData = url.parse(urlOrFile)
var hash = urlData.hash || args ? args : undefined
u = url.format(assign(urlData, { hash: hash }))
u = url.format(Object.assign(urlData, { hash: hash }))
} else { // presumably a file url
u = url.format({
protocol: 'file',
View
@@ -1,4 +1,3 @@
var assign = require('object-assign')
var path = require('path')
var BrowserWindow = require('electron').BrowserWindow
var wargs = require('./args')
@@ -8,11 +7,11 @@ var wargs = require('./args')
var _windows = {}
function _createWindow (options) {
var opts = assign({
var opts = Object.assign({
show: false
}, options)
opts.webPreferences = assign({
opts.webPreferences = Object.assign({
preload: path.join(__dirname, 'renderer-preload')
}, options.webPreferences)
View
@@ -31,7 +31,6 @@
"stubo": "^0.1.0"
},
"dependencies": {
"is-electron-renderer": "^2.0.0",
"object-assign": "^3.0.0"
"is-electron-renderer": "^2.0.0"
}
}

0 comments on commit 480c91f

Please sign in to comment.