update: run npm update and fix resulting eslint import/order errors

This commit is contained in:
Xymorot 2020-03-02 23:15:44 +01:00
parent 2ed49035c6
commit 60413e9ee7
14 changed files with 1031 additions and 801 deletions

View File

@ -1,10 +1,10 @@
const fs = require('fs');
const path = require('path');
const templating = require('./templates');
const webpackConfig = require('./webpack.config');
const { watch } = require('chokidar');
const { debounce } = require('lodash');
const minimist = require('minimist');
const templating = require('./templates');
const webpackConfig = require('./webpack.config');
/** @type {Object} */
const argv = minimist(process.argv);

1752
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -53,45 +53,45 @@
"uuid": "^3.3.3"
},
"devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.46",
"@electron-forge/maker-squirrel": "^6.0.0-beta.46",
"@types/chai": "^4.2.7",
"@types/fs-extra": "^8.0.1",
"@electron-forge/cli": "^6.0.0-beta.50",
"@electron-forge/maker-squirrel": "^6.0.0-beta.50",
"@types/chai": "^4.2.10",
"@types/fs-extra": "^8.1.0",
"@types/jsdom": "latest",
"@types/minimist": "latest",
"@types/mocha": "latest",
"@types/node": "^12.12.18",
"@types/node-fetch": "^2.5.4",
"@types/sinon": "^7.5.1",
"@types/node": "^12.12.29",
"@types/node-fetch": "^2.5.5",
"@types/sinon": "^7.5.2",
"@types/webdriverio": "^4.13.3",
"@types/webpack": "^4.41.0",
"@typescript-eslint/eslint-plugin": "^2.12.0",
"@typescript-eslint/parser": "^2.12.0",
"@types/webpack": "^4.41.7",
"@typescript-eslint/eslint-plugin": "^2.22.0",
"@typescript-eslint/parser": "^2.22.0",
"chai": "^4.2.0",
"chokidar": "^3.3.1",
"concurrently": "^5.0.1",
"electron": "^6.1.6",
"electron-rebuild": "^1.8.8",
"eslint": "^6.7.2",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-import": "^2.19.1",
"fast-check": "^1.20.1",
"handlebars": "^4.5.3",
"concurrently": "^5.1.0",
"electron": "^6.1.9",
"electron-rebuild": "^1.10.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-import": "^2.20.1",
"fast-check": "^1.22.2",
"handlebars": "^4.7.3",
"husky": "^3.1.0",
"lodash": "^4.17.15",
"mocha": "^6.2.2",
"nock": "^11.7.0",
"nock": "^11.9.1",
"nyc": "^14.1.1",
"prettier": "^1.19.1",
"rewiremock": "^3.13.9",
"sinon": "^7.5.0",
"spectron": "^8.0.0",
"svelte": "^3.16.4",
"svelte": "^3.19.1",
"svelte-loader": "^2.13.6",
"ts-loader": "^6.2.1",
"typescript": "^3.7.3",
"webpack": "^4.41.3",
"webpack-cli": "^3.3.10"
"typescript": "^3.8.3",
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11"
},
"repository": "https://git.fuwafuwa.moe/Xymorot/RenaiApp",
"bugs": "https://git.fuwafuwa.moe/Xymorot/RenaiApp/issues",

View File

@ -1,10 +1,10 @@
import 'reflect-metadata';
import { Container } from 'inversify';
import { MainAppWindow } from '../modules/app-window/main-app-window';
import { NhentaiApi } from '../modules/nhentai/nhentai-api';
import { NhentaiIpcServer } from '../modules/nhentai/nhentai-ipc-server';
import { Session } from '../modules/session/session';
import { WebCrawler } from '../modules/web-crawler/web-crawler';
import { Container } from 'inversify';
export const container = new Container({ defaultScope: 'Singleton' });

View File

@ -1,7 +1,7 @@
import path from 'path';
import { appPath } from './app-path';
import { Connection, createConnection as ormCreateConnection } from 'typeorm';
import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions';
import { appPath } from './app-path';
export enum Databases {
LIBRARY = 'library',

View File

@ -1,7 +1,7 @@
import { BrowserWindow } from 'electron';
import os from 'os';
import { injectable } from 'inversify';
import { IAppWindow } from './i-app-window';
import { injectable } from 'inversify';
import BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions;
let defaultOptions = {

View File

@ -1,5 +1,5 @@
import { injectable } from 'inversify';
import { AppWindow } from './app-window';
import { injectable } from 'inversify';
@injectable()
export class MainAppWindow extends AppWindow {

View File

@ -1,9 +1,9 @@
import { inject, injectable } from 'inversify';
import { JSDOM } from 'jsdom';
import { RequestInit, Response } from 'node-fetch';
import { Errors, RenaiError } from '../../core/error';
import { IWebCrawler } from '../web-crawler/i-web-crawler';
import { INhentaiApi } from './i-nhentai-api';
import { inject, injectable } from 'inversify';
import { JSDOM } from 'jsdom';
import { RequestInit, Response } from 'node-fetch';
const domain = 'nhentai.net';
const url = `https://${domain}/`;

View File

@ -1,6 +1,6 @@
import { inject, injectable } from 'inversify';
import { IpcServer } from '../ipc/ipc-server';
import { INhentaiApi } from './i-nhentai-api';
import { inject, injectable } from 'inversify';
@injectable()
export class NhentaiIpcServer extends IpcServer {

View File

@ -1,6 +1,6 @@
import { session } from 'electron';
import { injectable } from 'inversify';
import { ISession } from './i-session';
import { injectable } from 'inversify';
import OnHeadersReceivedDetails = Electron.OnHeadersReceivedDetails;
@injectable()

View File

@ -1,6 +1,6 @@
import path from 'path';
import fs from 'fs-extra';
import { appPath } from '../../core/app-path';
import fs from 'fs-extra';
export const enum StoreKeys {
'COOKIES' = 'cookies',

View File

@ -1,9 +1,9 @@
import { injectable } from 'inversify';
import { CookieJar } from 'jsdom';
import nodeFetch, { RequestInit, Response } from 'node-fetch';
import { Errors, RenaiError } from '../../core/error';
import { load, save, StoreKeys } from '../store/store';
import { IWebCrawler } from './i-web-crawler';
import { injectable } from 'inversify';
import { CookieJar } from 'jsdom';
import nodeFetch, { RequestInit, Response } from 'node-fetch';
@injectable()
export class WebCrawler implements IWebCrawler {

View File

@ -1,5 +1,5 @@
import { writable } from 'svelte/store';
import * as api from './api';
import { writable } from 'svelte/store';
const { subscribe, set } = writable<boolean>(false);

View File

@ -1,7 +1,7 @@
const fs = require('fs');
const path = require('path');
const handlebars = require('handlebars');
const packageJson = require('../package');
const handlebars = require('handlebars');
function compile(isDevMode = false) {
const dataPath = path.resolve(__dirname, 'data.json');