From 527e3bee02e92b6417840f4cf0efac16931e494d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E5=A3=B0?= Date: Tue, 23 Jul 2024 13:54:44 +0800 Subject: [PATCH] refactor: strengthen the codeblitz brand (#104) --- .coderabbit.yml | 81 +++ .github/workflows/ci.yml | 62 ++ README-zh_CN.md | 3 +- README.md | 2 +- package.json | 13 +- packages/code-service/__tests__/utils.test.ts | 4 +- packages/core/README.md | 5 +- packages/core/src/api/renderApp.tsx | 4 +- packages/core/src/api/renderEditor.tsx | 6 +- packages/core/src/core/commands.ts | 12 +- .../core/src/core/editor/editor.module.ts | 6 +- packages/core/src/core/editor/modules.ts | 2 +- packages/core/src/core/env.ts | 2 +- .../codeblitz.module.ts} | 12 +- packages/core/src/core/modules.ts | 10 +- packages/plugin/src/plugin.service.ts | 2 +- .../sumi-core/src/client/ai-native/index.ts | 4 +- .../monacoOverride/contextKeyService.ts | 61 +- .../client/override/monacoOverride/index.ts | 1 - .../override/vscodeContributesService.ts | 11 +- packages/sumi-core/src/common/enum.ts | 2 +- packages/toolkit/playground/main.tsx | 2 +- packages/toolkit/webpack/config.build.js | 1 - .../toolkit/webpack/config.integration.js | 4 - yarn.lock | 602 +----------------- 25 files changed, 232 insertions(+), 682 deletions(-) create mode 100644 .coderabbit.yml create mode 100644 .github/workflows/ci.yml rename packages/core/src/core/{alex.module.ts => internal/codeblitz.module.ts} (72%) diff --git a/.coderabbit.yml b/.coderabbit.yml new file mode 100644 index 00000000..a4d6d8dc --- /dev/null +++ b/.coderabbit.yml @@ -0,0 +1,81 @@ +language: zh-CN +tone_instructions: '' +early_access: true +enable_free_tier: true +reviews: + profile: chill + request_changes_workflow: false + high_level_summary: true + high_level_summary_placeholder: '@coderabbitai summary' + auto_title_placeholder: '@coderabbitai' + review_status: false + poem: false + collapse_walkthrough: true + sequence_diagrams: true + path_filters: [] + path_instructions: [] + abort_on_close: true + auto_review: + enabled: true + auto_incremental_review: true + ignore_title_keywords: [] + labels: [] + drafts: false + base_branches: [] + tools: + shellcheck: + enabled: true + ruff: + enabled: true + markdownlint: + enabled: true + github-checks: + enabled: true + timeout_ms: 90000 + languagetool: + enabled: true + enabled_only: false + level: default + enabled_rules: [] + disabled_rules: + - EN_UNPAIRED_BRACKETS + - EN_UNPAIRED_QUOTES + enabled_categories: [] + disabled_categories: + - TYPOS + - TYPOGRAPHY + - CASING + biome: + enabled: true + hadolint: + enabled: true + swiftlint: + enabled: true + phpstan: + enabled: true + level: default + golangci-lint: + enabled: true + yamllint: + enabled: true + gitleaks: + enabled: true + checkov: + enabled: true + detekt: + enabled: true + eslint: + enabled: true + ast-grep: + packages: [] + rule_dirs: [] + util_dirs: [] + essential_rules: true +chat: + auto_reply: true +knowledge_base: + opt_out: false + learnings: + scope: auto + issues: + scope: auto diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..932eccaf --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,62 @@ +name: CI + +# Cancel prev CI if new commit come +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +on: + workflow_dispatch: + push: + branches: + - main + - v*.* + pull_request: + branches: + - main + - v*.* + paths: + - 'packages/**' + - package.json + - yarn.lock + +jobs: + unittest: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + node-version: [18.x] + + steps: + - uses: actions/checkout@v4 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + - name: Get yarn cache directory path + id: yarn_cache_dir_path + run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT + + - uses: actions/cache@v4 + id: yarn_cache + with: + path: ${{ steps.yarn_cache_dir_path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + + - name: Install && Build + run: | + yarn install --immutable + yarn run init + - name: CI + run: | + yarn run ci + + - if: ${{ matrix.os == 'ubuntu-latest' }} + name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CORE_CODECOV_TOKEN }} + directory: ./coverage diff --git a/README-zh_CN.md b/README-zh_CN.md index 2e759071..8b731ef5 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -10,8 +10,9 @@ [https://codeblitz.cloud.alipay.com/](https://codeblitz.cloud.alipay.com/) ## 项目启动 + ### 准备 -需要安装 yarn >= 1.0,使用 yarn 的 [workspaces](https://classic.yarnpkg.com/en/docs/workspaces/) 来管理 packages +需要安装 yarn >= 1.22,使用 yarn 的 [workspaces](https://classic.yarnpkg.com/en/docs/workspaces/) 来管理 packages ### 启动项目 ```bash diff --git a/README.md b/README.md index ab792da4..3766e030 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ English | [简体中文](./README-zh_CN.md) ## Project Startup ### Preparation -Need to install yarn >= 1.0 and use yarn's [workspaces](https://classic.yarnpkg.com/en/docs/workspaces/) to manage packages +Need to install yarn >= 1.22 and use yarn's [workspaces](https://classic.yarnpkg.com/en/docs/workspaces/) to manage packages ### Start the project ```bash 1. yarn diff --git a/package.json b/package.json index d33ca6dc..f1486cee 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "update-package": "node scripts/utils/update-package", "release": "node scripts/release", - "release:next": "node scripts/release --tag=next" + "release:next": "node scripts/release --tag=next", + "ci": "yarn type-check && yarn test" }, "author": "antgroup", "license": "MIT", @@ -78,10 +79,10 @@ "typescript": "^4.2.3" }, "resolutions": { - "node-gyp": "10.1.0" + "node-gyp": "npm:@favware/skip-dependency@latest", + "nsfw": "npm:@favware/skip-dependency@latest", + "spdlog": "npm:@favware/skip-dependency@latest", + "node-pty": "npm:@favware/skip-dependency@latest" }, - "packageManager": "yarn@4.2.2", - "dependencies": { - "node-gyp": "10.1.0" - } + "packageManager": "yarn@4.2.2" } diff --git a/packages/code-service/__tests__/utils.test.ts b/packages/code-service/__tests__/utils.test.ts index 342856bf..86cf8f75 100644 --- a/packages/code-service/__tests__/utils.test.ts +++ b/packages/code-service/__tests__/utils.test.ts @@ -1,3 +1,4 @@ +import { CodePlatformRegistry } from '../../code-api/src/common/config'; import { parseGitmodules, parseSubmoduleUrl } from '../src/utils'; const submodules = [ @@ -31,8 +32,9 @@ describe(__filename, () => { }); it('parseSubmoduleUrl', () => { + const configs = CodePlatformRegistry.instance().getCodePlatformConfigs(); submodules.forEach((item) => { - expect(parseSubmoduleUrl(item.url)).toEqual({ + expect(parseSubmoduleUrl(item.url, configs)).toEqual({ owner: item.owner, name: item.name, platform: item.platform, diff --git a/packages/core/README.md b/packages/core/README.md index 3a78b8da..febd3380 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -1,4 +1,4 @@ -# Codeblitz +# CodeBlitz > 基于 OpenSumi 的纯前端版本 IDE 框架 @@ -10,4 +10,7 @@ ## 开发文档 +* CodeBlitz: [https://codeblitz.opensumi.com/](https://codeblitz.opensumi.com/) * OpenSumi: [https://opensumi.com/zh](https://opensumi.com/zh) + +## 示例 [codeblitz-sample](https://github.com/opensumi/codeblitz-sample) diff --git a/packages/core/src/api/renderApp.tsx b/packages/core/src/api/renderApp.tsx index 5a2658bb..04c7f56d 100644 --- a/packages/core/src/api/renderApp.tsx +++ b/packages/core/src/api/renderApp.tsx @@ -43,7 +43,7 @@ export const renderApp = (domElement: HTMLElement, props: IAppRendererProps) => ); (app.injector.get(IReporterService) as IReporterService).point( - REPORT_NAME.ALEX_APP_START_ERROR, + REPORT_NAME.APP_START_ERROR, err?.message, { error: err }, ); @@ -94,7 +94,7 @@ export const AppRenderer: React.FC = ({ onLoad, Landing, ...o setState({ error: err?.message || localize('error.unknown'), status: 'error' }); (app.injector.get(IReporterService) as IReporterService).point( - REPORT_NAME.ALEX_APP_START_ERROR, + REPORT_NAME.APP_START_ERROR, err?.message, { error: err, diff --git a/packages/core/src/api/renderEditor.tsx b/packages/core/src/api/renderEditor.tsx index 4771f88e..9b5a3b32 100644 --- a/packages/core/src/api/renderEditor.tsx +++ b/packages/core/src/api/renderEditor.tsx @@ -48,7 +48,7 @@ export const renderEditor = (domElement: HTMLElement, props: IEditorRendererProp ); (app.injector.get(IReporterService) as IReporterService).point( - REPORT_NAME.ALEX_APP_START_ERROR, + REPORT_NAME.APP_START_ERROR, err?.message, { error: err }, ); @@ -94,7 +94,7 @@ export const EditorRenderer: React.FC = ({ onLoad, Landing setState({ error: err?.message || localize('error.unknown'), status: 'error' }); (app.injector.get(IReporterService) as IReporterService).point( - REPORT_NAME.ALEX_APP_START_ERROR, + REPORT_NAME.APP_START_ERROR, err?.message, { error: err, @@ -117,7 +117,7 @@ export const EditorRenderer: React.FC = ({ onLoad, Landing ); return ( - + {ideAppRef.current ? : null} ); diff --git a/packages/core/src/core/commands.ts b/packages/core/src/core/commands.ts index 4538ee86..693435ad 100644 --- a/packages/core/src/core/commands.ts +++ b/packages/core/src/core/commands.ts @@ -12,34 +12,34 @@ import { * 内置一些 commands 来调用内部的 service */ -namespace ALEX_COMMANDS { +namespace CODEBLITZ_COMMANDS { const CATEGORY = 'alex'; // 提供更改和获取默认偏好设置的能力,这个无法通过 extension 实现 - export const ALEX_GET_DEFAULT_PREFERENCE: Command = { + export const GET_DEFAULT_PREFERENCE: Command = { id: 'alex.getDefaultPreference', category: CATEGORY, }; - export const ALEX_SET_DEFAULT_PREFERENCE: Command = { + export const SET_DEFAULT_PREFERENCE: Command = { id: 'alex.setDefaultPreference', category: CATEGORY, }; } @Domain(CommandContribution) -export class AlexCommandContribution implements CommandContribution { +export class CodeBlitzCommandContribution implements CommandContribution { @Autowired(PreferenceProvider, { tag: PreferenceScope.Default }) private readonly defaultPreference: PreferenceProvider; registerCommands(registry: CommandRegistry) { - registry.registerCommand(ALEX_COMMANDS.ALEX_GET_DEFAULT_PREFERENCE, { + registry.registerCommand(CODEBLITZ_COMMANDS.GET_DEFAULT_PREFERENCE, { execute: (preferenceName: string, resourceUri?: string, language?: string) => { return this.defaultPreference.get(preferenceName, resourceUri, language); }, }); - registry.registerCommand(ALEX_COMMANDS.ALEX_SET_DEFAULT_PREFERENCE, { + registry.registerCommand(CODEBLITZ_COMMANDS.SET_DEFAULT_PREFERENCE, { execute: (preferenceName: string, value: any, resourceUri?: string, language?: string) => { return this.defaultPreference.setPreference(preferenceName, value, resourceUri, language); }, diff --git a/packages/core/src/core/editor/editor.module.ts b/packages/core/src/core/editor/editor.module.ts index f9a3bd08..b43c088f 100644 --- a/packages/core/src/core/editor/editor.module.ts +++ b/packages/core/src/core/editor/editor.module.ts @@ -58,7 +58,7 @@ import { SCMService } from '@opensumi/ide-scm'; import { IWorkspaceService } from '@opensumi/ide-workspace'; import md5 from 'md5'; import * as path from 'path'; -import { AlexCommandContribution } from '../commands'; +import { CodeBlitzCommandContribution } from '../commands'; import { IDETheme } from '../extension/metadata'; import { IPropsService } from '../props.service'; import styles from '../style.module.less'; @@ -569,7 +569,7 @@ class EditorSpecialContribution extends Disposable const tabHeight = this.runtimeConfig.hideEditorTab ? 0 : this.layoutViewSize.editorTabsHeight; - const root = document.querySelector('.alex-root') as HTMLElement; + const root = document.querySelector('.codeblitz-root') as HTMLElement; root.style.height = `${contentHeight + tabHeight}px`; monacoEditor.layout(); }; @@ -761,6 +761,6 @@ export class EditorSpecialModule extends BrowserModule { }, ThemeContribution, EditorSpecialContribution, - AlexCommandContribution, + CodeBlitzCommandContribution, ]; } diff --git a/packages/core/src/core/editor/modules.ts b/packages/core/src/core/editor/modules.ts index 05012c2c..f1066116 100644 --- a/packages/core/src/core/editor/modules.ts +++ b/packages/core/src/core/editor/modules.ts @@ -63,7 +63,7 @@ export const getModules: () => ModuleConstructor[] = () => [ ...extensionModules, - // Alex + // CodeBlitz ClientModule, PluginModule, ...ServerModuleCollection, diff --git a/packages/core/src/core/env.ts b/packages/core/src/core/env.ts index aa92bc17..995bdbd5 100644 --- a/packages/core/src/core/env.ts +++ b/packages/core/src/core/env.ts @@ -14,6 +14,6 @@ export const WEBVIEW_ENDPOINT = __WEBVIEW_ENDPOINT__; export const WEBVIEW_SCRIPT = __WEBVIEW_SCRIPT__; /** - * alex version + * codeblitz version */ export const VERSION = __VERSION__; diff --git a/packages/core/src/core/alex.module.ts b/packages/core/src/core/internal/codeblitz.module.ts similarity index 72% rename from packages/core/src/core/alex.module.ts rename to packages/core/src/core/internal/codeblitz.module.ts index bfac80cc..b1526da5 100644 --- a/packages/core/src/core/alex.module.ts +++ b/packages/core/src/core/internal/codeblitz.module.ts @@ -1,11 +1,11 @@ import { RuntimeConfig } from '@codeblitzjs/ide-sumi-core'; import { Autowired, Injectable, Provider } from '@opensumi/di'; import { BrowserModule, Domain, KeybindingContribution, KeybindingRegistry } from '@opensumi/ide-core-browser'; -import { AlexCommandContribution } from './commands'; -import { ExtensionActivateContribution } from './extension/extension.contribution'; +import { CodeBlitzCommandContribution } from '../commands'; +import { ExtensionActivateContribution } from '../extension/extension.contribution'; @Domain(KeybindingContribution) -class AlexContribution implements KeybindingContribution { +class CodeBlitzContribution implements KeybindingContribution { @Autowired(RuntimeConfig) private readonly runtimeConfig: RuntimeConfig; @@ -24,10 +24,10 @@ class AlexContribution implements KeybindingContribution { } @Injectable() -export class AlexModule extends BrowserModule { +export class CodeBlitzModule extends BrowserModule { providers: Provider[] = [ ExtensionActivateContribution, - AlexCommandContribution, - AlexContribution, + CodeBlitzCommandContribution, + CodeBlitzContribution, ]; } diff --git a/packages/core/src/core/modules.ts b/packages/core/src/core/modules.ts index 651b297e..72bd54d2 100644 --- a/packages/core/src/core/modules.ts +++ b/packages/core/src/core/modules.ts @@ -36,13 +36,9 @@ import { WebviewModule } from '@opensumi/ide-webview/lib/browser'; import { WorkspaceEditModule } from '@opensumi/ide-workspace-edit/lib/browser'; import { WorkspaceModule } from '@opensumi/ide-workspace/lib/browser'; -/** - * alex - */ - import { PluginModule } from '@codeblitzjs/ide-plugin'; import { ClientModule, ExtensionClientManagerModule, ServerModuleCollection } from '@codeblitzjs/ide-sumi-core'; -import { AlexModule } from './alex.module'; +import { CodeBlitzModule } from './internal/codeblitz.module'; // TODO: 部分模块需要注意顺序,否则会报错,待框架侧调整修复 export const modules: ModuleConstructor[] = [ @@ -94,9 +90,9 @@ export const modules: ModuleConstructor[] = [ CommentsModule, // TaskModule, - // Alex + // CodeBlitz ClientModule, PluginModule, ...ServerModuleCollection, - AlexModule, + CodeBlitzModule, ]; diff --git a/packages/plugin/src/plugin.service.ts b/packages/plugin/src/plugin.service.ts index 645e4ee6..d463cf61 100644 --- a/packages/plugin/src/plugin.service.ts +++ b/packages/plugin/src/plugin.service.ts @@ -38,7 +38,7 @@ export class PluginService { plugin.deactivate?.(); } catch (err: any) { console.error(` - [Alex Plugin]: deactivate plugin module error ${err.message} \n\n + [CodeBlitz Plugin]: deactivate plugin module error ${err.message} \n\n Stack: ${err.stack && err.stack} `); return err; diff --git a/packages/sumi-core/src/client/ai-native/index.ts b/packages/sumi-core/src/client/ai-native/index.ts index e95cc6af..54963246 100644 --- a/packages/sumi-core/src/client/ai-native/index.ts +++ b/packages/sumi-core/src/client/ai-native/index.ts @@ -1,10 +1,10 @@ -import { Autowired, Injector } from '@opensumi/di'; +import { Autowired } from '@opensumi/di'; import { AINativeCoreContribution, IAIMiddleware, IInlineChatFeatureRegistry, } from '@opensumi/ide-ai-native/lib/browser/types'; -import { Disposable, Domain, IEventBus } from '@opensumi/ide-core-common'; +import { Disposable, Domain } from '@opensumi/ide-core-common'; import { RuntimeConfig } from '../../common'; @Domain(AINativeCoreContribution) diff --git a/packages/sumi-core/src/client/override/monacoOverride/contextKeyService.ts b/packages/sumi-core/src/client/override/monacoOverride/contextKeyService.ts index 1e9a5657..3eafd40f 100644 --- a/packages/sumi-core/src/client/override/monacoOverride/contextKeyService.ts +++ b/packages/sumi-core/src/client/override/monacoOverride/contextKeyService.ts @@ -8,6 +8,7 @@ import { IContextKey, IScopedContextKeyService, } from '@opensumi/ide-core-browser'; +import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices'; import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration'; import { ContextKeyService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService'; import { @@ -189,9 +190,12 @@ export class MonacoContextKeyServiceOverride extends BaseContextKeyService imple constructor() { super(); - this.contextKeyService = (window as any).contextService || new ContextKeyService(this.configurationService); + this.contextKeyService = (StandaloneServices as any)?.contextKeyService?.get() + || new ContextKeyService(this.configurationService); this.listenToContextChanges(); - (window as any).contextService = this.contextKeyService; + (StandaloneServices as any).contextKeyService = { + get: () => this.contextKeyService, + }; } dispose(): void { @@ -199,56 +203,3 @@ export class MonacoContextKeyServiceOverride extends BaseContextKeyService imple // super.dispose(); } } - -@Injectable({ multiple: true }) -export class MonacoScopedContextKeyService implements IScopedContextKeyService { - injector: Injector; - constructor( - @Optional() public readonly contextKeyService: ContextKeyService, - injector: Injector, - ) { - this.injector = injector; - } - listenToContextChanges() { - this.injector.get(ScopedContextKeyServiceProxy).listenToContextChanges(); - } - get onDidChangeContext(): Event { - return this.injector.get(ScopedContextKeyServiceProxy).onDidChangeContext; - } - bufferChangeEvents(callback: Function): void { - throw new Error('Method not implemented.'); - } - getValue(key: string): T | undefined { - throw new Error('Method not implemented.'); - } - createKey( - key: string, - defaultValue: T | undefined, - ): IContextKey { - throw new Error('Method not implemented.'); - } - getKeysInWhen(when: string | ContextKeyExpr | undefined): string[] { - throw new Error('Method not implemented.'); - } - getContextValue(key: string): T | undefined { - throw new Error('Method not implemented.'); - } - createScoped( - target?: ContextKeyService | IContextKeyServiceTarget | undefined, - ): IScopedContextKeyService { - throw new Error('Method not implemented.'); - } - parse(when: string | undefined): ContextKeyExpr | undefined { - throw new Error('Method not implemented.'); - } - dispose(): void { - throw new Error('Method not implemented.'); - } - attachToDomNode(domNode: HTMLElement): void { - throw new Error('Method not implemented.'); - } - - match(expression: string | ContextKeyExpression | undefined): boolean { - return this.injector.get(ScopedContextKeyServiceProxy).match(expression); - } -} diff --git a/packages/sumi-core/src/client/override/monacoOverride/index.ts b/packages/sumi-core/src/client/override/monacoOverride/index.ts index 2ef65b9e..ee5aad0a 100644 --- a/packages/sumi-core/src/client/override/monacoOverride/index.ts +++ b/packages/sumi-core/src/client/override/monacoOverride/index.ts @@ -8,7 +8,6 @@ import { MonacoCommandService } from '@opensumi/ide-editor/lib/browser/monaco-co import { ICommandServiceToken } from '@opensumi/ide-monaco/lib/browser/contrib/command'; import { IMonacoTextModelService, monacoTextModelServiceProxy } from './textModelService'; -// monaco override 暂时用不到 export const MonacoOverrides: Provider[] = [ { token: MonacoCodeService, diff --git a/packages/sumi-core/src/client/override/vscodeContributesService.ts b/packages/sumi-core/src/client/override/vscodeContributesService.ts index eb54c737..deb50810 100644 --- a/packages/sumi-core/src/client/override/vscodeContributesService.ts +++ b/packages/sumi-core/src/client/override/vscodeContributesService.ts @@ -1,3 +1,4 @@ +import { VSCodeContributePoint } from '@opensumi/ide-extension'; import { VSCodeContributesService, VSCodeContributesServiceToken, @@ -13,15 +14,13 @@ const OUTSIDE_POINT = [ TerminalContributionPoint, DebuggersContributionPoint, BreakpointsContributionPoint, -]; +] as (typeof VSCodeContributePoint)[]; export class VSCodeContributesServiceOverride extends VSCodeContributesService { constructor() { super(); + this.ContributionPoints = this.ContributionPoints.filter((t) => { + return !OUTSIDE_POINT.includes(t); + }); } - ContributionPoints = [ - ...this.ContributionPoints.filter((contributtion) => { - return !OUTSIDE_POINT.includes(contributtion); - }), - ]; } diff --git a/packages/sumi-core/src/common/enum.ts b/packages/sumi-core/src/common/enum.ts index 4d47f9b5..cc504eca 100644 --- a/packages/sumi-core/src/common/enum.ts +++ b/packages/sumi-core/src/common/enum.ts @@ -1,4 +1,4 @@ export enum REPORT_NAME { - ALEX_APP_START_ERROR = 'alex.appStartError', + APP_START_ERROR = 'alex.appStartError', CODE_SERVICE_REQUEST_ERROR = 'code-service.requestError', } diff --git a/packages/toolkit/playground/main.tsx b/packages/toolkit/playground/main.tsx index e297f38d..ff59dba4 100644 --- a/packages/toolkit/playground/main.tsx +++ b/packages/toolkit/playground/main.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { createRoot } from 'react-dom/client'; import 'antd/lib/button/style/index.css'; -// #region alex +// #region codeblitz import { AppRenderer, BoxPanel, diff --git a/packages/toolkit/webpack/config.build.js b/packages/toolkit/webpack/config.build.js index 2d05e69d..9f77c618 100644 --- a/packages/toolkit/webpack/config.build.js +++ b/packages/toolkit/webpack/config.build.js @@ -78,7 +78,6 @@ const globalBundle = createWebpackConfig({ [config.editorAllGlobalEntry]: './packages/core/src/editor.all', [config.editorAllGlobalMiniEntry]: './packages/core/src/editor.all', }, - // 此处 bundle 的包仅作为 commonjs 使用,但因为 external 原因会导致 webpack4 加载 bundle 出错,因此还是使用 umd output: { library: 'Alex', libraryTarget: 'global', diff --git a/packages/toolkit/webpack/config.integration.js b/packages/toolkit/webpack/config.integration.js index 17ec1dfc..3754bcf0 100644 --- a/packages/toolkit/webpack/config.integration.js +++ b/packages/toolkit/webpack/config.integration.js @@ -150,10 +150,6 @@ module.exports = (option) => { options: { lessOptions: { javascriptEnabled: true, - modifyVars: { - 'html-selector': 'alex-root', - 'body-selector': 'alex-root', - }, }, }, }, diff --git a/yarn.lock b/yarn.lock index c3550cd2..78fafaf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -497,7 +497,6 @@ __metadata: lint-staged: "npm:^10.5.1" localforage: "npm:^1.10.0" minimist: "npm:^1.2.5" - node-gyp: "npm:10.1.0" signale: "npm:^1.4.0" ts-jest: "npm:^26.4.4" ts-node: "npm:^9.0.0" @@ -1035,20 +1034,6 @@ __metadata: languageName: node linkType: hard -"@isaacs/cliui@npm:^8.0.2": - version: 8.0.2 - resolution: "@isaacs/cliui@npm:8.0.2" - dependencies: - string-width: "npm:^5.1.2" - string-width-cjs: "npm:string-width@^4.2.0" - strip-ansi: "npm:^7.0.1" - strip-ansi-cjs: "npm:strip-ansi@^6.0.1" - wrap-ansi: "npm:^8.1.0" - wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" - checksum: 10/e9ed5fd27c3aec1095e3a16e0c0cf148d1fee55a38665c35f7b3f86a9b5d00d042ddaabc98e8a1cb7463b9378c15f22a94eb35e99469c201453eb8375191f243 - languageName: node - linkType: hard - "@istanbuljs/load-nyc-config@npm:^1.0.0": version: 1.1.0 resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" @@ -1343,19 +1328,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/agent@npm:^2.0.0": - version: 2.2.2 - resolution: "@npmcli/agent@npm:2.2.2" - dependencies: - agent-base: "npm:^7.1.0" - http-proxy-agent: "npm:^7.0.0" - https-proxy-agent: "npm:^7.0.1" - lru-cache: "npm:^10.0.1" - socks-proxy-agent: "npm:^8.0.3" - checksum: 10/96fc0036b101bae5032dc2a4cd832efb815ce9b33f9ee2f29909ee49d96a0026b3565f73c507a69eb8603f5cb32e0ae45a70cab1e2655990a4e06ae99f7f572a - languageName: node - linkType: hard - "@npmcli/fs@npm:^1.0.0": version: 1.1.1 resolution: "@npmcli/fs@npm:1.1.1" @@ -1366,15 +1338,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^3.1.0": - version: 3.1.1 - resolution: "@npmcli/fs@npm:3.1.1" - dependencies: - semver: "npm:^7.3.5" - checksum: 10/1e0e04087049b24b38bc0b30d87a9388ee3ca1d3fdfc347c2f77d84fcfe6a51f250bc57ba2c1f614d7e4285c6c62bf8c769bc19aa0949ea39e5b043ee023b0bd - languageName: node - linkType: hard - "@npmcli/move-file@npm:^1.0.1": version: 1.1.2 resolution: "@npmcli/move-file@npm:1.1.2" @@ -2083,13 +2046,6 @@ __metadata: languageName: node linkType: hard -"@pkgjs/parseargs@npm:^0.11.0": - version: 0.11.0 - resolution: "@pkgjs/parseargs@npm:0.11.0" - checksum: 10/115e8ceeec6bc69dff2048b35c0ab4f8bbee12d8bb6c1f4af758604586d802b6e669dcb02dda61d078de42c2b4ddce41b3d9e726d7daa6b4b850f4adbf7333ff - languageName: node - linkType: hard - "@polka/url@npm:^1.0.0-next.20": version: 1.0.0-next.24 resolution: "@polka/url@npm:1.0.0-next.24" @@ -3120,13 +3076,6 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:^2.0.0": - version: 2.0.0 - resolution: "abbrev@npm:2.0.0" - checksum: 10/ca0a54e35bea4ece0ecb68a47b312e1a9a6f772408d5bcb9051230aaa94b0460671c5b5c9cb3240eb5b7bc94c52476550eb221f65a0bbd0145bdc9f3113a6707 - languageName: node - linkType: hard - "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -3236,15 +3185,6 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": - version: 7.1.1 - resolution: "agent-base@npm:7.1.1" - dependencies: - debug: "npm:^4.3.4" - checksum: 10/c478fec8f79953f118704d007a38f2a185458853f5c45579b9669372bd0e12602e88dc2ad0233077831504f7cd6fcc8251c383375bba5eaaf563b102938bda26 - languageName: node - linkType: hard - "aggregate-error@npm:^3.0.0": version: 3.1.0 resolution: "aggregate-error@npm:3.1.0" @@ -3407,13 +3347,6 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^6.0.1": - version: 6.0.1 - resolution: "ansi-regex@npm:6.0.1" - checksum: 10/1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169 - languageName: node - linkType: hard - "ansi-styles@npm:^2.2.1": version: 2.2.1 resolution: "ansi-styles@npm:2.2.1" @@ -3439,13 +3372,6 @@ __metadata: languageName: node linkType: hard -"ansi-styles@npm:^6.1.0": - version: 6.2.1 - resolution: "ansi-styles@npm:6.2.1" - checksum: 10/70fdf883b704d17a5dfc9cde206e698c16bcd74e7f196ab821511651aee4f9f76c9514bdfa6ca3a27b5e49138b89cb222a28caf3afe4567570139577f991df32 - languageName: node - linkType: hard - "ansi-wrap@npm:0.1.0, ansi-wrap@npm:^0.1.0": version: 0.1.0 resolution: "ansi-wrap@npm:0.1.0" @@ -4115,15 +4041,6 @@ __metadata: languageName: node linkType: hard -"brace-expansion@npm:^2.0.1": - version: 2.0.1 - resolution: "brace-expansion@npm:2.0.1" - dependencies: - balanced-match: "npm:^1.0.0" - checksum: 10/a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1 - languageName: node - linkType: hard - "braces@npm:^2.3.1, braces@npm:^2.3.2": version: 2.3.2 resolution: "braces@npm:2.3.2" @@ -4318,26 +4235,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^18.0.0": - version: 18.0.3 - resolution: "cacache@npm:18.0.3" - dependencies: - "@npmcli/fs": "npm:^3.1.0" - fs-minipass: "npm:^3.0.0" - glob: "npm:^10.2.2" - lru-cache: "npm:^10.0.1" - minipass: "npm:^7.0.3" - minipass-collect: "npm:^2.0.1" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - p-map: "npm:^4.0.0" - ssri: "npm:^10.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^3.0.0" - checksum: 10/d4c161f071524bb636334b8cf94780c014e29c180a886b8184da8f2f44d2aca88d5664797c661e9f74bdbd34697c2f231ed7c24c256cecbb0a0563ad1ada2219 - languageName: node - linkType: hard - "cache-base@npm:^1.0.1": version: 1.0.1 resolution: "cache-base@npm:1.0.1" @@ -5849,7 +5746,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.1": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -6372,13 +6269,6 @@ __metadata: languageName: node linkType: hard -"eastasianwidth@npm:^0.2.0": - version: 0.2.0 - resolution: "eastasianwidth@npm:0.2.0" - checksum: 10/9b1d3e1baefeaf7d70799db8774149cef33b97183a6addceeba0cf6b85ba23ee2686f302f14482006df32df75d32b17c509c143a3689627929e4a8efaf483952 - languageName: node - linkType: hard - "ee-first@npm:1.1.1, ee-first@npm:~1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" @@ -6414,13 +6304,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^9.2.2": - version: 9.2.2 - resolution: "emoji-regex@npm:9.2.2" - checksum: 10/915acf859cea7131dac1b2b5c9c8e35c4849e325a1d114c30adb8cd615970f6dca0e27f64f3a4949d7d6ed86ecd79a1c5c63f02e697513cddd7b5835c90948b8 - languageName: node - linkType: hard - "emojis-list@npm:^3.0.0": version: 3.0.0 resolution: "emojis-list@npm:3.0.0" @@ -6435,15 +6318,6 @@ __metadata: languageName: node linkType: hard -"encoding@npm:^0.1.13": - version: 0.1.13 - resolution: "encoding@npm:0.1.13" - dependencies: - iconv-lite: "npm:^0.6.2" - checksum: 10/bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f - languageName: node - linkType: hard - "end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" @@ -6498,13 +6372,6 @@ __metadata: languageName: node linkType: hard -"env-paths@npm:^2.2.0": - version: 2.2.1 - resolution: "env-paths@npm:2.2.1" - checksum: 10/65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e - languageName: node - linkType: hard - "envinfo@npm:^7.7.3": version: 7.11.0 resolution: "envinfo@npm:7.11.0" @@ -6514,13 +6381,6 @@ __metadata: languageName: node linkType: hard -"err-code@npm:^2.0.2": - version: 2.0.3 - resolution: "err-code@npm:2.0.3" - checksum: 10/1d20d825cdcce8d811bfbe86340f4755c02655a7feb2f13f8c880566d9d72a3f6c92c192a6867632e490d6da67b678271f46e01044996a6443e870331100dfdd - languageName: node - linkType: hard - "errno@npm:^0.1.1, errno@npm:^0.1.3": version: 0.1.8 resolution: "errno@npm:0.1.8" @@ -6874,13 +6734,6 @@ __metadata: languageName: node linkType: hard -"exponential-backoff@npm:^3.1.1": - version: 3.1.1 - resolution: "exponential-backoff@npm:3.1.1" - checksum: 10/2d9bbb6473de7051f96790d5f9a678f32e60ed0aa70741dc7fdc96fec8d631124ec3374ac144387604f05afff9500f31a1d45bd9eee4cdc2e4f9ad2d9b9d5dbd - languageName: node - linkType: hard - "express@npm:^4.17.1": version: 4.18.2 resolution: "express@npm:4.18.2" @@ -7335,16 +7188,6 @@ __metadata: languageName: node linkType: hard -"foreground-child@npm:^3.1.0": - version: 3.1.1 - resolution: "foreground-child@npm:3.1.1" - dependencies: - cross-spawn: "npm:^7.0.0" - signal-exit: "npm:^4.0.1" - checksum: 10/087edd44857d258c4f73ad84cb8df980826569656f2550c341b27adf5335354393eec24ea2fabd43a253233fb27cee177ebe46bd0b7ea129c77e87cb1e9936fb - languageName: node - linkType: hard - "fork-ts-checker-webpack-plugin@npm:^6.0.4": version: 6.5.3 resolution: "fork-ts-checker-webpack-plugin@npm:6.5.3" @@ -7471,15 +7314,6 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^3.0.0": - version: 3.0.3 - resolution: "fs-minipass@npm:3.0.3" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10/af143246cf6884fe26fa281621d45cfe111d34b30535a475bfa38dafe343dadb466c047a924ffc7d6b7b18265df4110224ce3803806dbb07173bf2087b648d7f - languageName: node - linkType: hard - "fs-mkdirp-stream@npm:^1.0.0": version: 1.0.0 resolution: "fs-mkdirp-stream@npm:1.0.0" @@ -7798,21 +7632,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.2.2, glob@npm:^10.3.10": - version: 10.3.15 - resolution: "glob@npm:10.3.15" - dependencies: - foreground-child: "npm:^3.1.0" - jackspeak: "npm:^2.3.6" - minimatch: "npm:^9.0.1" - minipass: "npm:^7.0.4" - path-scurry: "npm:^1.11.0" - bin: - glob: dist/esm/bin.mjs - checksum: 10/b2b1c74309979b34fd6010afb50418a12525def32f1d3758d5827fc75d6143fc3ee5d1f3180a43111f6386c9e297c314f208d9d09955a6c6b69f22e92ee97635 - languageName: node - linkType: hard - "glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -7926,7 +7745,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2 @@ -8278,13 +8097,6 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.1.1": - version: 4.1.1 - resolution: "http-cache-semantics@npm:4.1.1" - checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f - languageName: node - linkType: hard - "http-deceiver@npm:^1.2.7": version: 1.2.7 resolution: "http-deceiver@npm:1.2.7" @@ -8358,16 +8170,6 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0": - version: 7.0.2 - resolution: "http-proxy-agent@npm:7.0.2" - dependencies: - agent-base: "npm:^7.1.0" - debug: "npm:^4.3.4" - checksum: 10/d062acfa0cb82beeb558f1043c6ba770ea892b5fb7b28654dbc70ea2aeea55226dd34c02a294f6c1ca179a5aa483c4ea641846821b182edbd9cc5d89b54c6848 - languageName: node - linkType: hard - "http-proxy-middleware@npm:0.19.1": version: 0.19.1 resolution: "http-proxy-middleware@npm:0.19.1" @@ -8424,16 +8226,6 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.1": - version: 7.0.4 - resolution: "https-proxy-agent@npm:7.0.4" - dependencies: - agent-base: "npm:^7.0.2" - debug: "npm:4" - checksum: 10/405fe582bba461bfe5c7e2f8d752b384036854488b828ae6df6a587c654299cbb2c50df38c4b6ab303502c3c5e029a793fbaac965d1e86ee0be03faceb554d63 - languageName: node - linkType: hard - "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -8484,7 +8276,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": +"iconv-lite@npm:^0.6.3": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: @@ -8693,16 +8485,6 @@ __metadata: languageName: node linkType: hard -"ip-address@npm:^9.0.5": - version: 9.0.5 - resolution: "ip-address@npm:9.0.5" - dependencies: - jsbn: "npm:1.1.0" - sprintf-js: "npm:^1.1.3" - checksum: 10/1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c - languageName: node - linkType: hard - "ip-regex@npm:^2.1.0": version: 2.1.0 resolution: "ip-regex@npm:2.1.0" @@ -8946,13 +8728,6 @@ __metadata: languageName: node linkType: hard -"is-lambda@npm:^1.0.1": - version: 1.0.1 - resolution: "is-lambda@npm:1.0.1" - checksum: 10/93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35 - languageName: node - linkType: hard - "is-nan@npm:^1.3.2": version: 1.3.2 resolution: "is-nan@npm:1.3.2" @@ -9215,13 +8990,6 @@ __metadata: languageName: node linkType: hard -"isexe@npm:^3.1.1": - version: 3.1.1 - resolution: "isexe@npm:3.1.1" - checksum: 10/7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e - languageName: node - linkType: hard - "isobject@npm:^2.0.0": version: 2.1.0 resolution: "isobject@npm:2.1.0" @@ -9302,19 +9070,6 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.6": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" - dependencies: - "@isaacs/cliui": "npm:^8.0.2" - "@pkgjs/parseargs": "npm:^0.11.0" - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 10/6e6490d676af8c94a7b5b29b8fd5629f21346911ebe2e32931c2a54210134408171c24cee1a109df2ec19894ad04a429402a8438cbf5cc2794585d35428ace76 - languageName: node - linkType: hard - "jest-changed-files@npm:^26.6.2": version: 26.6.2 resolution: "jest-changed-files@npm:26.6.2" @@ -9801,13 +9556,6 @@ __metadata: languageName: node linkType: hard -"jsbn@npm:1.1.0": - version: 1.1.0 - resolution: "jsbn@npm:1.1.0" - checksum: 10/bebe7ae829bbd586ce8cbe83501dd8cb8c282c8902a8aeeed0a073a89dc37e8103b1244f3c6acd60278bcbfe12d93a3f83c9ac396868a3b3bbc3c5e5e3b648ef - languageName: node - linkType: hard - "jschardet@npm:3.0.0": version: 3.0.0 resolution: "jschardet@npm:3.0.0" @@ -10515,13 +10263,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": - version: 10.2.2 - resolution: "lru-cache@npm:10.2.2" - checksum: 10/ff1a496d30b5eaec2c9079080965bb0cede203cf878371f7033a007f1e54cd4aa13cc8abf7ccec4c994a83a22ed5476e83a55bb57cc07e6c1547a42937e42c37 - languageName: node - linkType: hard - "lru-cache@npm:^4.0.0": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -10594,26 +10335,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^13.0.0": - version: 13.0.1 - resolution: "make-fetch-happen@npm:13.0.1" - dependencies: - "@npmcli/agent": "npm:^2.0.0" - cacache: "npm:^18.0.0" - http-cache-semantics: "npm:^4.1.1" - is-lambda: "npm:^1.0.1" - minipass: "npm:^7.0.2" - minipass-fetch: "npm:^3.0.0" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - proc-log: "npm:^4.2.0" - promise-retry: "npm:^2.0.1" - ssri: "npm:^10.0.0" - checksum: 10/11bae5ad6ac59b654dbd854f30782f9de052186c429dfce308eda42374528185a100ee40ac9ffdc36a2b6c821ecaba43913e4730a12f06f15e895ea9cb23fa59 - languageName: node - linkType: hard - "make-iterator@npm:^1.0.0": version: 1.0.1 resolution: "make-iterator@npm:1.0.1" @@ -10958,15 +10679,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.4 - resolution: "minimatch@npm:9.0.4" - dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10/4cdc18d112b164084513e890d6323370db14c22249d536ad1854539577a895e690a27513dc346392f61a4a50afbbd8abc88f3f25558bfbbbb862cd56508b20f5 - languageName: node - linkType: hard - "minimist-options@npm:4.1.0": version: 4.1.0 resolution: "minimist-options@npm:4.1.0" @@ -11001,30 +10713,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^2.0.1": - version: 2.0.1 - resolution: "minipass-collect@npm:2.0.1" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10/b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342 - languageName: node - linkType: hard - -"minipass-fetch@npm:^3.0.0": - version: 3.0.5 - resolution: "minipass-fetch@npm:3.0.5" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^7.0.3" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10/c669948bec1373313aaa8f104b962a3ced9f45c49b26366a4b0ae27ccdfa9c5740d72c8a84d3f8623d7a61c5fc7afdfda44789008c078f61a62441142efc4a97 - languageName: node - linkType: hard - "minipass-flush@npm:^1.0.5": version: 1.0.5 resolution: "minipass-flush@npm:1.0.5" @@ -11034,7 +10722,7 @@ __metadata: languageName: node linkType: hard -"minipass-pipeline@npm:^1.2.2, minipass-pipeline@npm:^1.2.4": +"minipass-pipeline@npm:^1.2.2": version: 1.2.4 resolution: "minipass-pipeline@npm:1.2.4" dependencies: @@ -11043,15 +10731,6 @@ __metadata: languageName: node linkType: hard -"minipass-sized@npm:^1.0.3": - version: 1.0.3 - resolution: "minipass-sized@npm:1.0.3" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10/40982d8d836a52b0f37049a0a7e5d0f089637298e6d9b45df9c115d4f0520682a78258905e5c8b180fb41b593b0a82cc1361d2c74b45f7ada66334f84d1ecfdd - languageName: node - linkType: hard - "minipass@npm:^3.0.0, minipass@npm:^3.1.1": version: 3.3.6 resolution: "minipass@npm:3.3.6" @@ -11068,14 +10747,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4": - version: 7.1.1 - resolution: "minipass@npm:7.1.1" - checksum: 10/6f4f920f1b5ea585d08fa3739b9bd81726cd85a0c972fb371c0fa6c1544d468813fb1694c7bc64ad81f138fd8abf665e2af0f406de9ba5741d8e4a377ed346b1 - languageName: node - linkType: hard - -"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": +"minizlib@npm:^2.1.1": version: 2.1.2 resolution: "minizlib@npm:2.1.2" dependencies: @@ -11294,7 +10966,7 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.12.1, nan@npm:^2.14.0": +"nan@npm:^2.12.1": version: 2.18.0 resolution: "nan@npm:2.18.0" dependencies: @@ -11303,15 +10975,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.17.0": - version: 2.19.0 - resolution: "nan@npm:2.19.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10/b97f680753113bcd803cb174e40baa01e04aa4cb95ee62b48841336d9c48b278a2eeff71a4a0d7315b8f639fb1e38049925d3be1c6e266c158dc8f7d95d67eaa - languageName: node - linkType: hard - "nanoid@npm:3.3.4": version: 3.3.4 resolution: "nanoid@npm:3.3.4" @@ -11370,7 +11033,7 @@ __metadata: languageName: node linkType: hard -"negotiator@npm:0.6.3, negotiator@npm:^0.6.3": +"negotiator@npm:0.6.3": version: 0.6.3 resolution: "negotiator@npm:0.6.3" checksum: 10/2723fb822a17ad55c93a588a4bc44d53b22855bf4be5499916ca0cab1e7165409d0b288ba2577d7b029f10ce18cf2ed8e703e5af31c984e1e2304277ef979837 @@ -11424,15 +11087,6 @@ __metadata: languageName: node linkType: hard -"node-addon-api@npm:*": - version: 7.0.0 - resolution: "node-addon-api@npm:7.0.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10/f1a54ae38f6cbd4cdfe69d1b2f3f0c4a3d227eb50f5073f0a3b985d29a0c39c94b82c88213e5075ee1bc262f2e869841c733ebe7111a5e376f1732649edf6a93 - languageName: node - linkType: hard - "node-addon-api@npm:^3.2.1": version: 3.2.1 resolution: "node-addon-api@npm:3.2.1" @@ -11469,23 +11123,10 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:10.1.0": - version: 10.1.0 - resolution: "node-gyp@npm:10.1.0" - dependencies: - env-paths: "npm:^2.2.0" - exponential-backoff: "npm:^3.1.1" - glob: "npm:^10.3.10" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^13.0.0" - nopt: "npm:^7.0.0" - proc-log: "npm:^3.0.0" - semver: "npm:^7.3.5" - tar: "npm:^6.1.2" - which: "npm:^4.0.0" - bin: - node-gyp: bin/node-gyp.js - checksum: 10/89e105e495e66cd4568af3cf79cdeb67d670eb069e33163c7781d3366470a30367c9bd8dea59e46db16370020139e5bf78b1fbc03284cb571754dfaa59744db5 +"node-gyp@npm:@favware/skip-dependency@latest, node-pty@npm:@favware/skip-dependency@latest, nsfw@npm:@favware/skip-dependency@latest, spdlog@npm:@favware/skip-dependency@latest": + version: 1.2.2 + resolution: "@favware/skip-dependency@npm:1.2.2" + checksum: 10/1318b83ab874729ffc4b0b74756b2f691d43081172fb895605edda6ff474a748e1dcd59213275860854cca4bead9f2bef118d1dac832647abd5dfdb9f54b7d46 languageName: node linkType: hard @@ -11510,16 +11151,6 @@ __metadata: languageName: node linkType: hard -"node-pty@npm:1.0.0": - version: 1.0.0 - resolution: "node-pty@npm:1.0.0" - dependencies: - nan: "npm:^2.17.0" - node-gyp: "npm:latest" - checksum: 10/f1803531bfee71fdc8fb97fc544364e64de6bad91d6221b79b6a8e3518032768bff8738960d15f29e5a14aa16b9eb550e1a26ba1ad8c66f86424b9f56fd0ccad - languageName: node - linkType: hard - "node-releases@npm:^2.0.14": version: 2.0.14 resolution: "node-releases@npm:2.0.14" @@ -11527,17 +11158,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^7.0.0": - version: 7.2.1 - resolution: "nopt@npm:7.2.1" - dependencies: - abbrev: "npm:^2.0.0" - bin: - nopt: bin/nopt.js - checksum: 10/95a1f6dec8a81cd18cdc2fed93e6f0b4e02cf6bdb4501c848752c6e34f9883d9942f036a5e3b21a699047d8a448562d891e67492df68ec9c373e6198133337ae - languageName: node - linkType: hard - "normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0": version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" @@ -11621,16 +11241,6 @@ __metadata: languageName: node linkType: hard -"nsfw@npm:2.2.0": - version: 2.2.0 - resolution: "nsfw@npm:2.2.0" - dependencies: - node-addon-api: "npm:*" - node-gyp: "npm:latest" - checksum: 10/536ef494161877c833760a4a496b59b8d87e0e46b498e6a6e03c7d0d623f1388780b98ce9adb4592feb770eb1cf7b41984bf4eede257f609eab48e4897f76922 - languageName: node - linkType: hard - "nth-check@npm:^2.0.1": version: 2.1.1 resolution: "nth-check@npm:2.1.1" @@ -12237,16 +11847,6 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.11.0": - version: 1.11.1 - resolution: "path-scurry@npm:1.11.1" - dependencies: - lru-cache: "npm:^10.2.0" - minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - checksum: 10/5e8845c159261adda6f09814d7725683257fcc85a18f329880ab4d7cc1d12830967eae5d5894e453f341710d5484b8fdbbd4d75181b4d6e1eb2f4dc7aeadc434 - languageName: node - linkType: hard - "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -13198,20 +12798,6 @@ __metadata: languageName: node linkType: hard -"proc-log@npm:^3.0.0": - version: 3.0.0 - resolution: "proc-log@npm:3.0.0" - checksum: 10/02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02 - languageName: node - linkType: hard - -"proc-log@npm:^4.2.0": - version: 4.2.0 - resolution: "proc-log@npm:4.2.0" - checksum: 10/4e1394491b717f6c1ade15c570ecd4c2b681698474d3ae2d303c1e4b6ab9455bd5a81566211e82890d5a5ae9859718cc6954d5150bb18b09b72ecb297beae90a - languageName: node - linkType: hard - "process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -13236,16 +12822,6 @@ __metadata: languageName: node linkType: hard -"promise-retry@npm:^2.0.1": - version: 2.0.1 - resolution: "promise-retry@npm:2.0.1" - dependencies: - err-code: "npm:^2.0.2" - retry: "npm:^0.12.0" - checksum: 10/96e1a82453c6c96eef53a37a1d6134c9f2482f94068f98a59145d0986ca4e497bf110a410adf73857e588165eab3899f0ebcf7b3890c1b3ce802abc0d65967d4 - languageName: node - linkType: hard - "prompts@npm:^2.0.1": version: 2.4.2 resolution: "prompts@npm:2.4.2" @@ -15374,13 +14950,6 @@ __metadata: languageName: node linkType: hard -"smart-buffer@npm:^4.2.0": - version: 4.2.0 - resolution: "smart-buffer@npm:4.2.0" - checksum: 10/927484aa0b1640fd9473cee3e0a0bcad6fce93fd7bbc18bac9ad0c33686f5d2e2c422fba24b5899c184524af01e11dd2bd051c2bf2b07e47aff8ca72cbfc60d2 - languageName: node - linkType: hard - "snapdragon-node@npm:^2.0.1": version: 2.1.1 resolution: "snapdragon-node@npm:2.1.1" @@ -15441,27 +15010,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^8.0.3": - version: 8.0.3 - resolution: "socks-proxy-agent@npm:8.0.3" - dependencies: - agent-base: "npm:^7.1.1" - debug: "npm:^4.3.4" - socks: "npm:^2.7.1" - checksum: 10/c2112c66d6322e497d68e913c3780f3683237fd394bfd480b9283486a86e36095d0020db96145d88f8ccd9cc73261b98165b461f9c1bf5dc17abfe75c18029ce - languageName: node - linkType: hard - -"socks@npm:^2.7.1": - version: 2.8.3 - resolution: "socks@npm:2.8.3" - dependencies: - ip-address: "npm:^9.0.5" - smart-buffer: "npm:^4.2.0" - checksum: 10/ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb - languageName: node - linkType: hard - "source-list-map@npm:^2.0.0, source-list-map@npm:^2.0.1": version: 2.0.1 resolution: "source-list-map@npm:2.0.1" @@ -15534,18 +15082,6 @@ __metadata: languageName: node linkType: hard -"spdlog@npm:^0.9.0": - version: 0.9.0 - resolution: "spdlog@npm:0.9.0" - dependencies: - bindings: "npm:^1.5.0" - mkdirp: "npm:^0.5.1" - nan: "npm:^2.14.0" - node-gyp: "npm:latest" - checksum: 10/8a2b2e8926bd8b51e743a1555c175cf9e0bd94bbc3278e9675a465e76ff45e69dfaa36d00f70fa1a7c969b84bda6f3cff3b255972e94fec243af976339fc96d1 - languageName: node - linkType: hard - "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -15634,13 +15170,6 @@ __metadata: languageName: node linkType: hard -"sprintf-js@npm:^1.1.3": - version: 1.1.3 - resolution: "sprintf-js@npm:1.1.3" - checksum: 10/e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb - languageName: node - linkType: hard - "sprintf-js@npm:~1.0.2": version: 1.0.3 resolution: "sprintf-js@npm:1.0.3" @@ -15648,15 +15177,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^10.0.0": - version: 10.0.6 - resolution: "ssri@npm:10.0.6" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10/f92c1b3cc9bfd0a925417412d07d999935917bc87049f43ebec41074661d64cf720315661844106a77da9f8204b6d55ae29f9514e673083cae39464343af2a8b - languageName: node - linkType: hard - "ssri@npm:^8.0.1": version: 8.0.1 resolution: "ssri@npm:8.0.1" @@ -15765,17 +15285,6 @@ __metadata: languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0": - version: 4.2.3 - resolution: "string-width@npm:4.2.3" - dependencies: - emoji-regex: "npm:^8.0.0" - is-fullwidth-code-point: "npm:^3.0.0" - strip-ansi: "npm:^6.0.1" - checksum: 10/e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb - languageName: node - linkType: hard - "string-width@npm:^1.0.1, string-width@npm:^1.0.2": version: 1.0.2 resolution: "string-width@npm:1.0.2" @@ -15808,14 +15317,14 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^5.0.1, string-width@npm:^5.1.2": - version: 5.1.2 - resolution: "string-width@npm:5.1.2" +"string-width@npm:^4.1.0, string-width@npm:^4.2.0": + version: 4.2.3 + resolution: "string-width@npm:4.2.3" dependencies: - eastasianwidth: "npm:^0.2.0" - emoji-regex: "npm:^9.2.2" - strip-ansi: "npm:^7.0.1" - checksum: 10/7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193 + emoji-regex: "npm:^8.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + strip-ansi: "npm:^6.0.1" + checksum: 10/e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb languageName: node linkType: hard @@ -15848,15 +15357,6 @@ __metadata: languageName: node linkType: hard -"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": - version: 6.0.1 - resolution: "strip-ansi@npm:6.0.1" - dependencies: - ansi-regex: "npm:^5.0.1" - checksum: 10/ae3b5436d34fadeb6096367626ce987057713c566e1e7768818797e00ac5d62023d0f198c4e681eae9e20701721980b26a64a8f5b91238869592a9c6800719a2 - languageName: node - linkType: hard - "strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1": version: 3.0.1 resolution: "strip-ansi@npm:3.0.1" @@ -15884,12 +15384,12 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^7.0.1": - version: 7.1.0 - resolution: "strip-ansi@npm:7.1.0" +"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" dependencies: - ansi-regex: "npm:^6.0.1" - checksum: 10/475f53e9c44375d6e72807284024ac5d668ee1d06010740dec0b9744f2ddf47de8d7151f80e5f6190fc8f384e802fdf9504b76a7e9020c9faee7103623338be2 + ansi-regex: "npm:^5.0.1" + checksum: 10/ae3b5436d34fadeb6096367626ce987057713c566e1e7768818797e00ac5d62023d0f198c4e681eae9e20701721980b26a64a8f5b91238869592a9c6800719a2 languageName: node linkType: hard @@ -16185,7 +15685,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2": +"tar@npm:^6.0.2": version: 6.2.0 resolution: "tar@npm:6.2.0" dependencies: @@ -16882,15 +16382,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-filename@npm:3.0.0" - dependencies: - unique-slug: "npm:^4.0.0" - checksum: 10/8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df - languageName: node - linkType: hard - "unique-slug@npm:^2.0.0": version: 2.0.2 resolution: "unique-slug@npm:2.0.2" @@ -16900,15 +16391,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^4.0.0": - version: 4.0.0 - resolution: "unique-slug@npm:4.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10/40912a8963fc02fb8b600cf50197df4a275c602c60de4cac4f75879d3c48558cfac48de08a25cc10df8112161f7180b3bbb4d662aadb711568602f9eddee54f0 - languageName: node - linkType: hard - "unique-stream@npm:^2.0.2": version: 2.3.1 resolution: "unique-stream@npm:2.3.1" @@ -17713,17 +17195,6 @@ __metadata: languageName: node linkType: hard -"which@npm:^4.0.0": - version: 4.0.0 - resolution: "which@npm:4.0.0" - dependencies: - isexe: "npm:^3.1.1" - bin: - node-which: bin/which.js - checksum: 10/f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651 - languageName: node - linkType: hard - "wildcard@npm:^2.0.0": version: 2.0.1 resolution: "wildcard@npm:2.0.1" @@ -17747,17 +17218,6 @@ __metadata: languageName: node linkType: hard -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": - version: 7.0.0 - resolution: "wrap-ansi@npm:7.0.0" - dependencies: - ansi-styles: "npm:^4.0.0" - string-width: "npm:^4.1.0" - strip-ansi: "npm:^6.0.0" - checksum: 10/cebdaeca3a6880da410f75209e68cd05428580de5ad24535f22696d7d9cab134d1f8498599f344c3cf0fb37c1715807a183778d8c648d6cc0cb5ff2bb4236540 - languageName: node - linkType: hard - "wrap-ansi@npm:^2.0.0": version: 2.1.0 resolution: "wrap-ansi@npm:2.1.0" @@ -17790,14 +17250,14 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^8.1.0": - version: 8.1.0 - resolution: "wrap-ansi@npm:8.1.0" +"wrap-ansi@npm:^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" dependencies: - ansi-styles: "npm:^6.1.0" - string-width: "npm:^5.0.1" - strip-ansi: "npm:^7.0.1" - checksum: 10/7b1e4b35e9bb2312d2ee9ee7dc95b8cb5f8b4b5a89f7dde5543fe66c1e3715663094defa50d75454ac900bd210f702d575f15f3f17fa9ec0291806d2578d1ddf + ansi-styles: "npm:^4.0.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10/cebdaeca3a6880da410f75209e68cd05428580de5ad24535f22696d7d9cab134d1f8498599f344c3cf0fb37c1715807a183778d8c648d6cc0cb5ff2bb4236540 languageName: node linkType: hard