From e2937c177c11b1fbc62084535e3a4a0ed5e08a01 Mon Sep 17 00:00:00 2001 From: Michael Bykovski Date: Fri, 21 Jul 2017 13:52:10 +0200 Subject: [PATCH] Removed Appserver and just set it as an example --- package-lock.json | 141 ++++--------------------------------------- package.json | 6 +- src/www/webserver.js | 4 -- webserver.js | 9 --- 4 files changed, 16 insertions(+), 144 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8478ffb..c75a920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -466,17 +466,6 @@ "babel-template": "6.25.0" } }, - "babel-loader": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.1.tgz", - "integrity": "sha1-uHE0yLEuPkwqlOBUYIW8aAorhIg=", - "dev": true, - "requires": { - "find-cache-dir": "1.0.0", - "loader-utils": "1.1.0", - "mkdirp": "0.5.1" - } - }, "babel-messages": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", @@ -908,7 +897,7 @@ "babel-plugin-transform-es2015-unicode-regex": "6.24.1", "babel-plugin-transform-exponentiation-operator": "6.24.1", "babel-plugin-transform-regenerator": "6.24.1", - "browserslist": "2.1.5", + "browserslist": "2.2.0", "invariant": "2.2.2", "semver": "5.3.0" } @@ -1071,12 +1060,6 @@ "integrity": "sha1-6F1QgiDHTj9DpM5y7tUfPaTblNE=", "dev": true }, - "big.js": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", - "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=", - "dev": true - }, "binary-extensions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz", @@ -1391,13 +1374,13 @@ } }, "browserslist": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.1.5.tgz", - "integrity": "sha1-6IJVDfPRzW1IHBo+ADjyuvE6RxE=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.2.0.tgz", + "integrity": "sha512-t09UuOv/4/hrL1y4wZ871+kKE6E2bkdMD6duZtV7FZIHFpsmdQfW63BH3bAjkfpkbP/eFKyenUbDUKigV/VmRw==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000700", - "electron-to-chromium": "1.3.15" + "caniuse-lite": "1.0.30000704", + "electron-to-chromium": "1.3.16" } }, "buffer": { @@ -1448,9 +1431,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30000700", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000700.tgz", - "integrity": "sha1-YISHHsdcb6YjJ96XYiUU+V2dsmo=", + "version": "1.0.30000704", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000704.tgz", + "integrity": "sha1-rbbqARNFFWY2gtuTq6spHUwClGs=", "dev": true }, "caseless": { @@ -1562,12 +1545,6 @@ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, "compressible": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz", @@ -2311,9 +2288,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.15", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz", - "integrity": "sha1-CDl5NIkcvPrrvRi4KpW1pIETg2k=", + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz", + "integrity": "sha1-0OAmc1dUdwkBrjAaIWZMukXZL30=", "dev": true }, "elementtree": { @@ -2340,12 +2317,6 @@ "minimalistic-crypto-utils": "1.0.1" } }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, "encodeurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", @@ -2589,17 +2560,6 @@ } } }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.0.0", - "pkg-dir": "2.0.0" - } - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -4447,27 +4407,6 @@ "astw": "2.2.0" } }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - } - }, "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", @@ -4510,15 +4449,6 @@ "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", "dev": true }, - "make-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", - "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -6489,21 +6419,6 @@ "object-assign": "4.1.1" } }, - "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "1.1.0" - } - }, "package-json": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", @@ -6567,12 +6482,6 @@ "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -6622,12 +6531,6 @@ "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", "dev": true }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", @@ -6643,26 +6546,6 @@ "pinkie": "2.0.4" } }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - } - } - }, "plist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz", diff --git a/package.json b/package.json index 80ccdc1..62b3d0d 100644 --- a/package.json +++ b/package.json @@ -33,14 +33,16 @@ "devDependencies": { "babel-cli": "^6.24.1", "babel-core": "^6.25.0", - "babel-loader": "^7.1.1", "babel-preset-env": "^1.6.0", "babel-preset-es2015": "^6.24.1", "babel-preset-stage-2": "^6.24.1", "cordova": "^6.1.1" }, "scripts": { - "build": "babel src/www --out-file webserver.js" + "build": "./node_modules/babel-cli/bin/babel.js src/www --out-file webserver.js" + }, + "browser": { + "cordova": false }, "dependencies": { "universal-router": "^3.2.0" diff --git a/src/www/webserver.js b/src/www/webserver.js index 06416d3..a1d2332 100644 --- a/src/www/webserver.js +++ b/src/www/webserver.js @@ -1,9 +1,5 @@ import exec from 'cordova/exec'; -import * as ImportedAppServer from './appserver/AppServer'; - -// Export the Appserver -export const AppServer = ImportedAppServer; const WEBSERVER_CLASS = 'Webserver'; const START_FUNCTION = 'start'; const ONREQUEST_FUNCTION = 'onRequest'; diff --git a/webserver.js b/webserver.js index a905dfd..dfd6dc9 100644 --- a/webserver.js +++ b/webserver.js @@ -197,7 +197,6 @@ exports.default = Response; Object.defineProperty(exports, "__esModule", { value: true }); -exports.AppServer = undefined; exports.start = start; exports.onRequest = onRequest; exports.sendResponse = sendResponse; @@ -207,16 +206,8 @@ var _exec = require('cordova/exec'); var _exec2 = _interopRequireDefault(_exec); -var _AppServer = require('./appserver/AppServer'); - -var ImportedAppServer = _interopRequireWildcard(_AppServer); - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -// Export the Appserver -var AppServer = exports.AppServer = ImportedAppServer; var WEBSERVER_CLASS = 'Webserver'; var START_FUNCTION = 'start'; var ONREQUEST_FUNCTION = 'onRequest';