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: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
node-version: [18, 20]
node-version: [20]

steps:
- name: Set branch name
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Setup
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"@commitlint/cli": "^15.0.0",
"@ice/spec": "2.0.0-beta.3",
"@types/fs-extra": "^9.0.13",
"@types/node": "^17.0.45",
"@vitest/coverage-c8": "catalog:",
"@types/node": "catalog:",
"@vitest/coverage-v8": "catalog:",
"axios": "^0.23.0",
"c8": "^7.11.3",
"eslint": "^9.24.0",
Expand All @@ -39,7 +39,7 @@
"lint-staged": "^15.5.1",
"npm-run-all": "^4.1.5",
"prettier": "^3.5.3",
"rimraf": "^3.0.2",
"rimraf": "^4.0.0",
"ts-node": "^10.8.2",
"typescript": "catalog:",
"vitest": "catalog:"
Expand Down
1 change: 0 additions & 1 deletion packages/ice-npm-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"devDependencies": {
"typescript": "catalog:",
"vitest": "catalog:",
"@types/node": "^17.0.45",
"@types/fs-extra": "^9.0.13",
"@types/semver": "^7.7.1",
"@types/mkdirp": "^1.0.2",
Expand Down
4 changes: 1 addition & 3 deletions packages/pkg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,11 @@
"@types/babel__core": "^7.1.20",
"@types/debug": "^4.1.12",
"@types/fs-extra": "^9.0.13",
"@types/node": "^17.0.2",
"@types/semver": "^7.7.1",
"cssnano": "^5.1.15",
"jest": "^29.4.3",
"sass": "catalog:",
"source-map": "0.6.1",
"vitest": "catalog:"
"source-map": "0.6.1"
},
"publishConfig": {
"access": "public",
Expand Down
5 changes: 4 additions & 1 deletion packages/pkg/src/helpers/pluginContainer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ export async function createPluginContainer(

// get rollup version
const rollupPkgPath = resolve(require.resolve('rollup'), '../../package.json');
const minimalContext: MinimalPluginContext = {
// new vite pollute types of rollup, should restore it
const minimalContext: Omit<MinimalPluginContext, 'environment' | 'meta'> & {
meta?: Omit<MinimalPluginContext['meta'], 'viteVersion'>;
} = {
meta: {
rollupVersion: safeRequire(rollupPkgPath).version,
// rollupVersion: '2.3.4',
Expand Down
6 changes: 3 additions & 3 deletions packages/pkg/src/test/defineVitestConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import getTaskConfig from './getTaskConfig.js';
import { merge } from 'es-toolkit/object';
import type { Service } from 'build-scripts';
import type {
UserConfigExport,
ViteUserConfigExport as UserConfigExport,
ConfigEnv,
UserConfig as VitestUserConfig,
UserConfigFn as VitestUserConfigFn,
ViteUserConfig as VitestUserConfig,
ViteUserConfigFn as VitestUserConfigFn,
} from 'vitest/config';
import type { TaskConfig, UserConfig } from '../types.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/pkg/tests/core/init.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ describe('initTask', () => {
}),
TASKS,
);
expect(task.config as DeclarationTaskConfig).toContain({
expect(task.config as DeclarationTaskConfig).toMatchObject({
outputMode: 'multi',
generator: 'tsc',
});
Expand Down
Loading
Loading