Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(env): 尝试适配pnpm@9Nodejs 20 #1855

Merged
merged 5 commits into from
May 26, 2024
Merged
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
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -5,32 +5,32 @@
"prepare": "husky install",
"precommit": "lint-staged",
"scripts": "better-scripts",
"dev": "pnpm scripts run dev",
"dev:site": "pnpm scripts run dev:site",
"build": "pnpm scripts run build",
"build:lib": "pnpm scripts run build:lib",
"build:lib:theme": "pnpm scripts run build:lib:theme",
"test": "pnpm scripts run tests.test"
"dev": "pnpm --filter vue-devui dev",
"dev:site": "pnpm --filter vue-devui dev:site",
"build": "pnpm --filter vue-devui build",
"build:lib": "pnpm --filter vue-devui build:lib",
"build:lib:theme": "pnpm --filter vue-devui build:lib:theme",
"test": "pnpm --filter vue-devui tests.test"
},
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@ls-lint/ls-lint": "^1.10.0",
"@types/lodash": "^4.14.182",
"@types/node": "^16.11.6",
"all-contributors-cli": "^6.20.0",
"better-scripts": "^0.1.1",
"@ls-lint/ls-lint": "^1.11.2",
"@types/lodash": "^4.17.4",
"@types/node": "^16.18.97",
"all-contributors-cli": "^6.26.1",
"better-scripts": "^0.1.4",
"esbuild-register": "^2.6.0",
"eslint": "^7.28.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-vue": "^7.11.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-vue": "^7.20.0",
"husky": "^7.0.4",
"intersection-observer": "^0.12.2",
"lint-staged": "^11.0.0",
"lint-staged": "^11.2.6",
"npm-run-all": "^4.1.5",
"stylelint": "^13.13.1",
"stylelint-config-recommended-scss": "^4.3.0",
"stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.20.1"
"stylelint-scss": "^3.21.0"
},
"lint-staged": {
"packages/**/{*.vue,*.js,*.ts,*.jsx,*.tsx}": "eslint --fix",
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
@import './custom-blocks.scss';
@import './sidebar-links.scss';
@import './demo-block.scss';
@import 'devui-theme/src/theme-collection/extend-theme-vue.scss';
@import '../../devui-theme/src/theme-collection/extend-theme-vue.scss';
2 changes: 1 addition & 1 deletion packages/devui-vue/docs/components/editor-md/index.md
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ export default defineComponent({
const fd = new FormData();
fd.append('file', file);
xhr.send(fd);
}).then((res: any) => {
}).then((res) => {
if (res.status === 'success') {
callback({ name: file.name, imgUrl: res['imgUrl'], title: res['imgTitle'] });
} else {
3 changes: 0 additions & 3 deletions packages/devui-vue/package.json
Original file line number Diff line number Diff line change
@@ -88,12 +88,9 @@
"@commitlint/config-conventional": "^11.0.0",
"@docsearch/css": "^3.3.0",
"@docsearch/js": "^3.3.0",
"@types/chalk": "^2.2.0",
"@types/commander": "^2.12.2",
"@types/jest": "^26.0.24",
"@types/markdown-it": "^12.2.3",
"@types/node": "^16.11.6",
"@types/ora": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"@vitejs/plugin-vue": "^1.3.0",
14,911 changes: 8,441 additions & 6,470 deletions pnpm-lock.yaml

Large diffs are not rendered by default.