Skip to content

Commit

Permalink
docs(en): merging all conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
docschina-bot committed Nov 17, 2023
2 parents 6ff8e02 + 1df8b49 commit 94cad08
Show file tree
Hide file tree
Showing 20 changed files with 832 additions and 385 deletions.
121 changes: 108 additions & 13 deletions docs/plugin-development/index.md

Large diffs are not rendered by default.

782 changes: 613 additions & 169 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@
"@rollup/plugin-typescript": "11.1.5",
"@rollup/pluginutils": "^5.0.5",
"@types/estree": "1.0.5",
"@types/mocha": "^10.0.3",
"@types/mocha": "^10.0.4",
"@types/node": "18.0.0",
"@types/yargs-parser": "^21.0.2",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@types/yargs-parser": "^21.0.3",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"acorn": "^8.11.2",
Expand All @@ -153,19 +153,19 @@
"fs-extra": "^11.1.1",
"github-api": "^3.4.0",
"husky": "^8.0.3",
"inquirer": "^9.2.11",
"inquirer": "^9.2.12",
"is-reference": "^3.0.2",
"lint-staged": "^15.0.2",
"lint-staged": "^15.1.0",
"locate-character": "^3.0.0",
"magic-string": "^0.30.5",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"pinia": "^2.1.7",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"pretty-bytes": "^6.1.1",
"pretty-ms": "^8.0.0",
"requirejs": "^2.3.6",
"rollup": "^4.3.1",
"rollup": "^4.4.0",
"rollup-plugin-license": "^3.2.0",
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-thatworks": "^1.0.4",
Expand All @@ -186,7 +186,7 @@
"yargs-parser": "^21.1.1"
},
"overrides": {
"axios": "^1.6.0",
"axios": "^1.6.1",
"semver": "^7.5.4"
},
"files": [
Expand Down
Loading

0 comments on commit 94cad08

Please sign in to comment.