From f86ce4bc1777ac197b1b20462baeafed45e14d2e Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 15 Feb 2021 17:44:19 +0100 Subject: [PATCH] Fix deployment --- Logic/Web/Imgur.ts | 4 ++++ UI/Image/SlideShow.ts | 1 + package-lock.json | 38 +++++++++++++++++++++++++++----------- scripts/createLayouts.ts | 1 - tsconfig.json | 3 ++- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Logic/Web/Imgur.ts b/Logic/Web/Imgur.ts index 6fe620c..27a1053 100644 --- a/Logic/Web/Imgur.ts +++ b/Logic/Web/Imgur.ts @@ -1,3 +1,4 @@ +// @ts-ignore import $ from "jquery" import {LicenseInfo} from "./Wikimedia"; @@ -55,6 +56,7 @@ export class Imgur { Accept: 'application/json', }, }; + // @ts-ignore $.ajax(settings).done(function (response) { const descr: string = response.data.description ?? ""; const data: any = {}; @@ -108,11 +110,13 @@ export class Imgur { // Response contains stringified JSON // Image URL available at response.data.link + // @ts-ignore $.ajax(settings).done(function (response) { response = JSON.parse(response); handleSuccessfullUpload(response.data.link); }).fail((reason) => { console.log("Uploading to IMGUR failed", reason); + // @ts-ignore onFail(reason); }); } diff --git a/UI/Image/SlideShow.ts b/UI/Image/SlideShow.ts index e00e3c2..13f7ae5 100644 --- a/UI/Image/SlideShow.ts +++ b/UI/Image/SlideShow.ts @@ -40,6 +40,7 @@ export class SlideShow extends UIElement { if(this._embeddedElements.data.length == 0){ return; } + // @ts-ignore $('.slick-carousel').not('.slick-initialized').slick({ autoplay: true, arrows: true, diff --git a/package-lock.json b/package-lock.json index 4e97fe1..e1c7174 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11093,23 +11093,23 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "tailwindcss": { - "version": "npm:@tailwindcss/postcss7-compat@2.0.2", - "resolved": "https://registry.npmjs.org/@tailwindcss/postcss7-compat/-/postcss7-compat-2.0.2.tgz", - "integrity": "sha512-KM8kjG5dd8qoXBX2a6r3r1TOqhFh8NtFBheG9qpVPwSjrD8wRdoM7s+Xz56HEA1XmeN64gEKqjmY6vm55DiS3Q==", + "version": "npm:@tailwindcss/postcss7-compat@2.0.3", + "resolved": "https://registry.npmjs.org/@tailwindcss/postcss7-compat/-/postcss7-compat-2.0.3.tgz", + "integrity": "sha512-R43aiSzwlybDMhDld8vkSIKPSLXxbbmotZ+I2GIrX+IzFNy9JAByC7Ncf9A81Dg0JLBWHY5m769lBbBnJCF8cw==", "requires": { - "@fullhuman/postcss-purgecss": "^3.0.0", + "@fullhuman/postcss-purgecss": "^3.1.3", "autoprefixer": "^9", "bytes": "^3.0.0", "chalk": "^4.1.0", "color": "^3.1.3", "detective": "^5.2.0", "didyoumean": "^1.2.1", - "fs-extra": "^9.0.1", + "fs-extra": "^9.1.0", "html-tags": "^3.1.0", "lodash": "^4.17.20", "modern-normalize": "^1.0.0", "node-emoji": "^1.8.1", - "object-hash": "^2.0.3", + "object-hash": "^2.1.1", "postcss": "^7", "postcss-functions": "^3", "postcss-js": "^2", @@ -11117,7 +11117,7 @@ "postcss-selector-parser": "^6.0.4", "postcss-value-parser": "^4.1.0", "pretty-hrtime": "^1.0.3", - "reduce-css-calc": "^2.1.6", + "reduce-css-calc": "^2.1.8", "resolve": "^1.19.0" }, "dependencies": { @@ -11184,6 +11184,17 @@ "simple-swizzle": "^0.2.2" } }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -11216,11 +11227,11 @@ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "requires": { - "is-core-module": "^2.1.0", + "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } }, @@ -11231,6 +11242,11 @@ "requires": { "has-flag": "^4.0.0" } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" } } }, diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts index d92ddfa..e7e8ace 100644 --- a/scripts/createLayouts.ts +++ b/scripts/createLayouts.ts @@ -7,7 +7,6 @@ import LayoutConfig from "../Customizations/JSON/LayoutConfig"; import {AllKnownLayouts} from "../Customizations/AllKnownLayouts"; import {existsSync, mkdirSync, readFileSync, writeFile, writeFileSync} from "fs"; import Locale from "../UI/i18n/Locale"; -import * as sharp from "sharp" import Translations from "../UI/i18n/Translations"; import {Translation} from "../UI/i18n/Translation"; diff --git a/tsconfig.json b/tsconfig.json index 430b245..047cf16 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,11 +4,12 @@ "target": "es5", "sourceMap": true, "resolveJsonModule": true, + "esModuleInterop": true, "lib": [ "DOM", "es5", "scripthost", - "es2015.collection" + "es2015.collection", ] }, "exclude": [