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
2 changes: 0 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
'react-dom-18',
// Breaking change, see https://github.com/web-infra-dev/rslib/pull/992
'@ast-grep/napi',
// Temporarily ignore, see https://github.com/web-infra-dev/rslib/pull/1226
'tinyglobby',
],
postUpdateOptions: ['pnpmDedupe'],
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@changesets/cli": "^2.30.0",
"@rslint/core": "^0.2.3",
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2",
"@rstest/core": "^0.9.4",
"@types/fs-extra": "^11.0.4",
"@types/node": "^24.12.0",
"check-dependency-version-consistency": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"rsbuild-plugin-publint": "^0.3.4",
"rslib": "npm:@rslib/core@0.20.0",
"rslog": "^2.0.1",
"tinyglobby": "0.2.14",
"tinyglobby": "^0.2.15",
"tsconfck": "3.1.6",
"typescript": "^5.9.3"
},
Expand Down
1 change: 0 additions & 1 deletion packages/core/prebundle.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export default {
typescript: 'typescript',
},
dependencies: [
'tinyglobby',
{
name: 'rslog',
dtsOnly: true,
Expand Down
6 changes: 0 additions & 6 deletions packages/core/rslib.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ export default defineConfig({
RSLIB_VERSION: JSON.stringify(packageJson.version),
},
},
// externalize pre-bundled dependencies
output: {
externals: {
tinyglobby: '../compiled/tinyglobby/index.js',
},
},
tools: {
rspack: {
plugins: [new rspack.CircularDependencyRspackPlugin({})],
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
rspack,
type ToolsConfig,
} from '@rsbuild/core';
import { glob } from 'tinyglobby';
import { composeAssetConfig } from './asset/assetConfig';
import {
DTS_EXTENSIONS_PATTERN,
Expand Down Expand Up @@ -1237,6 +1236,9 @@ const composeEntryConfig = async (
}

// Turn entries in array into each separate entry.
const { glob } = await import(
/* webpackChunkName: "tinyglobby" */ 'tinyglobby'
);
const globEntryFiles = await glob(entryFiles, {
cwd: root,
absolute: true,
Expand Down
5 changes: 1 addition & 4 deletions packages/core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
"isolatedDeclarations": true,
"composite": true,
"module": "ESNext",
"moduleResolution": "Bundler",
"paths": {
"tinyglobby": ["./compiled/tinyglobby"]
}
"moduleResolution": "Bundler"
},
"include": ["src", "types.d.ts"],
"exclude": ["**/node_modules"],
Expand Down
2 changes: 1 addition & 1 deletion packages/create-rslib/template-rstest/node-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2"
"@rstest/core": "^0.9.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-rslib/template-rstest/node-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2"
"@rstest/core": "^0.9.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2",
"@rstest/core": "^0.9.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
"happy-dom": "^20.8.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2",
"@rstest/core": "^0.9.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
"happy-dom": "^20.8.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-rslib/template-rstest/vue-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2",
"@rstest/core": "^0.9.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/vue": "^8.1.0",
"@vue/test-utils": "^2.4.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-rslib/template-rstest/vue-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"devDependencies": {
"@rstest/adapter-rslib": "^0.2.1",
"@rstest/core": "^0.9.2",
"@rstest/core": "^0.9.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/vue": "^8.1.0",
"@vue/test-utils": "^2.4.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-dts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"prebundle": "1.6.4",
"rsbuild-plugin-publint": "^0.3.4",
"rslib": "npm:@rslib/core@0.20.0",
"tinyglobby": "0.2.14",
"tinyglobby": "^0.2.15",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.9.3"
},
Expand Down
9 changes: 8 additions & 1 deletion packages/plugin-dts/prebundle.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,12 @@ export default {
externals: {
typescript: 'typescript',
},
dependencies: ['tinyglobby', 'magic-string', 'tsconfig-paths'],
dependencies: [
{
name: 'tinyglobby',
ignoreDts: true,
},
'magic-string',
'tsconfig-paths',
],
};
1 change: 0 additions & 1 deletion packages/plugin-dts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"moduleResolution": "Bundler",
"paths": {
"magic-string": ["./compiled/magic-string"],
"tinyglobby": ["./compiled/tinyglobby"],
"tsconfig-paths": ["./compiled/tsconfig-paths"]
}
},
Expand Down
Loading