diff --git a/.github/workflows/linter-and-test.yml b/.github/workflows/linter-and-test.yml index 41158efab..c8c214faa 100644 --- a/.github/workflows/linter-and-test.yml +++ b/.github/workflows/linter-and-test.yml @@ -44,7 +44,6 @@ jobs: - name: Linter and test run: | yarn config set network-timeout 300000 - yarn build:core yarn install yarn lint yarn build:plugins @@ -59,7 +58,12 @@ jobs: - name: Clean workspace run: | Remove-Item -Path .\* -Force -Recurse - Remove-Item -Path "$Env:APPDATA\jan" -Force -Recurse + $path = "$Env:APPDATA\jan" + if (Test-Path $path) { + Remove-Item $path -Recurse -Force + } else { + Write-Output "Folder does not exist." + } - name: Getting the repo uses: actions/checkout@v3 @@ -71,7 +75,6 @@ jobs: - name: Linter and test run: | yarn config set network-timeout 300000 - yarn build:core yarn install yarn lint yarn build:plugins @@ -101,7 +104,6 @@ jobs: export DISPLAY=$(w -h | awk 'NR==1 {print $2}') echo -e "Display ID: $DISPLAY" yarn config set network-timeout 300000 - yarn build:core yarn install yarn lint yarn build:plugins diff --git a/README.md b/README.md index d1b3022a1..39b8ec1d8 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ To reset your installation: 1. Delete Jan Application from /Applications 1. Clear cache: -`rm -rf /Users/$(whoami)/Library/Application\ Support/jan` +`rm -rf /Users/$(whoami)/Library/Application\ Support/jan-electron` OR `rm -rf /Users/$(whoami)/Library/Application\ Support/jan` diff --git a/package.json b/package.json index 8d43ed076..8dbe5f86c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dev:electron": "yarn workspace jan dev", "dev:web": "yarn workspace jan-web dev", "dev": "concurrently --kill-others \"yarn dev:web\" \"wait-on http://localhost:3000 && yarn dev:electron\"", - "build:core": "cd plugin-core && yarn install && yarn run build", + "build:core": "cd core && yarn install && yarn run build", "build:web": "yarn workspace jan-web build && cpx \"web/out/**\" \"electron/renderer/\"", "build:electron": "yarn workspace jan build", "build:plugins": "rimraf ./electron/core/pre-install/*.tgz && concurrently --kill-others-on-fail \"cd ./plugins/data-plugin && npm install && npm run postinstall\" \"cd ./plugins/inference-plugin && npm install && npm run postinstall\" \"cd ./plugins/model-management-plugin && npm install && npm run postinstall\" \"cd ./plugins/monitoring-plugin && npm install && npm run postinstall\" && concurrently --kill-others-on-fail \"cd ./plugins/data-plugin && npm run build:publish\" \"cd ./plugins/inference-plugin && npm run build:publish\" \"cd ./plugins/model-management-plugin && npm run build:publish\" \"cd ./plugins/monitoring-plugin && npm run build:publish\"", diff --git a/plugins/data-plugin/@types/global.d.ts b/plugins/data-plugin/@types/global.d.ts new file mode 100644 index 000000000..87105f099 --- /dev/null +++ b/plugins/data-plugin/@types/global.d.ts @@ -0,0 +1,2 @@ +declare const PLUGIN_NAME: string; +declare const MODULE_PATH: string; diff --git a/plugins/data-plugin/config/tsconfig.esm.json b/plugins/data-plugin/config/tsconfig.esm.json index ed0cfa447..4cddff806 100644 --- a/plugins/data-plugin/config/tsconfig.esm.json +++ b/plugins/data-plugin/config/tsconfig.esm.json @@ -4,5 +4,6 @@ "outDir": "./../dist/esm", "module": "esnext" }, - "files": ["../index.ts"] + "include": ["@types/*"], + "files": ["../@types/global.d.ts", "../index.ts"] } diff --git a/plugins/data-plugin/index.ts b/plugins/data-plugin/index.ts index 97cb21b2a..cc3d11e17 100644 --- a/plugins/data-plugin/index.ts +++ b/plugins/data-plugin/index.ts @@ -1,7 +1,4 @@ -import { core, store, RegisterExtensionPoint, StoreService, DataService, PluginService } from "@janhq/plugin-core"; - -const PluginName = "@janhq/data-plugin"; -const MODULE_PATH = "@janhq/data-plugin/dist/cjs/module.js"; +import { core, store, RegisterExtensionPoint, StoreService, DataService, PluginService } from "@janhq/core"; /** * Create a collection on data store @@ -136,7 +133,7 @@ function onStart() { // Register all the above functions and objects with the relevant extension points export function init({ register }: { register: RegisterExtensionPoint }) { - register(PluginService.OnStart, PluginName, onStart); + register(PluginService.OnStart, PLUGIN_NAME, onStart); register(StoreService.CreateCollection, createCollection.name, createCollection); register(StoreService.DeleteCollection, deleteCollection.name, deleteCollection); register(StoreService.InsertOne, insertOne.name, insertOne); diff --git a/plugins/data-plugin/package-lock.json b/plugins/data-plugin/package-lock.json index de2d2d918..01ffdc6ed 100644 --- a/plugins/data-plugin/package-lock.json +++ b/plugins/data-plugin/package-lock.json @@ -14,7 +14,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "pouchdb-find": "^8.0.1", "pouchdb-node": "^8.0.1" }, @@ -50,10 +50,10 @@ "node": ">=10.0.0" } }, - "node_modules/@janhq/plugin-core": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@janhq/plugin-core/-/plugin-core-0.1.8.tgz", - "integrity": "sha512-wJe+8ndMQLGLSV36Jt1V3s5lmH+nQw87ol2NMhHuVWXfwf+DAO1GTdTeHfemHWdcB/oUY1HVRvsNh8DvBgbh/w==" + "node_modules/@janhq/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@janhq/core/-/core-0.1.1.tgz", + "integrity": "sha512-p6T+7gc7Bfwmef9Y+whdHxWAwdvcJ3psyni/sKgraLV4kuVIiGZuhcIrah/3PtTB2Jcoo5Sl4Cp51PC50xY2Tg==" }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", diff --git a/plugins/data-plugin/package.json b/plugins/data-plugin/package.json index 91dc4f7c8..86c7458f3 100644 --- a/plugins/data-plugin/package.json +++ b/plugins/data-plugin/package.json @@ -4,13 +4,14 @@ "description": "The Data Connector provides easy access to a data API using the PouchDB engine. It offers accessible data management capabilities.", "icon": "https://raw.githubusercontent.com/tailwindlabs/heroicons/88e98b0c2b458553fbadccddc2d2f878edc0387b/src/20/solid/circle-stack.svg", "main": "dist/esm/index.js", + "module": "dist/cjs/module.js", "author": "Jan", "license": "MIT", "activationPoints": [ "init" ], "scripts": { - "build": "tsc --project ./config/tsconfig.esm.json && tsc --project ./config/tsconfig.cjs.json && webpack --config webpack.config.js", + "build": "tsc -b ./config/tsconfig.esm.json && tsc -b ./config/tsconfig.cjs.json && webpack --config webpack.config.js", "postinstall": "rimraf ./data-plugin*.tgz && npm run build", "build:publish": "npm pack && cpx *.tgz ../../electron/core/pre-install" }, @@ -39,7 +40,7 @@ "node_modules" ], "dependencies": { - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "pouchdb-find": "^8.0.1", "pouchdb-node": "^8.0.1" } diff --git a/plugins/data-plugin/webpack.config.js b/plugins/data-plugin/webpack.config.js index 486a35057..b88dd14d3 100644 --- a/plugins/data-plugin/webpack.config.js +++ b/plugins/data-plugin/webpack.config.js @@ -1,4 +1,6 @@ const path = require("path"); +const webpack = require("webpack"); +const packageJson = require("./package.json"); module.exports = { experiments: { outputModule: true }, @@ -13,6 +15,12 @@ module.exports = { }, ], }, + plugins: [ + new webpack.DefinePlugin({ + PLUGIN_NAME: JSON.stringify(packageJson.name), + MODULE_PATH: JSON.stringify(`${packageJson.name}/${packageJson.module}`), + }), + ], output: { filename: "esm/index.js", // Adjust the output file name as needed path: path.resolve(__dirname, "dist"), @@ -22,7 +30,7 @@ module.exports = { extensions: [".ts", ".js"], }, optimization: { - minimize: false + minimize: false, }, // Add loaders and other configuration as needed for your project }; diff --git a/plugins/inference-plugin/@types/global.d.ts b/plugins/inference-plugin/@types/global.d.ts new file mode 100644 index 000000000..87105f099 --- /dev/null +++ b/plugins/inference-plugin/@types/global.d.ts @@ -0,0 +1,2 @@ +declare const PLUGIN_NAME: string; +declare const MODULE_PATH: string; diff --git a/plugins/inference-plugin/index.ts b/plugins/inference-plugin/index.ts index 59d79afeb..ca2869650 100644 --- a/plugins/inference-plugin/index.ts +++ b/plugins/inference-plugin/index.ts @@ -1,7 +1,5 @@ -import { EventName, InferenceService, NewMessageRequest, PluginService, core, events, store } from "@janhq/plugin-core"; +import { EventName, InferenceService, NewMessageRequest, PluginService, core, events, store } from "@janhq/core"; -const PluginName = "@janhq/inference-plugin"; -const MODULE_PATH = `${PluginName}/dist/module.js`; const inferenceUrl = "http://localhost:3928/llama/chat_completion"; const initModel = async (product) => core.invokePluginFunc(MODULE_PATH, "initModel", product); @@ -91,7 +89,7 @@ const onStart = async () => { }; // Register all the above functions and objects with the relevant extension points export function init({ register }) { - register(PluginService.OnStart, PluginName, onStart); + register(PluginService.OnStart, PLUGIN_NAME, onStart); register(InferenceService.InitModel, initModel.name, initModel); register(InferenceService.StopModel, stopModel.name, stopModel); } diff --git a/plugins/inference-plugin/package-lock.json b/plugins/inference-plugin/package-lock.json index c8aa62b2d..146e4912b 100644 --- a/plugins/inference-plugin/package-lock.json +++ b/plugins/inference-plugin/package-lock.json @@ -14,7 +14,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "kill-port-process": "^3.2.0", "tcp-port-used": "^1.0.2", "ts-loader": "^9.5.0" @@ -38,10 +38,10 @@ "node": ">=10.0.0" } }, - "node_modules/@janhq/plugin-core": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@janhq/plugin-core/-/plugin-core-0.1.8.tgz", - "integrity": "sha512-wJe+8ndMQLGLSV36Jt1V3s5lmH+nQw87ol2NMhHuVWXfwf+DAO1GTdTeHfemHWdcB/oUY1HVRvsNh8DvBgbh/w==" + "node_modules/@janhq/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@janhq/core/-/core-0.1.1.tgz", + "integrity": "sha512-p6T+7gc7Bfwmef9Y+whdHxWAwdvcJ3psyni/sKgraLV4kuVIiGZuhcIrah/3PtTB2Jcoo5Sl4Cp51PC50xY2Tg==" }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", diff --git a/plugins/inference-plugin/package.json b/plugins/inference-plugin/package.json index 7d844f437..06d970d01 100644 --- a/plugins/inference-plugin/package.json +++ b/plugins/inference-plugin/package.json @@ -4,6 +4,7 @@ "description": "Inference Plugin, powered by @janhq/nitro, bring a high-performance Llama model inference in pure C++.", "icon": "https://raw.githubusercontent.com/tailwindlabs/heroicons/88e98b0c2b458553fbadccddc2d2f878edc0387b/src/20/solid/command-line.svg", "main": "dist/index.js", + "module": "dist/module.js", "author": "Jan", "license": "MIT", "activationPoints": [ @@ -25,7 +26,7 @@ "webpack-cli": "^5.1.4" }, "dependencies": { - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "kill-port-process": "^3.2.0", "tcp-port-used": "^1.0.2", "ts-loader": "^9.5.0" diff --git a/plugins/inference-plugin/webpack.config.js b/plugins/inference-plugin/webpack.config.js index 18696aa34..9b72f3120 100644 --- a/plugins/inference-plugin/webpack.config.js +++ b/plugins/inference-plugin/webpack.config.js @@ -1,4 +1,6 @@ const path = require("path"); +const webpack = require("webpack"); +const packageJson = require("./package.json"); module.exports = { experiments: { outputModule: true }, @@ -13,6 +15,12 @@ module.exports = { }, ], }, + plugins: [ + new webpack.DefinePlugin({ + PLUGIN_NAME: JSON.stringify(packageJson.name), + MODULE_PATH: JSON.stringify(`${packageJson.name}/${packageJson.module}`), + }), + ], output: { filename: "index.js", // Adjust the output file name as needed path: path.resolve(__dirname, "dist"), diff --git a/plugins/model-management-plugin/@types/global.d.ts b/plugins/model-management-plugin/@types/global.d.ts new file mode 100644 index 000000000..87105f099 --- /dev/null +++ b/plugins/model-management-plugin/@types/global.d.ts @@ -0,0 +1,2 @@ +declare const PLUGIN_NAME: string; +declare const MODULE_PATH: string; diff --git a/plugins/model-management-plugin/index.ts b/plugins/model-management-plugin/index.ts index 26acdde3e..04d64be53 100644 --- a/plugins/model-management-plugin/index.ts +++ b/plugins/model-management-plugin/index.ts @@ -1,7 +1,4 @@ -import { ModelManagementService, PluginService, RegisterExtensionPoint, core, store } from "@janhq/plugin-core"; - -const PluginName = "@janhq/model-management-plugin"; -const MODULE_PATH = "@janhq/model-management-plugin/dist/module.js"; +import { ModelManagementService, PluginService, RegisterExtensionPoint, core, store } from "@janhq/core"; const getDownloadedModels = () => core.invokePluginFunc(MODULE_PATH, "getDownloadedModels"); @@ -83,7 +80,7 @@ function onStart() { // Register all the above functions and objects with the relevant extension points export function init({ register }: { register: RegisterExtensionPoint }) { - register(PluginService.OnStart, PluginName, onStart); + register(PluginService.OnStart, PLUGIN_NAME, onStart); register(ModelManagementService.GetDownloadedModels, getDownloadedModels.name, getDownloadedModels); register(ModelManagementService.GetAvailableModels, getAvailableModels.name, getAvailableModels); diff --git a/plugins/model-management-plugin/package-lock.json b/plugins/model-management-plugin/package-lock.json index b499ca0db..73a0e1c0d 100644 --- a/plugins/model-management-plugin/package-lock.json +++ b/plugins/model-management-plugin/package-lock.json @@ -14,7 +14,7 @@ "license": "MIT", "dependencies": { "@huggingface/hub": "^0.8.5", - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "ts-loader": "^9.5.0" }, "devDependencies": { @@ -45,10 +45,10 @@ "node": ">=18" } }, - "node_modules/@janhq/plugin-core": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@janhq/plugin-core/-/plugin-core-0.1.8.tgz", - "integrity": "sha512-wJe+8ndMQLGLSV36Jt1V3s5lmH+nQw87ol2NMhHuVWXfwf+DAO1GTdTeHfemHWdcB/oUY1HVRvsNh8DvBgbh/w==" + "node_modules/@janhq/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@janhq/core/-/core-0.1.1.tgz", + "integrity": "sha512-p6T+7gc7Bfwmef9Y+whdHxWAwdvcJ3psyni/sKgraLV4kuVIiGZuhcIrah/3PtTB2Jcoo5Sl4Cp51PC50xY2Tg==" }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", diff --git a/plugins/model-management-plugin/package.json b/plugins/model-management-plugin/package.json index 801e06e81..36431c3a3 100644 --- a/plugins/model-management-plugin/package.json +++ b/plugins/model-management-plugin/package.json @@ -4,6 +4,7 @@ "description": "Model Management Plugin provides model exploration and seamless downloads", "icon": "https://raw.githubusercontent.com/tailwindlabs/heroicons/88e98b0c2b458553fbadccddc2d2f878edc0387b/src/20/solid/queue-list.svg", "main": "dist/index.js", + "module": "dist/module.js", "author": "James", "license": "MIT", "activationPoints": [ @@ -27,7 +28,7 @@ ], "dependencies": { "@huggingface/hub": "^0.8.5", - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "ts-loader": "^9.5.0" }, "bundledDependencies": [ diff --git a/plugins/model-management-plugin/webpack.config.js b/plugins/model-management-plugin/webpack.config.js index b289262b9..48e80e2ec 100644 --- a/plugins/model-management-plugin/webpack.config.js +++ b/plugins/model-management-plugin/webpack.config.js @@ -1,4 +1,6 @@ const path = require("path"); +const webpack = require("webpack"); +const packageJson = require("./package.json"); module.exports = { experiments: { outputModule: true }, @@ -13,6 +15,12 @@ module.exports = { }, ], }, + plugins: [ + new webpack.DefinePlugin({ + PLUGIN_NAME: JSON.stringify(packageJson.name), + MODULE_PATH: JSON.stringify(`${packageJson.name}/${packageJson.module}`), + }), + ], output: { filename: "index.js", // Adjust the output file name as needed path: path.resolve(__dirname, "dist"), diff --git a/plugins/monitoring-plugin/@types/global.d.ts b/plugins/monitoring-plugin/@types/global.d.ts new file mode 100644 index 000000000..87105f099 --- /dev/null +++ b/plugins/monitoring-plugin/@types/global.d.ts @@ -0,0 +1,2 @@ +declare const PLUGIN_NAME: string; +declare const MODULE_PATH: string; diff --git a/plugins/monitoring-plugin/index.js b/plugins/monitoring-plugin/index.js deleted file mode 100644 index 6954e56cf..000000000 --- a/plugins/monitoring-plugin/index.js +++ /dev/null @@ -1,36 +0,0 @@ -// Provide an async method to manipulate the price provided by the extension point -const PLUGIN_NAME = "@janhq/monitoring-plugin/dist/module.js"; - -const getResourcesInfo = () => { - return new Promise((resolve) => { - if (window && window.electronAPI) { - window.electronAPI - .invokePluginFunc(PLUGIN_NAME, "getResourcesInfo") - .then((res) => { - resolve(res); - }); - } else { - resolve({}); - } - }); -}; - -const getCurrentLoad = () => { - return new Promise((resolve) => { - if (window && window.electronAPI) { - window.electronAPI - .invokePluginFunc(PLUGIN_NAME, "getCurrentLoad") - .then((res) => { - resolve(res); - }); - } else { - resolve({}); - } - }); -}; - -// Register all the above functions and objects with the relevant extension points -export function init({ register }) { - register("getResourcesInfo", "getResourcesInfo", getResourcesInfo); - register("getCurrentLoad", "getCurrentLoad", getCurrentLoad); -} diff --git a/plugins/monitoring-plugin/index.ts b/plugins/monitoring-plugin/index.ts new file mode 100644 index 000000000..c7c7697bb --- /dev/null +++ b/plugins/monitoring-plugin/index.ts @@ -0,0 +1,12 @@ +import { core, SystemMonitoringService } from "@janhq/core"; + +// Provide an async method to manipulate the price provided by the extension point +const getResourcesInfo = () => core.invokePluginFunc(MODULE_PATH, "getResourcesInfo"); + +const getCurrentLoad = () => core.invokePluginFunc(MODULE_PATH, "getCurrentLoad"); + +// Register all the above functions and objects with the relevant extension points +export function init({ register }) { + register(SystemMonitoringService.GetResourcesInfo, getResourcesInfo.name, getResourcesInfo); + register(SystemMonitoringService.GetCurrentLoad, getCurrentLoad.name, getCurrentLoad); +} diff --git a/plugins/monitoring-plugin/module.js b/plugins/monitoring-plugin/module.ts similarity index 100% rename from plugins/monitoring-plugin/module.js rename to plugins/monitoring-plugin/module.ts diff --git a/plugins/monitoring-plugin/package-lock.json b/plugins/monitoring-plugin/package-lock.json index 02a05ef06..4282bbb56 100644 --- a/plugins/monitoring-plugin/package-lock.json +++ b/plugins/monitoring-plugin/package-lock.json @@ -13,7 +13,9 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "systeminformation": "^5.21.8" + "@janhq/core": "^0.1.1", + "systeminformation": "^5.21.8", + "ts-loader": "^9.5.0" }, "devDependencies": { "rimraf": "^3.0.2", @@ -30,11 +32,15 @@ "node": ">=10.0.0" } }, + "node_modules/@janhq/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@janhq/core/-/core-0.1.1.tgz", + "integrity": "sha512-p6T+7gc7Bfwmef9Y+whdHxWAwdvcJ3psyni/sKgraLV4kuVIiGZuhcIrah/3PtTB2Jcoo5Sl4Cp51PC50xY2Tg==" + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -48,7 +54,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, "engines": { "node": ">=6.0.0" } @@ -57,7 +62,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, "engines": { "node": ">=6.0.0" } @@ -66,7 +70,6 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", - "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -75,14 +78,12 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", - "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -92,7 +93,6 @@ "version": "8.44.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", - "dev": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -102,7 +102,6 @@ "version": "3.7.5", "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz", "integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==", - "dev": true, "dependencies": { "@types/eslint": "*", "@types/estree": "*" @@ -111,26 +110,22 @@ "node_modules/@types/estree": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz", - "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==", - "dev": true + "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==" }, "node_modules/@types/json-schema": { "version": "7.0.13", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", - "dev": true + "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==" }, "node_modules/@types/node": { "version": "20.8.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz", - "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==", - "dev": true + "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==" }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dev": true, "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -139,26 +134,22 @@ "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -168,14 +159,12 @@ "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-buffer": "1.11.6", @@ -187,7 +176,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -196,7 +184,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } @@ -204,14 +191,12 @@ "node_modules/@webassemblyjs/utf8": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-buffer": "1.11.6", @@ -227,7 +212,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", @@ -240,7 +224,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-buffer": "1.11.6", @@ -252,7 +235,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -266,7 +248,6 @@ "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", - "dev": true, "dependencies": { "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" @@ -319,20 +300,17 @@ "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "node_modules/acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -344,7 +322,6 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, "peerDependencies": { "acorn": "^8" } @@ -353,7 +330,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -369,11 +345,24 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, "peerDependencies": { "ajv": "^6.9.1" } }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -390,11 +379,21 @@ "concat-map": "0.0.1" } }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/browserslist": { "version": "4.22.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", - "dev": true, "funding": [ { "type": "opencollective", @@ -425,14 +424,12 @@ "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "node_modules/caniuse-lite": { "version": "1.0.30001543", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==", - "dev": true, "funding": [ { "type": "opencollective", @@ -448,11 +445,36 @@ } ] }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, "engines": { "node": ">=6.0" } @@ -471,6 +493,22 @@ "node": ">=6" } }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", @@ -480,8 +518,7 @@ "node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/concat-map": { "version": "0.0.1", @@ -506,14 +543,12 @@ "node_modules/electron-to-chromium": { "version": "1.4.542", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.542.tgz", - "integrity": "sha512-6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ==", - "dev": true + "integrity": "sha512-6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ==" }, "node_modules/enhanced-resolve": { "version": "5.15.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", - "dev": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -537,14 +572,12 @@ "node_modules/es-module-lexer": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", - "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", - "dev": true + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==" }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -553,7 +586,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -566,7 +598,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -578,7 +609,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "engines": { "node": ">=4.0" } @@ -587,7 +617,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, "engines": { "node": ">=4.0" } @@ -596,7 +625,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, "engines": { "node": ">=0.8.x" } @@ -604,14 +632,12 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/fastest-levenshtein": { "version": "1.0.16", @@ -622,6 +648,17 @@ "node": ">= 4.9.1" } }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -664,14 +701,12 @@ "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/has": { "version": "1.0.4", @@ -686,7 +721,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -747,6 +781,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -778,7 +820,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -791,14 +832,12 @@ "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/kind-of": { "version": "6.0.3", @@ -813,7 +852,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, "engines": { "node": ">=6.11.5" } @@ -830,17 +868,38 @@ "node": ">=8" } }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -849,7 +908,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -872,14 +930,12 @@ "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/node-releases": { "version": "2.0.13", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" }, "node_modules/once": { "version": "1.4.0", @@ -962,8 +1018,18 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } }, "node_modules/pkg-dir": { "version": "4.2.0", @@ -981,7 +1047,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true, "engines": { "node": ">=6" } @@ -990,7 +1055,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, "dependencies": { "safe-buffer": "^5.1.0" } @@ -1064,7 +1128,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -1084,7 +1147,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -1098,11 +1160,24 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/serialize-javascript": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, "dependencies": { "randombytes": "^2.1.0" } @@ -1144,7 +1219,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1153,7 +1227,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -1163,7 +1236,6 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -1216,7 +1288,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, "engines": { "node": ">=6" } @@ -1225,7 +1296,6 @@ "version": "5.21.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz", "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==", - "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -1243,7 +1313,6 @@ "version": "5.3.9", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", - "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", @@ -1273,11 +1342,61 @@ } } }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-loader": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.0.tgz", + "integrity": "sha512-LLlB/pkB4q9mW2yLdFMnK3dEHbrBjeZTYguaaIfusyojBgAGf5kF+O6KcWqiGzWqHk0LBsoolrp4VftEURhybg==", + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.0.0", + "micromatch": "^4.0.0", + "semver": "^7.3.4", + "source-map": "^0.7.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "typescript": "*", + "webpack": "^5.0.0" + } + }, + "node_modules/ts-loader/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, "funding": [ { "type": "opencollective", @@ -1307,7 +1426,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -1316,7 +1434,6 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -1329,7 +1446,6 @@ "version": "5.88.2", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", - "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.0", @@ -1443,7 +1559,6 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, "engines": { "node": ">=10.13.0" } @@ -1474,6 +1589,11 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } } diff --git a/plugins/monitoring-plugin/package.json b/plugins/monitoring-plugin/package.json index a802464a7..22855ca47 100644 --- a/plugins/monitoring-plugin/package.json +++ b/plugins/monitoring-plugin/package.json @@ -3,15 +3,16 @@ "version": "1.0.0", "description": "Utilizing systeminformation, it provides essential System and OS information retrieval", "icon": "https://raw.githubusercontent.com/tailwindlabs/heroicons/88e98b0c2b458553fbadccddc2d2f878edc0387b/src/20/solid/cpu-chip.svg", - "main": "dist/bundle.js", + "main": "dist/index.js", + "module": "dist/module.js", "author": "Jan", "license": "MIT", "activationPoints": [ "init" ], "scripts": { - "build": "webpack --config webpack.config.js", - "postinstall": "rimraf ./*.tgz && npm run build && cpx \"module.js\" \"dist\"", + "build": "tsc -b . && webpack --config webpack.config.js", + "postinstall": "rimraf ./*.tgz && npm run build", "build:publish": "npm pack && cpx *.tgz ../../electron/core/pre-install" }, "devDependencies": { @@ -20,7 +21,9 @@ "webpack-cli": "^5.1.4" }, "dependencies": { - "systeminformation": "^5.21.8" + "@janhq/core": "^0.1.1", + "systeminformation": "^5.21.8", + "ts-loader": "^9.5.0" }, "bundledDependencies": [ "systeminformation" diff --git a/plugins/monitoring-plugin/tsconfig.json b/plugins/monitoring-plugin/tsconfig.json new file mode 100644 index 000000000..3b321034a --- /dev/null +++ b/plugins/monitoring-plugin/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es2016", + "module": "ES6", + "moduleResolution": "node", + "outDir": "./dist", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": false, + "skipLibCheck": true + } +} diff --git a/plugins/monitoring-plugin/webpack.config.js b/plugins/monitoring-plugin/webpack.config.js index 7248a0990..4583497e7 100644 --- a/plugins/monitoring-plugin/webpack.config.js +++ b/plugins/monitoring-plugin/webpack.config.js @@ -1,15 +1,33 @@ const path = require("path"); +const webpack = require("webpack"); +const packageJson = require("./package.json"); module.exports = { experiments: { outputModule: true }, - entry: "./index.js", // Adjust the entry point to match your project's main file + entry: "./index.ts", // Adjust the entry point to match your project's main file + mode: "production", + module: { + rules: [ + { + test: /\.tsx?$/, + use: "ts-loader", + exclude: /node_modules/, + }, + ], + }, output: { - filename: "bundle.js", // Adjust the output file name as needed + filename: "index.js", // Adjust the output file name as needed path: path.resolve(__dirname, "dist"), library: { type: "module" }, // Specify ESM output format }, + plugins: [ + new webpack.DefinePlugin({ + PLUGIN_NAME: JSON.stringify(packageJson.name), + MODULE_PATH: JSON.stringify(`${packageJson.name}/${packageJson.module}`), + }), + ], resolve: { - extensions: [".js"], + extensions: [".ts", ".js"], }, // Add loaders and other configuration as needed for your project }; diff --git a/plugins/openai-plugin/@types/global.d.ts b/plugins/openai-plugin/@types/global.d.ts new file mode 100644 index 000000000..87105f099 --- /dev/null +++ b/plugins/openai-plugin/@types/global.d.ts @@ -0,0 +1,2 @@ +declare const PLUGIN_NAME: string; +declare const MODULE_PATH: string; diff --git a/plugins/openai-plugin/index.ts b/plugins/openai-plugin/index.ts index 6910a2c2f..83579f44d 100644 --- a/plugins/openai-plugin/index.ts +++ b/plugins/openai-plugin/index.ts @@ -6,11 +6,9 @@ import { store, preferences, RegisterExtensionPoint, -} from "@janhq/plugin-core"; +} from "@janhq/core"; import { Configuration, OpenAIApi } from "azure-openai"; -const PluginName = "@janhq/openai-plugin"; - const setRequestHeader = XMLHttpRequest.prototype.setRequestHeader; XMLHttpRequest.prototype.setRequestHeader = function newSetRequestHeader(key: string, val: string) { if (key.toLocaleLowerCase() === "user-agent") { @@ -22,9 +20,9 @@ XMLHttpRequest.prototype.setRequestHeader = function newSetRequestHeader(key: st var openai: OpenAIApi | undefined = undefined; const setup = async () => { - const apiKey: string = (await preferences.get(PluginName, "apiKey")) ?? ""; - const endpoint: string = (await preferences.get(PluginName, "endpoint")) ?? ""; - const deploymentName: string = (await preferences.get(PluginName, "deploymentName")) ?? ""; + const apiKey: string = (await preferences.get(PLUGIN_NAME, "apiKey")) ?? ""; + const endpoint: string = (await preferences.get(PLUGIN_NAME, "endpoint")) ?? ""; + const deploymentName: string = (await preferences.get(PLUGIN_NAME, "deploymentName")) ?? ""; try { openai = new OpenAIApi( new Configuration({ @@ -92,13 +90,13 @@ const onPreferencesUpdate = () => { }; // Register all the above functions and objects with the relevant extension points export function init({ register }: { register: RegisterExtensionPoint }) { - register(PluginService.OnStart, PluginName, onStart); - register(PluginService.OnPreferencesUpdate, PluginName, onPreferencesUpdate); + register(PluginService.OnStart, PLUGIN_NAME, onStart); + register(PluginService.OnPreferencesUpdate, PLUGIN_NAME, onPreferencesUpdate); - preferences.registerPreferences(register, PluginName, "apiKey", "API Key", "Azure Project API Key", ""); + preferences.registerPreferences(register, PLUGIN_NAME, "apiKey", "API Key", "Azure Project API Key", ""); preferences.registerPreferences( register, - PluginName, + PLUGIN_NAME, "endpoint", "API Endpoint", "Azure Deployment Endpoint API", @@ -106,7 +104,7 @@ export function init({ register }: { register: RegisterExtensionPoint }) { ); preferences.registerPreferences( register, - PluginName, + PLUGIN_NAME, "deploymentName", "Deployment Name", "The deployment name you chose when you deployed the model", diff --git a/plugins/openai-plugin/package-lock.json b/plugins/openai-plugin/package-lock.json index a5639657b..5d5240ced 100644 --- a/plugins/openai-plugin/package-lock.json +++ b/plugins/openai-plugin/package-lock.json @@ -1,11 +1,11 @@ { - "name": "azure-openai-plugin", + "name": "@janhq/azure-openai-plugin", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "azure-openai-plugin", + "name": "@janhq/azure-openai-plugin", "version": "1.0.0", "bundleDependencies": [ "tcp-port-used", @@ -14,7 +14,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@janhq/plugin-core": "^0.1.5", + "@janhq/plugin-core": "^0.1.8", "azure-openai": "^0.9.4", "kill-port-process": "^3.2.0", "tcp-port-used": "^1.0.2", @@ -30,32 +30,6 @@ "node": ">=18.0.0" } }, - "../../../../plugin-core": { - "name": "@janhq/plugin-core", - "version": "0.1.6", - "license": "MIT", - "devDependencies": { - "@types/node": "^12.0.2", - "typescript": "^5.2.2" - } - }, - "../../../../plugin-core/node_modules/@types/node": { - "version": "12.20.55", - "dev": true, - "license": "MIT" - }, - "../../../../plugin-core/node_modules/typescript": { - "version": "5.2.2", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "dev": true, @@ -64,10 +38,6 @@ "node": ">=10.0.0" } }, - "node_modules/@janhq/plugin-core": { - "resolved": "../../../../plugin-core", - "link": true - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "license": "MIT", diff --git a/plugins/openai-plugin/package.json b/plugins/openai-plugin/package.json index a43a06523..5edf57ceb 100644 --- a/plugins/openai-plugin/package.json +++ b/plugins/openai-plugin/package.json @@ -4,6 +4,7 @@ "description": "Inference plugin for Azure OpenAI", "icon": "https://static-assets.jan.ai/openai-icon.jpg", "main": "dist/index.js", + "module": "dist/module.js", "author": "Jan", "license": "MIT", "activationPoints": [ @@ -25,7 +26,7 @@ "webpack-cli": "^5.1.4" }, "dependencies": { - "@janhq/plugin-core": "^0.1.8", + "@janhq/core": "^0.1.1", "azure-openai": "^0.9.4", "kill-port-process": "^3.2.0", "tcp-port-used": "^1.0.2", diff --git a/plugins/openai-plugin/tsconfig.json b/plugins/openai-plugin/tsconfig.json index 339950719..3b321034a 100644 --- a/plugins/openai-plugin/tsconfig.json +++ b/plugins/openai-plugin/tsconfig.json @@ -3,7 +3,6 @@ "target": "es2016", "module": "ES6", "moduleResolution": "node", - "outDir": "./dist", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, diff --git a/plugins/openai-plugin/webpack.config.js b/plugins/openai-plugin/webpack.config.js index 18696aa34..4583497e7 100644 --- a/plugins/openai-plugin/webpack.config.js +++ b/plugins/openai-plugin/webpack.config.js @@ -1,4 +1,6 @@ const path = require("path"); +const webpack = require("webpack"); +const packageJson = require("./package.json"); module.exports = { experiments: { outputModule: true }, @@ -18,6 +20,12 @@ module.exports = { path: path.resolve(__dirname, "dist"), library: { type: "module" }, // Specify ESM output format }, + plugins: [ + new webpack.DefinePlugin({ + PLUGIN_NAME: JSON.stringify(packageJson.name), + MODULE_PATH: JSON.stringify(`${packageJson.name}/${packageJson.module}`), + }), + ], resolve: { extensions: [".ts", ".js"], }, diff --git a/web/app/_components/Preferences.tsx b/web/app/_components/Preferences.tsx index c011f50f1..8f81638e1 100644 --- a/web/app/_components/Preferences.tsx +++ b/web/app/_components/Preferences.tsx @@ -227,8 +227,8 @@ export const Preferences = () => {
-

- {e.name.replaceAll("-", " ")} +

+ {e.name}

Version: {e.version}