diff --git a/package.json b/package.json index 90eda429..1161d142 100644 --- a/package.json +++ b/package.json @@ -45,11 +45,6 @@ "@commitlint/config-conventional" ] }, - "pnpm": { - "patchedDependencies": { - "detype@0.6.3": "patches/detype@0.6.3.patch" - } - }, "simple-git-hooks": { "pre-commit": "pnpm lint-staged", "commit-msg": "pnpm commitlint --edit ${1}" diff --git a/packages/cli/package.json b/packages/cli/package.json index 8c4d1361..c80007f7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -52,7 +52,7 @@ "chalk": "5.3.0", "commander": "^11.0.0", "cosmiconfig": "^8.3.6", - "detype": "^0.6.3", + "detype": "npm:detypes@^0.7.0", "diff": "^5.1.0", "execa": "^8.0.1", "fs-extra": "^11.1.1", diff --git a/patches/detype@0.6.3.patch b/patches/detype@0.6.3.patch deleted file mode 100644 index f96a97c3..00000000 --- a/patches/detype@0.6.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 8b8e0d078e27474da1cf58ce3fef1d7acefb1cd4..314b23766204dcc6d2873e8ea654dcc3040ba0a5 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -146,9 +146,9 @@ async function removeTypesFromVueSfcScript(code, fileName, script, templateAst, - (0, import_template_ast_types.traverse)(templateAst, { - enter(node) { - if ((0, import_template_ast_types.isSimpleExpressionNode)(node) && !node.isStatic) { -- expressions.add(node.content); -+ expressions.add(`[${node.content}]`); - } else if ((0, import_template_ast_types.isComponentNode)(node)) { -- expressions.add(node.tag); -+ expressions.add(`[${node.tag}]`); - } - } - }); \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94b68d98..6c082121 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,11 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -patchedDependencies: - detype@0.6.3: - hash: tlxqopreogk7nma7uu7ixdzk3u - path: patches/detype@0.6.3.patch - importers: .: @@ -193,8 +188,8 @@ importers: specifier: ^8.3.6 version: 8.3.6(typescript@5.2.2) detype: - specifier: ^0.6.3 - version: 0.6.3(patch_hash=tlxqopreogk7nma7uu7ixdzk3u) + specifier: npm:detypes@^0.7.0 + version: /detypes@0.7.0 diff: specifier: ^5.1.0 version: 5.1.0 @@ -4054,14 +4049,15 @@ packages: engines: {node: '>=12.20'} dev: true - /detype@0.6.3(patch_hash=tlxqopreogk7nma7uu7ixdzk3u): - resolution: {integrity: sha512-b42ytoZGAOo2U9V4zAMqtiWHgeG8F6kRQsg1E6n0uARMxOItxlWWS+pSsNbvmejInhfui0Q0mn9Bd4lwqhLaSA==} - engines: {node: '>=14.19.3'} + /detypes@0.7.0: + resolution: {integrity: sha512-W2ICgnPKbXbs9XEexlHXCL4XBRUvjtBLgw5iIYPxHzUnmQfE+gXEDrGlxOLkxvKm9irP810JUDoDlKof0dwI1g==} + engines: {node: '>=18'} hasBin: true dependencies: '@babel/core': 7.23.0 '@babel/preset-typescript': 7.23.0(@babel/core@7.23.0) '@vue/compiler-dom': 3.3.4 + '@vue/compiler-sfc': 3.3.4 '@vuedx/compiler-sfc': 0.7.1 '@vuedx/template-ast-types': 0.7.1 fast-glob: 3.3.1 @@ -4070,7 +4066,6 @@ packages: transitivePeerDependencies: - supports-color dev: false - patched: true /didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} @@ -7180,6 +7175,7 @@ packages: /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + requiresBuild: true /scule@1.0.0: resolution: {integrity: sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==}