From 649c1ed37ac74765fb7572fa3f703c94827042f4 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 4 Jan 2022 22:16:09 +0530 Subject: New configurations based on review comments (WIP) Signed-off-by: Vijay A --- .eslintrc.json | 71 ++- .gitlab-ci.yml | 1 + config/esbuildConfig.js | 1 + package.json | 8 +- packages/main/.eslintrc.json | 6 + packages/main/esbuild.config.js | 1 + packages/main/package.json | 5 +- packages/main/src/compositionRoot.ts | 10 +- .../main/src/controllers/__tests__/config.spec.ts | 8 +- .../src/controllers/__tests__/nativeTheme.spec.ts | 4 +- packages/main/src/controllers/config.ts | 4 +- packages/main/src/controllers/nativeTheme.ts | 4 +- packages/main/src/index.ts | 6 +- .../main/src/services/ConfigPersistenceService.ts | 4 +- .../services/impl/ConfigPersistenceServiceImpl.ts | 5 +- packages/main/src/stores/MainStore.ts | 2 +- packages/main/src/stores/SharedStore.ts | 2 +- packages/preload/package.json | 2 + .../__tests__/SophieRendererImpl.spec.ts | 8 +- packages/preload/src/index.ts | 2 +- packages/renderer/.eslintrc.json | 5 + packages/renderer/src/components/App.tsx | 4 +- .../src/components/BrowserViewPlaceholder.tsx | 2 +- packages/renderer/src/components/Sidebar.tsx | 2 +- packages/renderer/src/components/StoreProvider.tsx | 2 +- packages/renderer/src/components/ThemeProvider.tsx | 2 +- .../src/components/ToggleDarkModeButton.tsx | 2 +- packages/renderer/src/index.tsx | 10 +- packages/renderer/src/stores/RendererStore.ts | 2 +- packages/renderer/vite.config.js | 1 + packages/service-shared/src/index.ts | 6 +- .../shared/src/contextBridge/SophieRenderer.ts | 2 +- packages/shared/src/index.ts | 14 +- packages/shared/src/stores/Config.ts | 2 +- packages/shared/src/stores/SharedStore.ts | 2 +- scripts/.eslintrc.json | 17 + yarn.lock | 581 +++------------------ 37 files changed, 240 insertions(+), 570 deletions(-) create mode 100644 packages/main/.eslintrc.json create mode 100644 packages/renderer/.eslintrc.json create mode 100644 scripts/.eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json index c0512ef..82f5d58 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,15 +1,14 @@ { "root": true, "env": { + "node": true, "browser": true, "es2021": true }, "extends": [ - "eslint:recommended", - "plugin:react/recommended", + "eslint-config-airbnb-typescript", "plugin:import/recommended", - "plugin:import/typescript", - "airbnb-typescript" + "plugin:import/typescript" ], "parser": "@typescript-eslint/parser", "parserOptions": { @@ -32,17 +31,43 @@ } ], "quotes": [ - 2, + "error", "single" ], "linebreak-style": [ - 2, + "error", "unix" ], "semi": [ - 2, + "error", "always" ], + "import/extensions": [ + "error", + "ignorePackages", + { + "js": "always", + "jsx": "always", + "json": "never", + "ts": "never", + "tsx": "never" + } + ], + "import/no-unresolved": [ + "error", + { + "caseSensitive": false + } + ], + "import/no-extraneous-dependencies": [ + "error", + { + // "devDependencies": true, + // "optionalDependencies": true, + // "peerDependencies": true, + "bundledDependencies": true + } + ], // Best practices "block-scoped-var": 1, "complexity": [ @@ -53,7 +78,8 @@ "curly": 1, "default-case": 1, "dot-location": [ - 1, "property" + 1, + "property" ], "dot-notation": 1, "eqeqeq": 2, @@ -80,9 +106,9 @@ "no-lone-blocks": 1, "no-loop-func": 2, "no-magic-numbers": [ - 2, + "error", { - "ignore": [ + "ignore": [ -1, 0, 1, @@ -115,7 +141,8 @@ "no-throw-literal": 2, "no-unused-expressions": [ 1, - { "allowTernary": true + { + "allowTernary": true } ], "no-useless-call": 2, @@ -127,7 +154,6 @@ "vars-on-top": 0, "wrap-iife": 2, "yoda": 0, - // Strict mode "strict": 1, // Variables "init-declarations": 0, @@ -143,6 +169,23 @@ "no-use-before-define": 2 }, "globals": { - "it": false - } + "__dirname": false + }, + "overrides": [ + { + "files": [ + "**/__tests__/*" + ], + "globals": { + "after": false, + "afterEach": false, + "beforeAll": false, + "beforeEach": false, + "describe": false, + "Electron": false, + "expect": false, + "it": false + } + } + ] } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a02f6eb..bf9461e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ Run linter and static analyzer: before_script: - yarn install script: + - yarn dlx @yarnpkg/doctor - yarn typecheck - yarn run lint diff --git a/config/esbuildConfig.js b/config/esbuildConfig.js index 2ef54e1..93419fb 100644 --- a/config/esbuildConfig.js +++ b/config/esbuildConfig.js @@ -1,3 +1,4 @@ +/* eslint-disable no-process-env */ import { banner } from './buildConstants.js'; /** @type {string} */ diff --git a/package.json b/package.json index 00ff108..99cc7a2 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "devDependencies": { "@electron/fuses": "^1.5.0", "@types/jest": "^27.4.0", - "@typescript-eslint/eslint-plugin": "^5.8.1", - "@typescript-eslint/parser": "^5.8.1", + "@typescript-eslint/eslint-plugin": "^5.9.0", + "@typescript-eslint/parser": "^5.9.0", "@vitejs/plugin-react": "^1.1.4", "chokidar": "^3.5.2", "cross-env": "^7.0.3", @@ -55,9 +55,7 @@ "eslint": "^8.6.0", "eslint-config-airbnb-typescript": "^16.1.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0", "git-repo-info": "^2.1.1", "jest": "^27.4.7", "rimraf": "^3.0.2", @@ -67,8 +65,6 @@ }, "packageManager": "yarn@3.1.1", "dependencies": { - "loglevel": "^1.8.0", - "os-name": "^5.0.1", "preload": "^0.1.0" } } diff --git a/packages/main/.eslintrc.json b/packages/main/.eslintrc.json new file mode 100644 index 0000000..6b736e2 --- /dev/null +++ b/packages/main/.eslintrc.json @@ -0,0 +1,6 @@ +{ + "globals": { + "NodeJS": false, + "require": false + } +} diff --git a/packages/main/esbuild.config.js b/packages/main/esbuild.config.js index 500590f..c24d6e1 100644 --- a/packages/main/esbuild.config.js +++ b/packages/main/esbuild.config.js @@ -1,3 +1,4 @@ +/* eslint-disable no-process-env */ import getRepoInfo from 'git-repo-info'; import { node } from '../../config/buildConstants.js'; import { getConfig } from '../../config/esbuildConfig.js'; diff --git a/packages/main/package.json b/packages/main/package.json index b904906..e1b3f49 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -19,15 +19,18 @@ "loglevel-plugin-prefix": "^0.8.4", "mobx": "^6.3.12", "mobx-state-tree": "^5.1.0", - "ms": "^2.1.3" + "ms": "^2.1.3", + "os-name": "^5.0.1" }, "devDependencies": { + "@jest/globals": "^27.4.4", "@types/electron-devtools-installer": "^2.2.1", "@types/lodash-es": "^4.17.5", "@types/ms": "^0.7.31", "@types/node": "^17.0.8", "electron-devtools-installer": "^3.2.0", "esbuild": "^0.14.11", + "git-repo-info": "^2.1.1", "jest": "^27.4.7", "jest-mock": "^27.4.6", "rimraf": "^3.0.2", diff --git a/packages/main/src/compositionRoot.ts b/packages/main/src/compositionRoot.ts index bf0f92e..76835a1 100644 --- a/packages/main/src/compositionRoot.ts +++ b/packages/main/src/compositionRoot.ts @@ -20,11 +20,11 @@ import { app } from 'electron'; -import { initConfig } from './controllers/config.js'; -import { initNativeTheme } from './controllers/nativeTheme.js'; -import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl.js'; -import { MainStore } from './stores/MainStore.js'; -import { Disposer } from './utils/disposer.js'; +import { initConfig } from './controllers/config'; +import { initNativeTheme } from './controllers/nativeTheme'; +import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl'; +import { MainStore } from './stores/MainStore'; +import { Disposer } from './utils/disposer'; export async function init(store: MainStore): Promise { const configPersistenceService = new ConfigPersistenceServiceImpl(app.getPath('userData')); diff --git a/packages/main/src/controllers/__tests__/config.spec.ts b/packages/main/src/controllers/__tests__/config.spec.ts index eea7f1e..eb67df0 100644 --- a/packages/main/src/controllers/__tests__/config.spec.ts +++ b/packages/main/src/controllers/__tests__/config.spec.ts @@ -23,10 +23,10 @@ import { mocked } from 'jest-mock'; import ms from 'ms'; import { initConfig } from '../config'; -import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService.js'; -import { Config, config as configModel } from '../../stores/Config.js'; -import { Disposer } from '../../utils/disposer.js'; -import { silenceLogger } from '../../utils/logging.js'; +import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService'; +import { Config, config as configModel } from '../../stores/Config'; +import { Disposer } from '../../utils/disposer'; +import { silenceLogger } from '../../utils/logging'; let config: Config; let persistenceService: ConfigPersistenceService = { diff --git a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts index cffeace..85d6dd2 100644 --- a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts +++ b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts @@ -21,8 +21,8 @@ import { jest } from '@jest/globals'; import { mocked } from 'jest-mock'; -import { createMainStore, MainStore } from '../../stores/MainStore.js'; -import { Disposer } from '../../utils/disposer.js'; +import { createMainStore, MainStore } from '../../stores/MainStore'; +import { Disposer } from '../../utils/disposer'; let shouldUseDarkColors = false; diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts index 971f151..deaeac2 100644 --- a/packages/main/src/controllers/config.ts +++ b/packages/main/src/controllers/config.ts @@ -24,8 +24,8 @@ import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree'; import type { ConfigPersistenceService } from '../services/ConfigPersistenceService.js'; import type { Config, ConfigSnapshotOut } from '../stores/Config.js'; -import { Disposer } from '../utils/disposer.js'; -import { getLogger } from '../utils/logging.js'; +import { Disposer } from '../utils/disposer'; +import { getLogger } from '../utils/logging'; const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s'); diff --git a/packages/main/src/controllers/nativeTheme.ts b/packages/main/src/controllers/nativeTheme.ts index c291a16..ccd12d8 100644 --- a/packages/main/src/controllers/nativeTheme.ts +++ b/packages/main/src/controllers/nativeTheme.ts @@ -22,8 +22,8 @@ import { nativeTheme } from 'electron'; import { autorun } from 'mobx'; import type { MainStore } from '../stores/MainStore.js'; -import { Disposer } from '../utils/disposer.js'; -import { getLogger } from '../utils/logging.js'; +import { Disposer } from '../utils/disposer'; +import { getLogger } from '../utils/logging'; const log = getLogger('nativeTheme'); diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts index 2bdefb8..d0191b7 100644 --- a/packages/main/src/index.ts +++ b/packages/main/src/index.ts @@ -43,13 +43,13 @@ import { } from '@sophie/shared'; import { URL } from 'url'; -import { init } from './compositionRoot.js'; +import { init } from './compositionRoot'; import { DEVMODE_ALLOWED_URL_PREFIXES, installDevToolsExtensions, openDevToolsWhenReady, -} from './devTools.js'; -import { createMainStore } from './stores/MainStore.js'; +} from './devTools'; +import { createMainStore } from './stores/MainStore'; const isDevelopment = import.meta.env.MODE === 'development'; diff --git a/packages/main/src/services/ConfigPersistenceService.ts b/packages/main/src/services/ConfigPersistenceService.ts index 0033cca..aed0ba3 100644 --- a/packages/main/src/services/ConfigPersistenceService.ts +++ b/packages/main/src/services/ConfigPersistenceService.ts @@ -18,8 +18,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { ConfigSnapshotOut } from '../stores/Config.js'; -import { Disposer } from '../utils/disposer.js'; +import type { ConfigSnapshotOut } from '../stores/Config'; +import { Disposer } from '../utils/disposer'; export type ReadConfigResult = { found: true; data: unknown; } | { found: false; }; diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts index eba291c..2d19632 100644 --- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts +++ b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts @@ -1,4 +1,3 @@ - /* * Copyright (C) 2021-2022 Kristóf Marussy * @@ -26,8 +25,8 @@ import { join } from 'path'; import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js'; import type { ConfigSnapshotOut } from '../../stores/Config.js'; -import { Disposer } from '../../utils/disposer.js'; -import { getLogger } from '../../utils/logging.js'; +import { Disposer } from '../../utils/disposer'; +import { getLogger } from '../../utils/logging'; const log = getLogger('configPersistence'); diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts index 9368b4d..f8a09d6 100644 --- a/packages/main/src/stores/MainStore.ts +++ b/packages/main/src/stores/MainStore.ts @@ -22,7 +22,7 @@ import { applySnapshot, Instance, types } from 'mobx-state-tree'; import { BrowserViewBounds } from '@sophie/shared'; import type { Config } from './Config.js'; -import { sharedStore } from './SharedStore.js'; +import { sharedStore } from './SharedStore'; export const mainStore = types.model('MainStore', { browserViewBounds: types.optional(types.model('BrowserViewBounds', { diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts index 31b8551..e20150d 100644 --- a/packages/main/src/stores/SharedStore.ts +++ b/packages/main/src/stores/SharedStore.ts @@ -21,7 +21,7 @@ import { Instance, types } from 'mobx-state-tree'; import { sharedStore as originalSharedStore } from '@sophie/shared'; -import { config } from './Config.js'; +import { config } from './Config'; export type { SharedStoreSnapshotIn, SharedStoreSnapshotOut } from '@sophie/shared'; diff --git a/packages/preload/package.json b/packages/preload/package.json index 253b858..0957aaf 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json @@ -11,10 +11,12 @@ "dependencies": { "@sophie/shared": "workspace:*", "electron": "16.0.6", + "loglevel": "^1.8.0", "mobx": "^6.3.12", "mobx-state-tree": "^5.1.0" }, "devDependencies": { + "@jest/globals": "^27.4.4", "@types/jest": "^27.4.0", "jest": "^27.4.7", "jest-mock": "^27.4.6", diff --git a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts index f8b0024..ff77a63 100644 --- a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts +++ b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts @@ -40,7 +40,7 @@ jest.unstable_mockModule('electron', () => ({ const { ipcRenderer } = await import('electron'); -const { createSophieRenderer } = await import('../SophieRendererImpl.js'); +const { createSophieRenderer } = await import('../SophieRendererImpl'); const event: Electron.IpcRendererEvent = null as unknown as Electron.IpcRendererEvent; @@ -83,9 +83,11 @@ describe('createSophieRenderer', () => { describe('SophieRendererImpl', () => { let sut: SophieRenderer; - let onSharedStorePatch: (event: Electron.IpcRendererEvent, patch: unknown) => void; + let onSharedStorePatch: (event1: Electron.IpcRendererEvent, patch1: unknown) => void; let listener = { + // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars onSnapshot: jest.fn((_snapshot: SharedStoreSnapshotIn) => {}), + // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars onPatch: jest.fn((_patch: IJsonPatch) => {}), }; @@ -233,7 +235,9 @@ describe('SophieRendererImpl', () => { shouldUseDarkColors: false, }; const listener2 = { + // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars onSnapshot: jest.fn((_snapshot: SharedStoreSnapshotIn) => { }), + // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars onPatch: jest.fn((_patch: IJsonPatch) => { }), }; diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts index f6c720a..de91742 100644 --- a/packages/preload/src/index.ts +++ b/packages/preload/src/index.ts @@ -20,7 +20,7 @@ import { contextBridge } from 'electron'; -import { createSophieRenderer } from './contextBridge/SophieRendererImpl.js'; +import { createSophieRenderer } from './contextBridge/SophieRendererImpl'; const isDevelopment = import.meta.env.MODE === 'development'; diff --git a/packages/renderer/.eslintrc.json b/packages/renderer/.eslintrc.json new file mode 100644 index 0000000..a28aec9 --- /dev/null +++ b/packages/renderer/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "globals": { + "JSX": false + } +} diff --git a/packages/renderer/src/components/App.tsx b/packages/renderer/src/components/App.tsx index b0a069f..8bd3dd8 100644 --- a/packages/renderer/src/components/App.tsx +++ b/packages/renderer/src/components/App.tsx @@ -21,8 +21,8 @@ import Box from '@mui/material/Box'; import React from 'react'; -import { BrowserViewPlaceholder } from './BrowserViewPlaceholder.jsx'; -import { Sidebar } from './Sidebar.jsx'; +import { BrowserViewPlaceholder } from './BrowserViewPlaceholder'; +import { Sidebar } from './Sidebar'; export function App(): JSX.Element { return ( diff --git a/packages/renderer/src/components/BrowserViewPlaceholder.tsx b/packages/renderer/src/components/BrowserViewPlaceholder.tsx index 6827422..6aa6b7b 100644 --- a/packages/renderer/src/components/BrowserViewPlaceholder.tsx +++ b/packages/renderer/src/components/BrowserViewPlaceholder.tsx @@ -23,7 +23,7 @@ import { observer } from 'mobx-react-lite'; import Box from '@mui/material/Box'; import React, { useCallback, useRef } from 'react'; -import { useStore } from './StoreProvider.jsx'; +import { useStore } from './StoreProvider'; export const BrowserViewPlaceholder = observer(function BrowserViewPlaceholder() { const { diff --git a/packages/renderer/src/components/Sidebar.tsx b/packages/renderer/src/components/Sidebar.tsx index a0086d2..6c79932 100644 --- a/packages/renderer/src/components/Sidebar.tsx +++ b/packages/renderer/src/components/Sidebar.tsx @@ -21,7 +21,7 @@ import Box from '@mui/material/Box'; import React from 'react'; -import { ToggleDarkModeButton } from './ToggleDarkModeButton.jsx'; +import { ToggleDarkModeButton } from './ToggleDarkModeButton'; export function Sidebar(): JSX.Element { return ( diff --git a/packages/renderer/src/components/StoreProvider.tsx b/packages/renderer/src/components/StoreProvider.tsx index fbe9b2a..da1e699 100644 --- a/packages/renderer/src/components/StoreProvider.tsx +++ b/packages/renderer/src/components/StoreProvider.tsx @@ -20,7 +20,7 @@ import React, { createContext, useContext } from 'react'; -import type { RendererStore } from '../stores/RendererStore.jsx'; +import type { RendererStore } from '../stores/RendererStore'; const StoreContext = createContext(null); diff --git a/packages/renderer/src/components/ThemeProvider.tsx b/packages/renderer/src/components/ThemeProvider.tsx index 9313725..9215f5c 100644 --- a/packages/renderer/src/components/ThemeProvider.tsx +++ b/packages/renderer/src/components/ThemeProvider.tsx @@ -25,7 +25,7 @@ import { } from '@mui/material/styles'; import React from 'react'; -import { useStore } from './StoreProvider.jsx'; +import { useStore } from './StoreProvider'; export const ThemeProvider = observer(function ThemeProvider({ children }: { children: JSX.Element | JSX.Element[], diff --git a/packages/renderer/src/components/ToggleDarkModeButton.tsx b/packages/renderer/src/components/ToggleDarkModeButton.tsx index b48cc32..1b6757e 100644 --- a/packages/renderer/src/components/ToggleDarkModeButton.tsx +++ b/packages/renderer/src/components/ToggleDarkModeButton.tsx @@ -24,7 +24,7 @@ import LightModeIcon from '@mui/icons-material/LightMode'; import IconButton from '@mui/material/IconButton'; import React from 'react'; -import { useStore } from './StoreProvider.jsx'; +import { useStore } from './StoreProvider'; export const ToggleDarkModeButton = observer(function ToggleDarkModeButton() { const { shared: { shouldUseDarkColors }, toggleDarkMode } = useStore(); diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx index 8bd70d3..1626bef 100644 --- a/packages/renderer/src/index.tsx +++ b/packages/renderer/src/index.tsx @@ -26,11 +26,11 @@ import CssBaseline from '@mui/material/CssBaseline'; import React from 'react'; import { render } from 'react-dom'; -import { App } from './components/App.jsx'; -import { StoreProvider } from './components/StoreProvider.jsx'; -import { ThemeProvider } from './components/ThemeProvider.jsx'; -import { exposeToReduxDevtools, hotReloadServices } from './devTools.js'; -import { createAndConnectRendererStore } from './stores/RendererStore.js'; +import { App } from './components/App'; +import { StoreProvider } from './components/StoreProvider'; +import { ThemeProvider } from './components/ThemeProvider'; +import { exposeToReduxDevtools, hotReloadServices } from './devTools'; +import { createAndConnectRendererStore } from './stores/RendererStore'; const isDevelopment = import.meta.env.MODE === 'development'; diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts index 397c024..037b212 100644 --- a/packages/renderer/src/stores/RendererStore.ts +++ b/packages/renderer/src/stores/RendererStore.ts @@ -31,7 +31,7 @@ import { ThemeSource, } from '@sophie/shared'; -import { getEnv, RendererEnv } from './RendererEnv.js'; +import { getEnv, RendererEnv } from './RendererEnv'; export const rendererStore = types.model('RendererStore', { shared: types.optional(sharedStore, {}), diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js index 80e9fb6..bcd1975 100644 --- a/packages/renderer/vite.config.js +++ b/packages/renderer/vite.config.js @@ -1,3 +1,4 @@ +/* eslint-disable no-process-env */ /* eslint-env node */ import { builtinModules } from 'module'; diff --git a/packages/service-shared/src/index.ts b/packages/service-shared/src/index.ts index d8b5d0e..564ebe8 100644 --- a/packages/service-shared/src/index.ts +++ b/packages/service-shared/src/index.ts @@ -18,13 +18,13 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -export { ServiceToMainIpcMessage } from './ipc.js'; +export { ServiceToMainIpcMessage } from './ipc'; export type { UnreadCount, WebSource, -} from './schemas.js'; +} from './schemas'; export { unreadCount, webSource, -} from './schemas.js'; +} from './schemas'; diff --git a/packages/shared/src/contextBridge/SophieRenderer.ts b/packages/shared/src/contextBridge/SophieRenderer.ts index 285b373..fc43b6e 100644 --- a/packages/shared/src/contextBridge/SophieRenderer.ts +++ b/packages/shared/src/contextBridge/SophieRenderer.ts @@ -20,7 +20,7 @@ import { SharedStoreListener } from '../stores/SharedStore'; -import { Action } from '../schemas.js'; +import { Action } from '../schemas'; export interface SophieRenderer { onSharedStoreChange(listener: SharedStoreListener): Promise; diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index f0ae5dc..2f7146c 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -23,26 +23,26 @@ export type { SophieRenderer } from './contextBridge/SophieRenderer'; export { MainToRendererIpcMessage, RendererToMainIpcMessage, -} from './ipc.js'; +} from './ipc'; export type { Action, BrowserViewBounds, ThemeSource, -} from './schemas.js'; +} from './schemas'; export { action, browserViewBounds, themeSource, -} from './schemas.js'; +} from './schemas'; -export type { Config, ConfigSnapshotIn, ConfigSnapshotOut } from './stores/Config.js'; -export { config } from './stores/Config.js'; +export type { Config, ConfigSnapshotIn, ConfigSnapshotOut } from './stores/Config'; +export { config } from './stores/Config'; export type { SharedStore, SharedStoreListener, SharedStoreSnapshotIn, SharedStoreSnapshotOut, -} from './stores/SharedStore.js'; -export { sharedStore } from './stores/SharedStore.js'; +} from './stores/SharedStore'; +export { sharedStore } from './stores/SharedStore'; diff --git a/packages/shared/src/stores/Config.ts b/packages/shared/src/stores/Config.ts index 4b17d3c..432945c 100644 --- a/packages/shared/src/stores/Config.ts +++ b/packages/shared/src/stores/Config.ts @@ -25,7 +25,7 @@ import { SnapshotOut, } from 'mobx-state-tree'; -import { themeSource } from '../schemas.js'; +import { themeSource } from '../schemas'; export const config = types.model('Config', { themeSource: types.optional(types.enumeration(themeSource.options), 'system'), diff --git a/packages/shared/src/stores/SharedStore.ts b/packages/shared/src/stores/SharedStore.ts index 8aefcdb..c6c3ddc 100644 --- a/packages/shared/src/stores/SharedStore.ts +++ b/packages/shared/src/stores/SharedStore.ts @@ -26,7 +26,7 @@ import { SnapshotOut, } from 'mobx-state-tree'; -import { config } from './Config.js'; +import { config } from './Config'; export const sharedStore = types.model('SharedStore', { config: types.optional(config, {}), diff --git a/scripts/.eslintrc.json b/scripts/.eslintrc.json new file mode 100644 index 0000000..6018373 --- /dev/null +++ b/scripts/.eslintrc.json @@ -0,0 +1,17 @@ +{ + "env": { + "node": true + }, + "rules": { + "no-process-env": 0, + "import/no-extraneous-dependencies": [ + "error", + { + // "devDependencies": true, + // "optionalDependencies": true, + // "peerDependencies": true, + "bundledDependencies": true + } + ] + } +} diff --git a/yarn.lock b/yarn.lock index 82d1ef1..86fe235 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,16 +12,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/code-frame@npm:7.16.0" - dependencies: - "@babel/highlight": ^7.16.0 - checksum: 8961d0302ec6b8c2e9751a11e06a17617425359fd1645e4dae56a90a03464c68a0916115100fbcd030961870313f21865d0b85858360a2c68aabdda744393607 - languageName: node - linkType: hard - -"@babel/code-frame@npm:^7.16.7": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" dependencies: @@ -30,37 +21,14 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.16.0, @babel/compat-data@npm:^7.16.4": +"@babel/compat-data@npm:^7.16.4": version: 7.16.4 resolution: "@babel/compat-data@npm:7.16.4" checksum: 4949ce54eafc4b38d5623696a872acaaced1a523605708d81c2c483253941917d90dae0de40fc01e152ae56075dadd89c23014da5a632b09c001a716fa689cae languageName: node linkType: hard -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.2": - version: 7.16.5 - resolution: "@babel/core@npm:7.16.5" - dependencies: - "@babel/code-frame": ^7.16.0 - "@babel/generator": ^7.16.5 - "@babel/helper-compilation-targets": ^7.16.3 - "@babel/helper-module-transforms": ^7.16.5 - "@babel/helpers": ^7.16.5 - "@babel/parser": ^7.16.5 - "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.5 - "@babel/types": ^7.16.0 - convert-source-map: ^1.7.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.1.2 - semver: ^6.3.0 - source-map: ^0.5.0 - checksum: e5b76c6be95ab56a441772173463a56f824b39eba5fd3efe4b9784863922a1cb8abde6331d894854ed563b5ffe4be76d52524ecd07963660bb146f49a3cb3556 - languageName: node - linkType: hard - -"@babel/core@npm:^7.16.5, @babel/core@npm:^7.8.0": +"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.5, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0": version: 7.16.7 resolution: "@babel/core@npm:7.16.7" dependencies: @@ -83,18 +51,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.16.5, @babel/generator@npm:^7.7.2": - version: 7.16.5 - resolution: "@babel/generator@npm:7.16.5" - dependencies: - "@babel/types": ^7.16.0 - jsesc: ^2.5.1 - source-map: ^0.5.0 - checksum: 621fa2da21a5397a4739f03af1eda76140f0da9f962071640a479c0cf1859edc576aa8881b5771be9274238f048bf9024c94d826003659f64eee29c48f2fe470 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.16.7": +"@babel/generator@npm:^7.16.7, @babel/generator@npm:^7.7.2": version: 7.16.7 resolution: "@babel/generator@npm:7.16.7" dependencies: @@ -105,15 +62,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-annotate-as-pure@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-annotate-as-pure@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 0db76106983e10ffc482c5f01e89c3b4687d2474bea69c44470b2acb6bd37f362f9057d6e69c617255390b5d0063d9932a931e83c3e130445b688ca1fcdb5bcd - languageName: node - linkType: hard - "@babel/helper-annotate-as-pure@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-annotate-as-pure@npm:7.16.7" @@ -123,20 +71,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.16.3": - version: 7.16.3 - resolution: "@babel/helper-compilation-targets@npm:7.16.3" - dependencies: - "@babel/compat-data": ^7.16.0 - "@babel/helper-validator-option": ^7.14.5 - browserslist: ^4.17.5 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 038bcd43ac914371c51bf6e72b5cedcae432f0d359285d74a9133c6a839bd625a7d5412d7471d50aa78a3e1c79b0a692b50a8d6a1299ebf69733b512ff199323 - languageName: node - linkType: hard - "@babel/helper-compilation-targets@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-compilation-targets@npm:7.16.7" @@ -151,15 +85,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.16.5": - version: 7.16.5 - resolution: "@babel/helper-environment-visitor@npm:7.16.5" - dependencies: - "@babel/types": ^7.16.0 - checksum: f57da613f2fb9ca0b85cb4a9131cb688555e78ba8b0047ac0e73551b247eb71bf8fa075e6408064e8ab71ec230f24b4e06367efc9ccd1dcfcea0efe0086f02f3 - languageName: node - linkType: hard - "@babel/helper-environment-visitor@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-environment-visitor@npm:7.16.7" @@ -169,17 +94,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-function-name@npm:7.16.0" - dependencies: - "@babel/helper-get-function-arity": ^7.16.0 - "@babel/template": ^7.16.0 - "@babel/types": ^7.16.0 - checksum: 8c02371d28678f3bb492e69d4635b2fe6b1c5a93ce129bf883f1fafde2005f4dbc0e643f52103ca558b698c0774bfb84a93f188d71db1c077f754b6220629b92 - languageName: node - linkType: hard - "@babel/helper-function-name@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-function-name@npm:7.16.7" @@ -191,15 +105,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-get-function-arity@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-get-function-arity@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 1a68322c7b5fdffb1b51df32f7a53b1ff2268b5b99d698f0a1a426dcb355482a44ef3dae982a507907ba975314638dabb6d77ac1778098bdbe99707e6c29cae8 - languageName: node - linkType: hard - "@babel/helper-get-function-arity@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-get-function-arity@npm:7.16.7" @@ -209,15 +114,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-hoist-variables@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 2ee5b400c267c209a53c90eea406a8f09c30d4d7a2b13e304289d858a2e34a99272c062cfad6dad63705662943951c42ff20042ef539b2d3c4f8743183a28954 - languageName: node - linkType: hard - "@babel/helper-hoist-variables@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-hoist-variables@npm:7.16.7" @@ -227,16 +123,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-module-imports@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 8e1eb9ac39440e52080b87c78d8d318e7c93658bdd0f3ce0019c908de88cbddafdc241f392898c0b0ba81fc52c8c6d2f9cc1b163ac5ed2a474d49b11646b7516 - languageName: node - linkType: hard - -"@babel/helper-module-imports@npm:^7.16.7": +"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-module-imports@npm:7.16.7" dependencies: @@ -245,22 +132,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.16.5": - version: 7.16.5 - resolution: "@babel/helper-module-transforms@npm:7.16.5" - dependencies: - "@babel/helper-environment-visitor": ^7.16.5 - "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-simple-access": ^7.16.0 - "@babel/helper-split-export-declaration": ^7.16.0 - "@babel/helper-validator-identifier": ^7.15.7 - "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.5 - "@babel/types": ^7.16.0 - checksum: 0463e7198e5540cbb90981f769c89ec302001b211c33df1a6790a1eaee678ec418cee40ef3cf0fe159d40787214fbba129582f6b07e79244dc8cbcd5e791dd18 - languageName: node - linkType: hard - "@babel/helper-module-transforms@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-module-transforms@npm:7.16.7" @@ -277,29 +148,13 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.5, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.16.5 - resolution: "@babel/helper-plugin-utils@npm:7.16.5" - checksum: 3ff605f879a9ed287952b538a8334bb16e6cf7cf441f205713b1cf8043b047a965773b66e50575018504f349e16368acfe4702a2f376e16263733e2c7c6c3e39 - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.16.7": +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.8.0": version: 7.16.7 resolution: "@babel/helper-plugin-utils@npm:7.16.7" checksum: d08dd86554a186c2538547cd537552e4029f704994a9201d41d82015c10ed7f58f9036e8d1527c3760f042409163269d308b0b3706589039c5f1884619c6d4ce languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-simple-access@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 2d7155f318411788b42d2f4a3d406de12952ad620d0bd411a0f3b5803389692ad61d9e7fab5f93b23ad3d8a09db4a75ca9722b9873a606470f468bc301944af6 - languageName: node - linkType: hard - "@babel/helper-simple-access@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-simple-access@npm:7.16.7" @@ -309,15 +164,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/helper-split-export-declaration@npm:7.16.0" - dependencies: - "@babel/types": ^7.16.0 - checksum: 8bd87b5ea2046b145f0f55bc75cbdb6df69eaeb32919ee3c1c758757025aebca03e567a4d48389eb4f16a55021adb6ed8fa58aa771e164b15fa5e0a0722f771d - languageName: node - linkType: hard - "@babel/helper-split-export-declaration@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-split-export-declaration@npm:7.16.7" @@ -327,13 +173,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.15.7": - version: 7.15.7 - resolution: "@babel/helper-validator-identifier@npm:7.15.7" - checksum: f041c28c531d1add5cc345b25d5df3c29c62bce3205b4d4a93dcd164ccf630350acba252d374fad8f5d8ea526995a215829f27183ba7ce7ce141843bf23068a6 - languageName: node - linkType: hard - "@babel/helper-validator-identifier@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-identifier@npm:7.16.7" @@ -341,13 +180,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-validator-option@npm:7.14.5" - checksum: 1b25c34a5cb3d8602280f33b9ab687d2a77895e3616458d0f70ddc450ada9b05e342c44f322bc741d51b252e84cff6ec44ae93d622a3354828579a643556b523 - languageName: node - linkType: hard - "@babel/helper-validator-option@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-option@npm:7.16.7" @@ -355,17 +187,6 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.16.5": - version: 7.16.5 - resolution: "@babel/helpers@npm:7.16.5" - dependencies: - "@babel/template": ^7.16.0 - "@babel/traverse": ^7.16.5 - "@babel/types": ^7.16.0 - checksum: 960d938a4359b7f9ff7b753e33b6f600e269aec0ef6030c8026ac37525103da8cde5f1c04ce7de1ad6fc37707aa6178eae938d6fc82544aa25c9fd602c62e0a8 - languageName: node - linkType: hard - "@babel/helpers@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helpers@npm:7.16.7" @@ -377,17 +198,6 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.16.0": - version: 7.16.0 - resolution: "@babel/highlight@npm:7.16.0" - dependencies: - "@babel/helper-validator-identifier": ^7.15.7 - chalk: ^2.0.0 - js-tokens: ^4.0.0 - checksum: abf244c48fcff20ec87830e8b99c776f4dcdd9138e63decc195719a94148da35339639e0d8045eb9d1f3e67a39ab90a9c3f5ce2d579fb1a0368d911ddf29b4e5 - languageName: node - linkType: hard - "@babel/highlight@npm:^7.16.7": version: 7.16.7 resolution: "@babel/highlight@npm:7.16.7" @@ -399,16 +209,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.5": - version: 7.16.6 - resolution: "@babel/parser@npm:7.16.6" - bin: - parser: ./bin/babel-parser.js - checksum: 5cbb01a7b2ba5d609945099bfadb01f54e11ef85201e1e0bf47010ee1b35c257eca6ff91606c6ce8adba82a95e180b583183e4dc076f4a70e706152075dd98ca - languageName: node - linkType: hard - -"@babel/parser@npm:^7.16.7": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.7": version: 7.16.7 resolution: "@babel/parser@npm:7.16.7" bin: @@ -472,18 +273,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.12.13, @babel/plugin-syntax-jsx@npm:^7.16.5": - version: 7.16.5 - resolution: "@babel/plugin-syntax-jsx@npm:7.16.5" - dependencies: - "@babel/helper-plugin-utils": ^7.16.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 2f90d83924084b2677dc8b6a66360afae6cec8aa16f00f203e96293c2ad0bdf77f0ea8e9119c50cbaeb39508c793fe12f6fe7dad70207897fcb419b7deab698e - languageName: node - linkType: hard - -"@babel/plugin-syntax-jsx@npm:^7.16.7": +"@babel/plugin-syntax-jsx@npm:^7.12.13, @babel/plugin-syntax-jsx@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-syntax-jsx@npm:7.16.7" dependencies: @@ -615,22 +405,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.16.5": - version: 7.16.5 - resolution: "@babel/plugin-transform-react-jsx@npm:7.16.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.16.0 - "@babel/helper-module-imports": ^7.16.0 - "@babel/helper-plugin-utils": ^7.16.5 - "@babel/plugin-syntax-jsx": ^7.16.5 - "@babel/types": ^7.16.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 07a8b2443df86bd7ef51849fc097f9c5f72205ad47c8e41462f08b49a00c16fbd96f60a9f18a9ce741d9852fa1516bb65d91fbe7437f69a2e1852a20f89261f7 - languageName: node - linkType: hard - -"@babel/plugin-transform-react-jsx@npm:^7.16.7": +"@babel/plugin-transform-react-jsx@npm:^7.16.5, @babel/plugin-transform-react-jsx@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-transform-react-jsx@npm:7.16.7" dependencies: @@ -645,25 +420,6 @@ __metadata: languageName: node linkType: hard -"@babel/runtime-corejs3@npm:^7.10.2": - version: 7.16.7 - resolution: "@babel/runtime-corejs3@npm:7.16.7" - dependencies: - core-js-pure: ^3.19.0 - regenerator-runtime: ^0.13.4 - checksum: c40cabaead64e4843a24b064cdeeabf87780bf06567146234eca94a64acb760225a9f31151eec1913c91f6f4c86afad325c5fec9262a5434e8b0a3ea905d51cf - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.10.2": - version: 7.16.7 - resolution: "@babel/runtime@npm:7.16.7" - dependencies: - regenerator-runtime: ^0.13.4 - checksum: 47912f0aaacd1cab2e2552aaf3e6eaffbcaf2d5ac9b07a89a12ac0d42029cb92c070b0d16f825e4277c4a34677c54d8ffe85e1f7c6feb57de58f700eec67ce2f - languageName: node - linkType: hard - "@babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.7": version: 7.16.5 resolution: "@babel/runtime@npm:7.16.5" @@ -673,18 +429,7 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.16.0, @babel/template@npm:^7.3.3": - version: 7.16.0 - resolution: "@babel/template@npm:7.16.0" - dependencies: - "@babel/code-frame": ^7.16.0 - "@babel/parser": ^7.16.0 - "@babel/types": ^7.16.0 - checksum: 940f105cc6a6aee638cd8cfae80b8b80811e0ddd53b6a11f3a68431ebb998564815fb26511b5d9cb4cff66ea67130ba7498555ee015375d32f5f89ceaa6662ea - languageName: node - linkType: hard - -"@babel/template@npm:^7.16.7": +"@babel/template@npm:^7.16.7, @babel/template@npm:^7.3.3": version: 7.16.7 resolution: "@babel/template@npm:7.16.7" dependencies: @@ -695,25 +440,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.16.5, @babel/traverse@npm:^7.7.2": - version: 7.16.5 - resolution: "@babel/traverse@npm:7.16.5" - dependencies: - "@babel/code-frame": ^7.16.0 - "@babel/generator": ^7.16.5 - "@babel/helper-environment-visitor": ^7.16.5 - "@babel/helper-function-name": ^7.16.0 - "@babel/helper-hoist-variables": ^7.16.0 - "@babel/helper-split-export-declaration": ^7.16.0 - "@babel/parser": ^7.16.5 - "@babel/types": ^7.16.0 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: 6bc31311b641ac0a1c6c854cad3faa172f54d987f9a28d7d75ed64ecbcc74983f60acd51bdd792f77e451fd5385c10ce9955f9d1d60162bd32748cc42dc7eef9 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.16.7": +"@babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.7.2": version: 7.16.7 resolution: "@babel/traverse@npm:7.16.7" dependencies: @@ -731,17 +458,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": - version: 7.16.0 - resolution: "@babel/types@npm:7.16.0" - dependencies: - "@babel/helper-validator-identifier": ^7.15.7 - to-fast-properties: ^2.0.0 - checksum: 5b483da5c6e6f2394fba7ee1da8787a0c9cddd33491271c4da702e49e6faf95ce41d7c8bf9a4ee47f2ef06bdb35096f4d0f6ae4b5bea35ebefe16309d22344b7 - languageName: node - linkType: hard - -"@babel/types@npm:^7.16.7": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": version: 7.16.7 resolution: "@babel/types@npm:7.16.7" dependencies: @@ -1110,7 +827,7 @@ __metadata: languageName: node linkType: hard -"@jest/globals@npm:^27.4.6": +"@jest/globals@npm:^27.4.4, @jest/globals@npm:^27.4.6": version: 27.4.6 resolution: "@jest/globals@npm:27.4.6" dependencies: @@ -1507,6 +1224,7 @@ __metadata: version: 0.0.0-use.local resolution: "@sophie/main@workspace:packages/main" dependencies: + "@jest/globals": ^27.4.4 "@sophie/service-shared": "workspace:*" "@sophie/shared": "workspace:*" "@types/electron-devtools-installer": ^2.2.1 @@ -1518,6 +1236,7 @@ __metadata: electron-devtools-installer: ^3.2.0 esbuild: ^0.14.11 fs-extra: ^10.0.0 + git-repo-info: ^2.1.1 jest: ^27.4.7 jest-mock: ^27.4.6 json5: ^2.2.0 @@ -1527,6 +1246,7 @@ __metadata: mobx: ^6.3.12 mobx-state-tree: ^5.1.0 ms: ^2.1.3 + os-name: ^5.0.1 rimraf: ^3.0.2 typescript: ^4.5.4 languageName: unknown @@ -1536,12 +1256,14 @@ __metadata: version: 0.0.0-use.local resolution: "@sophie/preload@workspace:packages/preload" dependencies: + "@jest/globals": ^27.4.4 "@sophie/shared": "workspace:*" "@types/jest": ^27.4.0 electron: 16.0.6 jest: ^27.4.7 jest-mock: ^27.4.6 jsdom: ^19.0.0 + loglevel: ^1.8.0 mobx: ^6.3.12 mobx-state-tree: ^5.1.0 rimraf: ^3.0.2 @@ -1816,10 +1538,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*": - version: 17.0.6 - resolution: "@types/node@npm:17.0.6" - checksum: 36fda5555ec759132886721f59fa74333947f7148b7dcce3de0a78c36f37f57ec86a3d09fd38c835ba65c8de77905de6c01523ec99864d8cead83f404118a44a +"@types/node@npm:*, @types/node@npm:^17.0.8": + version: 17.0.8 + resolution: "@types/node@npm:17.0.8" + checksum: f4cadeb9e602027520abc88c77142697e33cf6ac98bb02f8b595a398603cbd33df1f94d01c055c9f13cde0c8eaafc5e396ca72645458d42b4318b845bc7f1d0f languageName: node linkType: hard @@ -1830,13 +1552,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.8": - version: 17.0.8 - resolution: "@types/node@npm:17.0.8" - checksum: f4cadeb9e602027520abc88c77142697e33cf6ac98bb02f8b595a398603cbd33df1f94d01c055c9f13cde0c8eaafc5e396ca72645458d42b4318b845bc7f1d0f - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" @@ -1961,12 +1676,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.8.1" +"@typescript-eslint/eslint-plugin@npm:^5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.9.0" dependencies: - "@typescript-eslint/experimental-utils": 5.8.1 - "@typescript-eslint/scope-manager": 5.8.1 + "@typescript-eslint/experimental-utils": 5.9.0 + "@typescript-eslint/scope-manager": 5.9.0 + "@typescript-eslint/type-utils": 5.9.0 debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 @@ -1979,66 +1695,82 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9e5b5c1e22563fc0a31f1b916cea8b059b6dd218ccbf809b7453e4563065781e4544a6d5ce4cbf60b40394f2604e925d10cafd468a4dd0f490e75775267839a0 + checksum: 31443d4331dddf7618d6b3fdbf148ec6d5ce7c64c85ec3973e520e633467d8d5605896f7eab9d7c6f81c050458c84bca10a6b0ed3537d48e6ee728f8b64d46a2 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/experimental-utils@npm:5.8.1" +"@typescript-eslint/experimental-utils@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.9.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.8.1 - "@typescript-eslint/types": 5.8.1 - "@typescript-eslint/typescript-estree": 5.8.1 + "@typescript-eslint/scope-manager": 5.9.0 + "@typescript-eslint/types": 5.9.0 + "@typescript-eslint/typescript-estree": 5.9.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 15c17a7b7a45a9e1ebf537e6d6221e423c8f5114c0a517265698745b9a4ae965487ef7856a0b1ee64cbda8db641a9204270fda88398ab1d7013256e0ccbd3e75 + checksum: 731b27840642b644e65f4ae321ed47e973ffadacd1aa24a19b02b4b298b5bcfbfa16c2d3d034e87a08c3c45f942c5b974f7619cb143eb23fb950f37418dce791 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/parser@npm:5.8.1" +"@typescript-eslint/parser@npm:^5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/parser@npm:5.9.0" dependencies: - "@typescript-eslint/scope-manager": 5.8.1 - "@typescript-eslint/types": 5.8.1 - "@typescript-eslint/typescript-estree": 5.8.1 + "@typescript-eslint/scope-manager": 5.9.0 + "@typescript-eslint/types": 5.9.0 + "@typescript-eslint/typescript-estree": 5.9.0 debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: bb1702851ff0ade16a50789c517155557ad7e9b8e5e9c4553aad52fedbc8f94acaade1dc5ba12a96b54a13a68dfea13955ab885aad97cf3c526a8b90880bd8a3 + checksum: ae95a7eb977b7bb4eec98357577b043d8ba48d47ae43ec18eadd350336b485ce91ac969b92e22143cc77797cc96cf37598d2bddcdd974d45fb3ec4f01b53b92a languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/scope-manager@npm:5.8.1" +"@typescript-eslint/scope-manager@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/scope-manager@npm:5.9.0" dependencies: - "@typescript-eslint/types": 5.8.1 - "@typescript-eslint/visitor-keys": 5.8.1 - checksum: d9254018d723aff32fc512b7292737b154367198ab58e0faf814b4ce77d4de20552ed1678f2639b35e480eb5594eb9d5f1d34360885f5e4d80ca8e5a9ccf666c + "@typescript-eslint/types": 5.9.0 + "@typescript-eslint/visitor-keys": 5.9.0 + checksum: 46e7ab0cef558e7faf1aa8d122a265e196566c0073292f5b2f9cede1f63f52860be8e4ef90251c15e0922339c15852584cb5337382035baff87f1203c0c8d1b5 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/types@npm:5.8.1" - checksum: f9809c2c0f523841adeeb66410911f10492d3df7a912bc3d72304f4edbc5b5cb1a3f5f2a6ded20e8b524cc18e92d2a735fb8b96570e75df669061182932200ef +"@typescript-eslint/type-utils@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/type-utils@npm:5.9.0" + dependencies: + "@typescript-eslint/experimental-utils": 5.9.0 + debug: ^4.3.2 + tsutils: ^3.21.0 + peerDependencies: + eslint: "*" + peerDependenciesMeta: + typescript: + optional: true + checksum: 787c3277e37f6bbd723ff10aec6ddc61a62860bd2b1d354c4a50c1aec9b479ee4f51be9fd1cdeac2e43e22161481e76409c00e6a4d50549ceaee0c59fc5cd73d languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.8.1" +"@typescript-eslint/types@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/types@npm:5.9.0" + checksum: 7c4e142600aec266b41418dab1d0cee8cace980b6990692df6522de6eab6705bf515aef36180e4a38c62acb10c92fb474269ac6856a4266d6b035068cd83fad3 + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.9.0" dependencies: - "@typescript-eslint/types": 5.8.1 - "@typescript-eslint/visitor-keys": 5.8.1 + "@typescript-eslint/types": 5.9.0 + "@typescript-eslint/visitor-keys": 5.9.0 debug: ^4.3.2 globby: ^11.0.4 is-glob: ^4.0.3 @@ -2047,17 +1779,17 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e3cfbd088f1e0104b5b38fcc6e400a0d0e72395694406357e478369c4df532aa2accfe2ee77c71854ca9a04e0e3cddbed86388334805c91ca4241b032cbb6d20 + checksum: 71e3f720e335fb08e66950d32b723484aa4d1f4a3163e82259f4be2d11091545070c2e71472be470403cb6f82bf1abe84fa89c1d0b1d47adc8550b3f70aabfb5 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.8.1": - version: 5.8.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.8.1" +"@typescript-eslint/visitor-keys@npm:5.9.0": + version: 5.9.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.9.0" dependencies: - "@typescript-eslint/types": 5.8.1 + "@typescript-eslint/types": 5.9.0 eslint-visitor-keys: ^3.0.0 - checksum: 46567678718a227b34a255a3606e1a2c5190a470dc9493d4c175f57566d2c16b88780fb273ca44f22cab06d45d87b25371215e93b88ac10a475877bd64bdfece + checksum: 34a595b83b0e7d4f387d6c81b272804b94a1a91478c5f856fdfdd227595bf8562bf3f5d732606d10b4522c3f2617d09d4bacd2193f757a324ea66b3144a68903 languageName: node linkType: hard @@ -2326,16 +2058,6 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:^4.2.2": - version: 4.2.2 - resolution: "aria-query@npm:4.2.2" - dependencies: - "@babel/runtime": ^7.10.2 - "@babel/runtime-corejs3": ^7.10.2 - checksum: 38401a9a400f26f3dcc24b84997461a16b32869a9893d323602bed8da40a8bcc0243b8d2880e942249a1496cea7a7de769e93d21c0baa439f01e1ee936fed665 - languageName: node - linkType: hard - "array-includes@npm:^3.1.3, array-includes@npm:^3.1.4": version: 3.1.4 resolution: "array-includes@npm:3.1.4" @@ -2403,13 +2125,6 @@ __metadata: languageName: node linkType: hard -"ast-types-flow@npm:^0.0.7": - version: 0.0.7 - resolution: "ast-types-flow@npm:0.0.7" - checksum: a26dcc2182ffee111cad7c471759b0bda22d3b7ebacf27c348b22c55f16896b18ab0a4d03b85b4020dce7f3e634b8f00b593888f622915096ea1927fa51866c4 - languageName: node - linkType: hard - "astral-regex@npm:^2.0.0": version: 2.0.0 resolution: "astral-regex@npm:2.0.0" @@ -2452,20 +2167,6 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.3.5": - version: 4.3.5 - resolution: "axe-core@npm:4.3.5" - checksum: 973c6a80f0aaa663820b209d4202de7a0c240a2dea2f3cff168b09c0f221b27179b1f0988f00ad11ed63cbc50535920f8ca779de1c60dc82090ab2d275f71fdd - languageName: node - linkType: hard - -"axobject-query@npm:^2.2.0": - version: 2.2.0 - resolution: "axobject-query@npm:2.2.0" - checksum: 96b8c7d807ca525f41ad9b286186e2089b561ba63a6d36c3e7d73dc08150714660995c7ad19cda05784458446a0793b45246db45894631e13853f48c1aa3117f - languageName: node - linkType: hard - "babel-jest@npm:^27.4.6": version: 27.4.6 resolution: "babel-jest@npm:27.4.6" @@ -3154,13 +2855,6 @@ __metadata: languageName: node linkType: hard -"core-js-pure@npm:^3.19.0": - version: 3.20.2 - resolution: "core-js-pure@npm:3.20.2" - checksum: d6b3f6782e3f2fc27eb2335917d5c5d0e7621e424c25da67429e9b48b7708b76fdc4a178b245421eeb8342c0ea9b0ca636ece002db3d0e68246a9d395d461ca7 - languageName: node - linkType: hard - "core-util-is@npm:1.0.2": version: 1.0.2 resolution: "core-util-is@npm:1.0.2" @@ -3264,13 +2958,6 @@ __metadata: languageName: node linkType: hard -"damerau-levenshtein@npm:^1.0.7": - version: 1.0.7 - resolution: "damerau-levenshtein@npm:1.0.7" - checksum: ec8161cb381523e0db9b5c9b64863736da3197808b6fdc4a3a2ca764c0b4357e9232a4c5592220fb18755a91240b8fee7b13ab1b269fbbdc5f68c36f0053aceb - languageName: node - linkType: hard - "data-urls@npm:^2.0.0": version: 2.0.0 resolution: "data-urls@npm:2.0.0" @@ -3686,13 +3373,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^9.2.2": - version: 9.2.2 - resolution: "emoji-regex@npm:9.2.2" - checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601 - languageName: node - linkType: hard - "encodeurl@npm:^1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -4292,37 +3972,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsx-a11y@npm:^6.5.1": - version: 6.5.1 - resolution: "eslint-plugin-jsx-a11y@npm:6.5.1" - dependencies: - "@babel/runtime": ^7.16.3 - aria-query: ^4.2.2 - array-includes: ^3.1.4 - ast-types-flow: ^0.0.7 - axe-core: ^4.3.5 - axobject-query: ^2.2.0 - damerau-levenshtein: ^1.0.7 - emoji-regex: ^9.2.2 - has: ^1.0.3 - jsx-ast-utils: ^3.2.1 - language-tags: ^1.0.5 - minimatch: ^3.0.4 - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 311ab993ed982d0cc7cb0ba02fbc4b36c4a94e9434f31e97f13c4d67e8ecb8aec36baecfd759ff70498846e7e11d7a197eb04c39ad64934baf3354712fd0bc9d - languageName: node - linkType: hard - -"eslint-plugin-react-hooks@npm:^4.3.0": - version: 4.3.0 - resolution: "eslint-plugin-react-hooks@npm:4.3.0" - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: 0ba1566ba0780bbc75a5921f49188edf232db2085ab32c8d3889592f0db9d6fadc97fcf639775e0101dec6b5409ca3c803ec44213b90c8bacaf0bdf921871c2e - languageName: node - linkType: hard - "eslint-plugin-react@npm:^7.28.0": version: 7.28.0 resolution: "eslint-plugin-react@npm:7.28.0" @@ -5801,19 +5450,7 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^27.0.0": - version: 27.4.2 - resolution: "jest-diff@npm:27.4.2" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^27.4.0 - jest-get-type: ^27.4.0 - pretty-format: ^27.4.2 - checksum: e5bcdb4f27747795b74a56d56a9545d7fc8f1671a1251d580aea1a7a52df5db044f62ec24f2abc68305f0226d918a443f3b88d9a82f8d0dc4aaa079b621ab091 - languageName: node - linkType: hard - -"jest-diff@npm:^27.4.6": +"jest-diff@npm:^27.0.0, jest-diff@npm:^27.4.6": version: 27.4.6 resolution: "jest-diff@npm:27.4.6" dependencies: @@ -6416,7 +6053,7 @@ __metadata: languageName: node linkType: hard -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.2.1": +"jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.2.1 resolution: "jsx-ast-utils@npm:3.2.1" dependencies: @@ -6454,22 +6091,6 @@ __metadata: languageName: node linkType: hard -"language-subtag-registry@npm:~0.3.2": - version: 0.3.21 - resolution: "language-subtag-registry@npm:0.3.21" - checksum: 5f794525a5bfcefeea155a681af1c03365b60e115b688952a53c6e0b9532b09163f57f1fcb69d6150e0e805ec0350644a4cb35da98f4902562915be9f89572a1 - languageName: node - linkType: hard - -"language-tags@npm:^1.0.5": - version: 1.0.5 - resolution: "language-tags@npm:1.0.5" - dependencies: - language-subtag-registry: ~0.3.2 - checksum: c81b5d8b9f5f9cfd06ee71ada6ddfe1cf83044dd5eeefcd1e420ad491944da8957688db4a0a9bc562df4afdc2783425cbbdfd152c01d93179cf86888903123cf - languageName: node - linkType: hard - "latest-version@npm:^5.1.0": version: 5.1.0 resolution: "latest-version@npm:5.1.0" @@ -7449,19 +7070,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^27.0.0, pretty-format@npm:^27.4.2": - version: 27.4.2 - resolution: "pretty-format@npm:27.4.2" - dependencies: - "@jest/types": ^27.4.2 - ansi-regex: ^5.0.1 - ansi-styles: ^5.0.0 - react-is: ^17.0.1 - checksum: 0daaf00c4dcb35493e57d30147e8045d0c45cb47fc4c94e3ab1892401abe939627c39975c77cc81eb2581aaa5b12bf23ef669fa550bec68b396fb79dd8c10afa - languageName: node - linkType: hard - -"pretty-format@npm:^27.4.6": +"pretty-format@npm:^27.0.0, pretty-format@npm:^27.4.6": version: 27.4.6 resolution: "pretty-format@npm:27.4.6" dependencies: @@ -7899,21 +7508,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.59.0": - version: 2.62.0 - resolution: "rollup@npm:2.62.0" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 9dfa089a232346bc548bf5110e79e0cf5a2dac6fb9bf3f737a645e72795b4b4a1165d1bf86938f90805c4391e8dd571557afb901aaf81dcb82690c57737ab128 - languageName: node - linkType: hard - -"rollup@npm:^2.63.0": +"rollup@npm:^2.59.0, rollup@npm:^2.63.0": version: 2.63.0 resolution: "rollup@npm:2.63.0" dependencies: @@ -8185,8 +7780,8 @@ __metadata: dependencies: "@electron/fuses": ^1.5.0 "@types/jest": ^27.4.0 - "@typescript-eslint/eslint-plugin": ^5.8.1 - "@typescript-eslint/parser": ^5.8.1 + "@typescript-eslint/eslint-plugin": ^5.9.0 + "@typescript-eslint/parser": ^5.9.0 "@vitejs/plugin-react": ^1.1.4 chokidar: ^3.5.2 cross-env: ^7.0.3 @@ -8196,13 +7791,9 @@ __metadata: eslint: ^8.6.0 eslint-config-airbnb-typescript: ^16.1.0 eslint-plugin-import: ^2.25.4 - eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-react: ^7.28.0 - eslint-plugin-react-hooks: ^4.3.0 git-repo-info: ^2.1.1 jest: ^27.4.7 - loglevel: ^1.8.0 - os-name: ^5.0.1 preload: ^0.1.0 rimraf: ^3.0.2 rollup: ^2.63.0 -- cgit v1.2.3-54-g00ecf