Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/brave-feet-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@lynx-js/rspeedy": patch
"@lynx-js/web-explorer": patch
---

bump rsdoctor to 1.5.6
4 changes: 2 additions & 2 deletions packages/react/transform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"test:cargo": "cargo test"
},
"devDependencies": {
"@emnapi/core": "1.3.1",
"@emnapi/runtime": "1.3.1",
"@emnapi/core": "^1.7.1",
"@emnapi/runtime": "^1.7.1",
"@napi-rs/cli": "2.18.4",
"esbuild": "^0.27.3",
"tiny-glob": "0.2.9"
Expand Down
15 changes: 10 additions & 5 deletions packages/rspeedy/core/etc/rspeedy.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { RsbuildPlugin } from '@rsbuild/core';
import { RsbuildPluginAPI } from '@rsbuild/core';
import type { RsbuildPlugins } from '@rsbuild/core';
import { version as rsbuildVersion } from '@rsbuild/core';
import type { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
import type { RsdoctorRspackPluginOptions as RsdoctorRspackPluginOptions_2 } from '@rsdoctor/core';
import { Rspack } from '@rsbuild/core';
import { rspack } from '@rsbuild/core';
import type { ServerConfig } from '@rsbuild/core';
Expand Down Expand Up @@ -284,10 +284,15 @@ export { RsbuildPluginAPI }

export { rsbuildVersion }

// Warning: (ae-missing-release-tag) "RsdoctorRspackPluginOptions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
export type RsdoctorRspackPluginOptions = ConstructorParameters<typeof RsdoctorRspackPlugin<[]>>[0];
// @public
export interface RsdoctorRspackPluginOptions extends Omit<RsdoctorRspackPluginOptions_2<[]>, 'linter'> {
// (undocumented)
linter?: {
rules?: Record<string, unknown>;
level?: 'Ignore' | 'Warn' | 'Error';
extends?: unknown[];
};
}

export { Rspack }

Expand Down
3 changes: 2 additions & 1 deletion packages/rspeedy/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,13 @@
"@lynx-js/websocket": "workspace:^",
"@rsbuild/core": "catalog:rsbuild",
"@rsbuild/plugin-css-minimizer": "1.1.1",
"@rsdoctor/rspack-plugin": "1.2.3"
"@rsdoctor/rspack-plugin": "~1.5.6"
},
Comment thread
yifancong marked this conversation as resolved.
"devDependencies": {
"@lynx-js/vitest-setup": "workspace:*",
"@microsoft/api-extractor": "catalog:",
"@rollup/plugin-typescript": "^12.3.0",
"@rsdoctor/core": "~1.5.6",
"chokidar": "^4.0.3",
"commander": "^13.1.0",
"eventemitter3": "^5.0.4",
Expand Down
22 changes: 18 additions & 4 deletions packages/rspeedy/core/src/config/tools/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,28 @@
// Licensed under the Apache License Version 2.0 that can be found in the
// LICENSE file in the root directory of this source tree.
import type { ToolsConfig } from '@rsbuild/core'
import type { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin'
import type { RsdoctorRspackPluginOptions as RawRsdoctorRspackPluginOptions } from '@rsdoctor/core'

import type { CssExtract } from './css-extract.js'
import type { CssLoader } from './css-loader.js'

export type RsdoctorRspackPluginOptions = ConstructorParameters<
typeof RsdoctorRspackPlugin<[]>
>[0]
/**
* Simplified options type for `tools.rsdoctor`.
*
* Keep this type free of deeply nested/intersection utility types to ensure
* typia can generate validators from `Config`.
*
* @public
*/
export interface RsdoctorRspackPluginOptions
extends Omit<RawRsdoctorRspackPluginOptions<[]>, 'linter'>
{
linter?: {
rules?: Record<string, unknown>
level?: 'Ignore' | 'Warn' | 'Error'
extends?: unknown[]
}
}

/**
* {@inheritdoc Config.tools}
Expand Down
8 changes: 7 additions & 1 deletion packages/rspeedy/core/src/plugins/rsdoctor.plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,14 @@ export function pluginRsdoctor(
}

config.plugins.push(
// Normalize the simplified config type at the plugin boundary.
new RsdoctorRspackPlugin(
mergeRsbuildConfig(defaultOptions, options),
mergeRsbuildConfig(
defaultOptions,
options,
) as unknown as ConstructorParameters<
typeof RsdoctorRspackPlugin<[]>
>[0],
),
)
}
Expand Down
4 changes: 3 additions & 1 deletion packages/web-platform/web-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@
"dev": "rsbuild dev"
},
"devDependencies": {
"@emnapi/core": "^1.7.1",
"@emnapi/runtime": "^1.7.1",
"@lynx-js/lynx-core": "0.1.3",
"@lynx-js/web-core": "workspace:*",
"@lynx-js/web-platform-rsbuild-plugin": "workspace:*",
"@rsbuild/core": "catalog:rsbuild",
"@rsdoctor/rspack-plugin": "1.2.3",
"@rsdoctor/rspack-plugin": "~1.5.6",
"tslib": "^2.8.1"
}
}
Loading
Loading