From 4158a1aee2e52691b81625951d08c163bbb02cc6 Mon Sep 17 00:00:00 2001 From: winixt Date: Wed, 10 Sep 2025 10:00:00 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=85=BC=E5=AE=B9fes3.x=20=E7=9A=84?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-template-h5/src/pages/index.vue | 10 +- packages/utils/src/compatESModuleRequire.ts | 3 + pnpm-lock.yaml | 109 ++++++++++++++++++- 3 files changed, 118 insertions(+), 4 deletions(-) diff --git a/packages/fes-template-h5/src/pages/index.vue b/packages/fes-template-h5/src/pages/index.vue index d118c505..2c55219c 100644 --- a/packages/fes-template-h5/src/pages/index.vue +++ b/packages/fes-template-h5/src/pages/index.vue @@ -1,13 +1,19 @@ diff --git a/packages/utils/src/compatESModuleRequire.ts b/packages/utils/src/compatESModuleRequire.ts index 3207d6bf..63cb1763 100644 --- a/packages/utils/src/compatESModuleRequire.ts +++ b/packages/utils/src/compatESModuleRequire.ts @@ -1,3 +1,6 @@ export default function compatESModuleRequire(m: any): any { + if (m.__esModule && m.default?.default) { + return m.default.default; + } return m.default ?? m; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2718a192..4f767cd5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -448,8 +448,8 @@ importers: specifier: workspace:* version: link:../plugin-icon '@fesjs/plugin-request': - specifier: workspace:* - version: link:../plugin-request + specifier: 3.0.8 + version: 3.0.8(@fesjs/fes@packages+fes)(vue@3.5.21(typescript@5.9.2)) core-js: specifier: ^3.45.1 version: 3.45.1 @@ -2253,6 +2253,12 @@ packages: '@fesjs/fes-design': '>=0.7.20' vue: ^3.5.21 + '@fesjs/plugin-request@3.0.8': + resolution: {integrity: sha512-Pm+yJBQAZnmPFxPVjpQpKwqr/C/kQLI0BTxxudX26NdfPJg0XbnIOr7AsXGLZkbRdg/GAzJKzsta9WV08b3cag==} + peerDependencies: + '@fesjs/fes': ^3.0.0-rc.0 + vue: ^3.2.47 + '@fesjs/plugin-request@4.0.1': resolution: {integrity: sha512-FIZy7lUmCrmUq9KyQCBbatLVQPSjBOln3dRsepTGinXwPrircLagd0F5SzsNB7us+Yrxh2CaGYtzobdj2vS65A==} peerDependencies: @@ -2275,6 +2281,9 @@ packages: peerDependencies: vue: ^3.2.47 + '@fesjs/utils@3.0.0-rc.2': + resolution: {integrity: sha512-kZlFvKZtuw77Xd4gru0uHMWB13lTWvpSQzMhfD4UnPBQQhtpGZrDWX/7ik/qafdxPkZ3ovwPbirScrCMHdPvNw==} + '@fesjs/utils@3.0.3': resolution: {integrity: sha512-FKXUqixAspT1I5aYGU79xmIUGSUqrMY/cElwyQ1DavMmM/p74BbuZkceXjk9FeicJ7a34v8UfVpzd7MmgnRuiw==} @@ -3640,6 +3649,9 @@ packages: async@3.2.6: resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==} + asynckit@0.4.0: + resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} + at-least-node@1.0.0: resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==} engines: {node: '>= 4.0.0'} @@ -3655,6 +3667,9 @@ packages: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} + axios@1.11.0: + resolution: {integrity: sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==} + babel-loader@10.0.0: resolution: {integrity: sha512-z8jt+EdS61AMw22nSfoNJAZ0vrtmhPRVi6ghL3rCeRZI8cdNYFiV5xeV3HbE7rlZZNmGH8BVccwWt8/ED0QOHA==} engines: {node: ^18.20.0 || ^20.10.0 || >=22.0.0} @@ -3940,6 +3955,10 @@ packages: colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} + combined-stream@1.0.8: + resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} + engines: {node: '>= 0.8'} + commander@10.0.1: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} engines: {node: '>=14'} @@ -4401,6 +4420,10 @@ packages: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} + delayed-stream@1.0.0: + resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} + engines: {node: '>=0.4.0'} + depd@1.1.2: resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} engines: {node: '>= 0.6'} @@ -5012,6 +5035,10 @@ packages: resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} engines: {node: '>=14'} + form-data@4.0.4: + resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==} + engines: {node: '>= 6'} + format@0.2.2: resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==} engines: {node: '>=0.4.x'} @@ -6330,6 +6357,11 @@ packages: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true + mkdirp@1.0.4: + resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} + engines: {node: '>=10'} + hasBin: true + mkdirp@2.1.6: resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==} engines: {node: '>=10'} @@ -7235,6 +7267,9 @@ packages: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} + proxy-from-env@1.1.0: + resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} @@ -7430,6 +7465,11 @@ packages: rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} + rimraf@3.0.2: + resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + deprecated: Rimraf versions prior to v4 are no longer supported + hasBin: true + rimraf@4.4.1: resolution: {integrity: sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==} engines: {node: '>=14'} @@ -10162,6 +10202,16 @@ snapshots: - typescript - vite + '@fesjs/plugin-request@3.0.8(@fesjs/fes@packages+fes)(vue@3.5.21(typescript@5.9.2))': + dependencies: + '@fesjs/fes': link:packages/fes + '@fesjs/utils': 3.0.0-rc.2 + axios: 1.11.0 + vue: 3.5.21(typescript@5.9.2) + transitivePeerDependencies: + - debug + - supports-color + '@fesjs/plugin-request@4.0.1(@fesjs/fes@3.1.17(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))': dependencies: '@fesjs/fes': 3.1.17(vue@3.5.21(typescript@5.9.2)) @@ -10198,6 +10248,29 @@ snapshots: vue: 3.5.21(typescript@5.9.2) vue-router: 4.5.1(vue@3.5.21(typescript@5.9.2)) + '@fesjs/utils@3.0.0-rc.2': + dependencies: + '@babel/generator': 7.28.3 + '@babel/parser': 7.28.3 + '@babel/traverse': 7.28.3 + chalk: 4.1.2 + chokidar: 3.6.0 + crequire: 1.8.1 + debug: 4.4.1 + deepmerge: 4.3.1 + glob: 7.2.3 + lodash: 4.17.21 + mkdirp: 1.0.4 + mustache: 4.2.0 + pkg-up: 3.1.0 + portfinder: 1.0.37 + resolve: 1.22.10 + rimraf: 3.0.2 + semver: 7.7.2 + yargs-parser: 20.2.9 + transitivePeerDependencies: + - supports-color + '@fesjs/utils@3.0.3': dependencies: '@babel/generator': 7.28.3 @@ -11655,6 +11728,8 @@ snapshots: async@3.2.6: {} + asynckit@0.4.0: {} + at-least-node@1.0.0: {} autoprefixer@10.4.21(postcss@8.5.6): @@ -11671,6 +11746,14 @@ snapshots: dependencies: possible-typed-array-names: 1.1.0 + axios@1.11.0: + dependencies: + follow-redirects: 1.15.11 + form-data: 4.0.4 + proxy-from-env: 1.1.0 + transitivePeerDependencies: + - debug + babel-loader@10.0.0(@babel/core@7.28.3)(webpack@5.101.3(@swc/core@1.13.5)(esbuild@0.25.9)): dependencies: '@babel/core': 7.28.3 @@ -11994,6 +12077,10 @@ snapshots: colorette@2.0.20: {} + combined-stream@1.0.8: + dependencies: + delayed-stream: 1.0.0 + commander@10.0.1: {} commander@11.1.0: {} @@ -12500,6 +12587,8 @@ snapshots: has-property-descriptors: 1.0.2 object-keys: 1.1.1 + delayed-stream@1.0.0: {} + depd@1.1.2: {} depd@2.0.0: {} @@ -13312,6 +13401,14 @@ snapshots: cross-spawn: 7.0.6 signal-exit: 4.1.0 + form-data@4.0.4: + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + es-set-tostringtag: 2.1.0 + hasown: 2.0.2 + mime-types: 2.1.35 + format@0.2.2: {} forwarded@0.2.0: {} @@ -14773,6 +14870,8 @@ snapshots: dependencies: minimist: 1.2.8 + mkdirp@1.0.4: {} + mkdirp@2.1.6: {} mkdirp@3.0.1: {} @@ -15620,6 +15719,8 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 + proxy-from-env@1.1.0: {} + prr@1.0.1: optional: true @@ -15841,6 +15942,10 @@ snapshots: rfdc@1.4.1: {} + rimraf@3.0.2: + dependencies: + glob: 7.2.3 + rimraf@4.4.1: dependencies: glob: 9.3.5