From 51c2e13e350b05b8da75e5947829be40ab2075a4 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 25 Oct 2017 14:39:02 +0100 Subject: [PATCH] Small modifications --- src/Ombi/ClientApp/main.ts | 14 +++++-- src/Ombi/package-lock.json | 54 +++++++++++++-------------- src/Ombi/typings/globals/globals.d.ts | 1 + src/Ombi/webpack.config.vendor.ts | 2 - 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/Ombi/ClientApp/main.ts b/src/Ombi/ClientApp/main.ts index 0c265f768..69914b644 100644 --- a/src/Ombi/ClientApp/main.ts +++ b/src/Ombi/ClientApp/main.ts @@ -1,10 +1,18 @@ +import * as Pace from "pace-progress"; + +Pace.start(); + import "bootstrap/dist/js/bootstrap"; -import "pace-progress"; -import "./imports"; -import "./polyfills"; + import "./styles/base.scss"; import "./styles/Themes/plex.scss"; +import "./polyfills"; + +import "hammerjs"; + +import "./imports"; + import { enableProdMode } from "@angular/core"; import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; import { AppModule } from "./app/app.module"; diff --git a/src/Ombi/package-lock.json b/src/Ombi/package-lock.json index d1341746e..7bc72d976 100644 --- a/src/Ombi/package-lock.json +++ b/src/Ombi/package-lock.json @@ -5041,7 +5041,6 @@ "resolved": "https://registry.npmjs.org/npm/-/npm-5.5.1.tgz", "integrity": "sha512-M3aO8EjHebaCw6uur4C86SZqkypnoaEVo5R63FEEU0dw9wLxf/JlwWtJItShYVyQS2WDxG2It10GEe5GmVEM2Q==", "requires": { - "JSONStream": "1.3.1", "abbrev": "1.1.1", "ansi-regex": "3.0.0", "ansicolors": "0.3.2", @@ -5073,6 +5072,7 @@ "ini": "1.3.4", "init-package-json": "1.10.1", "is-cidr": "1.0.0", + "JSONStream": "1.3.1", "lazy-property": "1.0.0", "libnpx": "9.6.0", "lockfile": "1.0.3", @@ -5147,24 +5147,6 @@ "write-file-atomic": "2.1.0" }, "dependencies": { - "JSONStream": { - "version": "1.3.1", - "bundled": true, - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - }, - "dependencies": { - "jsonparse": { - "version": "1.3.1", - "bundled": true - }, - "through": { - "version": "2.3.8", - "bundled": true - } - } - }, "abbrev": { "version": "1.1.1", "bundled": true @@ -5538,6 +5520,24 @@ } } }, + "JSONStream": { + "version": "1.3.1", + "bundled": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + }, + "dependencies": { + "jsonparse": { + "version": "1.3.1", + "bundled": true + }, + "through": { + "version": "2.3.8", + "bundled": true + } + } + }, "lazy-property": { "version": "1.0.0", "bundled": true @@ -10479,6 +10479,14 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -10489,14 +10497,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/src/Ombi/typings/globals/globals.d.ts b/src/Ombi/typings/globals/globals.d.ts index a2df5141d..7fd31b87a 100644 --- a/src/Ombi/typings/globals/globals.d.ts +++ b/src/Ombi/typings/globals/globals.d.ts @@ -5,5 +5,6 @@ declare var require: any; declare var localStorage: any; declare var introJs: any; +declare module "pace-progress"; declare module "webpack-bundle-analyzer"; declare module "uglifyjs-webpack-plugin"; \ No newline at end of file diff --git a/src/Ombi/webpack.config.vendor.ts b/src/Ombi/webpack.config.vendor.ts index a6eb3af75..8737367c1 100644 --- a/src/Ombi/webpack.config.vendor.ts +++ b/src/Ombi/webpack.config.vendor.ts @@ -32,7 +32,6 @@ module.exports = (env: any) => { "primeng/resources/primeng.min.css", "@angular/material/prebuilt-themes/deeppurple-amber.css", "font-awesome/scss/font-awesome.scss", - "intro.js-mit/introjs.css", "bootswatch/superhero/bootstrap.min.css", "@angular/animations", @@ -62,7 +61,6 @@ module.exports = (env: any) => { "hammerjs", "event-source-polyfill", "bootstrap/dist/js/bootstrap", - "intro.js-mit/intro.js", "ngx-clipboard", "angular2-jwt", "ng2-cookies",