diff --git a/src/build/buildMain.js b/src/build/buildMain.js index 1ddb0fb..2e98eb1 100644 --- a/src/build/buildMain.js +++ b/src/build/buildMain.js @@ -5,7 +5,7 @@ import ncp from 'ncp'; import async from 'async'; import hasBinary from 'hasbin'; -import optionsFactory from './../options'; +import optionsFactory from './../options/optionsMain'; import iconBuild from './iconBuild'; import helpers from './../helpers/helpers'; import buildApp from './buildApp'; diff --git a/src/options/normalizeUrl.js b/src/options/normalizeUrl.js new file mode 100644 index 0000000..0b16577 --- /dev/null +++ b/src/options/normalizeUrl.js @@ -0,0 +1,17 @@ +import url from 'url'; +import validator from 'validator'; + +function normalizeUrl(testUrl) { + // add protocol if protocol not found + let normalized = testUrl; + const parsed = url.parse(normalized); + if (!parsed.protocol) { + normalized = 'http://' + normalized; + } + if (!validator.isURL(normalized, {require_protocol: true, require_tld: false})) { + throw `Your Url: "${normalized}" is invalid!`; + } + return normalized; +} + +export default normalizeUrl; diff --git a/src/options.js b/src/options/optionsMain.js similarity index 83% rename from src/options.js rename to src/options/optionsMain.js index 6391d83..86d463a 100644 --- a/src/options.js +++ b/src/options/optionsMain.js @@ -1,19 +1,18 @@ import os from 'os'; import path from 'path'; -import url from 'url'; -import validator from 'validator'; import _ from 'lodash'; import async from 'async'; import sanitizeFilename from 'sanitize-filename'; -import inferIcon from './infer/inferIcon'; -import inferTitle from './infer/inferTitle'; -import inferOs from './infer/inferOs'; -import packageJson from './../package.json'; +import inferIcon from './../infer/inferIcon'; +import inferTitle from './../infer/inferTitle'; +import inferOs from './../infer/inferOs'; +import normalizeUrl from './normalizeUrl'; +import packageJson from './../../package.json'; const {inferPlatform, inferArch} = inferOs; -const PLACEHOLDER_APP_DIR = path.join(__dirname, '../', 'app'); +const PLACEHOLDER_APP_DIR = path.join(__dirname, '../../', 'app'); const ELECTRON_VERSION = '0.36.4'; const DEFAULT_APP_NAME = 'APP'; @@ -100,19 +99,6 @@ function sanitizeOptions(options) { return options; } -function normalizeUrl(testUrl) { - // add protocol if protocol not found - let normalized = testUrl; - const parsed = url.parse(normalized); - if (!parsed.protocol) { - normalized = 'http://' + normalized; - } - if (!validator.isURL(normalized, {require_protocol: true, require_tld: false})) { - throw `Your Url: "${normalized}" is invalid!`; - } - return normalized; -} - function getFakeUserAgent() { let userAgent; switch (os.platform()) {