diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 852a3e2e..21717227 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -966,6 +966,9 @@ importers: '@vue/composition-api': specifier: '>=1.7.2' version: 1.7.2(vue@3.4.27(typescript@5.4.5)) + typescript: + specifier: '*' + version: 5.4.5 vue: specifier: '>=2.0.0 || >=3.0.0' version: 3.4.27(typescript@5.4.5) @@ -979,9 +982,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - typescript: - specifier: ^5.4.5 - version: 5.4.5 runtime/vue2: dependencies: @@ -994,6 +994,9 @@ importers: '@tmagic/schema': specifier: 1.4.7 version: 1.4.7(typescript@5.4.5) + '@tmagic/stage': + specifier: 1.4.7 + version: 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5) '@tmagic/ui-vue2': specifier: 1.4.7 version: 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5)(vue@2.7.4) @@ -1001,8 +1004,8 @@ importers: specifier: 1.4.7 version: 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5) '@tmagic/vue-runtime-help': - specifier: ^0.0.2 - version: 0.0.2(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@2.7.4))(scenejs@1.9.4)(vue@2.7.4) + specifier: ^0.0.3 + version: 0.0.3(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/stage@1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@2.7.4))(typescript@5.4.5)(vue@2.7.4) axios: specifier: ^0.25.0 version: 0.25.0 @@ -1052,6 +1055,9 @@ importers: '@tmagic/schema': specifier: 1.4.7 version: 1.4.7(typescript@5.4.5) + '@tmagic/stage': + specifier: 1.4.7 + version: 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5) '@tmagic/ui': specifier: 1.4.7 version: 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5)) @@ -1059,8 +1065,8 @@ importers: specifier: 1.4.7 version: 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5) '@tmagic/vue-runtime-help': - specifier: ^0.0.2 - version: 0.0.2(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.5)))(scenejs@1.9.4)(vue@3.4.27(typescript@5.4.5)) + specifier: ^0.0.3 + version: 0.0.3(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/stage@1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.5)))(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5)) axios: specifier: ^0.25.0 version: 0.25.0 @@ -2828,14 +2834,6 @@ packages: typescript: optional: true - '@tmagic/stage@1.4.5': - resolution: {integrity: sha512-CrVRS/lVPsFWZ0DoVH9X+u51/0KlyFyxFhuhoxiTElI/MJDI9bu/j7EJKOxisMgkE1DBUOvS2318uWCATfcYww==} - engines: {node: '>=18'} - peerDependencies: - '@tmagic/core': 1.4.5 - '@tmagic/schema': 1.4.5 - '@tmagic/utils': 1.4.5 - '@tmagic/stage@1.4.7': resolution: {integrity: sha512-9oVlUUQYrgkEBHbQp/7FnWw/42FVL4DBVDcUftL4hSaoGbbATZO2ah99iocHqvQ/MPlwJiA9Du/Gl4IaXPiYBA==} engines: {node: '>=18'} @@ -2921,19 +2919,27 @@ packages: typescript: optional: true - '@tmagic/vue-runtime-help@0.0.2': - resolution: {integrity: sha512-bE2Fmt9pXlS4AZn/oJZfojId2erKID1FleYxGswUjFAMF4heoPU4/Bhl17cA3jn/hQAQpUWtW+Xqj5KwZAkWaw==} + '@tmagic/vue-runtime-help@0.0.3': + resolution: {integrity: sha512-7JdUflZxU5NQBdg3cu289akS8qeivAL976WmTnpqAChHbizLi9vRm211187JHDMFMH5jlRSjvYDknPzVPMugjA==} engines: {node: '>=18'} peerDependencies: - '@tmagic/core': 1.4.5 - '@tmagic/data-source': 1.4.5 - '@tmagic/schema': 1.4.5 - '@tmagic/utils': 1.4.5 + '@tmagic/core': 1.4.7 + '@tmagic/data-source': 1.4.7 + '@tmagic/schema': 1.4.7 + '@tmagic/stage': 1.4.7 + '@tmagic/utils': 1.4.7 '@vue/composition-api': '>=1.7.2' + typescript: '*' vue: '>=2.0.0 || >=3.0.0' peerDependenciesMeta: + '@tmagic/schema': + optional: true + '@tmagic/stage': + optional: true '@vue/composition-api': optional: true + typescript: + optional: true '@tootallnate/once@2.0.0': resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} @@ -8323,20 +8329,6 @@ snapshots: optionalDependencies: typescript: 5.4.5 - '@tmagic/stage@1.4.5(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)': - dependencies: - '@scena/guides': 0.29.2 - '@tmagic/core': 1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5) - '@tmagic/schema': 1.4.7(typescript@5.4.5) - '@tmagic/utils': 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5) - events: 3.3.0 - keycon: 1.4.0 - lodash-es: 4.17.21 - moveable: 0.53.0 - moveable-helper: 0.4.0(scenejs@1.9.4) - transitivePeerDependencies: - - scenejs - '@tmagic/stage@1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5)': dependencies: '@scena/guides': 0.29.2 @@ -8417,33 +8409,31 @@ snapshots: optionalDependencies: typescript: 5.4.5 - '@tmagic/vue-runtime-help@0.0.2(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@2.7.4))(scenejs@1.9.4)(vue@2.7.4)': - dependencies: + ? '@tmagic/vue-runtime-help@0.0.3(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/stage@1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@2.7.4))(typescript@5.4.5)(vue@2.7.4)' + : dependencies: '@tmagic/core': 1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5) '@tmagic/data-source': 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5) - '@tmagic/schema': 1.4.7(typescript@5.4.5) - '@tmagic/stage': 1.4.5(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4) '@tmagic/utils': 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5) vue: 2.7.4 vue-demi: 0.14.7(@vue/composition-api@1.7.2(vue@2.7.4))(vue@2.7.4) optionalDependencies: + '@tmagic/schema': 1.4.7(typescript@5.4.5) + '@tmagic/stage': 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5) '@vue/composition-api': 1.7.2(vue@2.7.4) - transitivePeerDependencies: - - scenejs + typescript: 5.4.5 - '@tmagic/vue-runtime-help@0.0.2(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.5)))(scenejs@1.9.4)(vue@3.4.27(typescript@5.4.5))': - dependencies: + ? '@tmagic/vue-runtime-help@0.0.3(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/stage@1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.5)))(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5))' + : dependencies: '@tmagic/core': 1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5) '@tmagic/data-source': 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5) - '@tmagic/schema': 1.4.7(typescript@5.4.5) - '@tmagic/stage': 1.4.5(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4) '@tmagic/utils': 1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5) vue: 3.4.27(typescript@5.4.5) vue-demi: 0.14.7(@vue/composition-api@1.7.2(vue@3.4.27(typescript@5.4.5)))(vue@3.4.27(typescript@5.4.5)) optionalDependencies: + '@tmagic/schema': 1.4.7(typescript@5.4.5) + '@tmagic/stage': 1.4.7(@tmagic/core@1.4.7(@tmagic/data-source@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(typescript@5.4.5))(@tmagic/schema@1.4.7(typescript@5.4.5))(@tmagic/utils@1.4.7(@tmagic/schema@1.4.7(typescript@5.4.5))(typescript@5.4.5))(scenejs@1.9.4)(typescript@5.4.5) '@vue/composition-api': 1.7.2(vue@3.4.27(typescript@5.4.5)) - transitivePeerDependencies: - - scenejs + typescript: 5.4.5 '@tootallnate/once@2.0.0': {} diff --git a/runtime/vue-runtime-help/package.json b/runtime/vue-runtime-help/package.json index 8b0afad0..bdae5994 100644 --- a/runtime/vue-runtime-help/package.json +++ b/runtime/vue-runtime-help/package.json @@ -1,5 +1,5 @@ { - "version": "0.0.2", + "version": "0.0.3", "name": "@tmagic/vue-runtime-help", "type": "module", "sideEffects": false, @@ -26,25 +26,34 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "dependencies": { - "@tmagic/stage": "workspace:*", "vue-demi": "^0.14.7" }, "peerDependencies": { "@tmagic/core": "workspace:*", "@tmagic/data-source": "workspace:*", "@tmagic/schema": "workspace:*", + "@tmagic/stage": "workspace:*", "@tmagic/utils": "workspace:*", "@vue/composition-api": ">=1.7.2", + "typescript": "*", "vue": ">=2.0.0 || >=3.0.0" }, "peerDependenciesMeta": { "@vue/composition-api": { "optional": true + }, + "@tmagic/schema": { + "optional": true + }, + "@tmagic/stage": { + "optional": true + }, + "typescript": { + "optional": true } }, "devDependencies": { "@types/node": "^18.19.0", - "rimraf": "^3.0.2", - "typescript": "^5.4.5" + "rimraf": "^3.0.2" } } \ No newline at end of file diff --git a/runtime/vue-runtime-help/src/hooks/use-dsl.ts b/runtime/vue-runtime-help/src/hooks/use-dsl.ts index e15b5aae..bc56a26b 100644 --- a/runtime/vue-runtime-help/src/hooks/use-dsl.ts +++ b/runtime/vue-runtime-help/src/hooks/use-dsl.ts @@ -1,12 +1,11 @@ -import { inject, nextTick, reactive, ref } from 'vue-demi'; +import { nextTick, reactive, ref } from 'vue-demi'; import Core from '@tmagic/core'; import type { ChangeEvent } from '@tmagic/data-source'; import type { MNode } from '@tmagic/schema'; import { isPage, replaceChildNode } from '@tmagic/utils'; -export const useDsl = () => { - const app = inject('app'); +export const useDsl = (app: Core | undefined) => { const pageConfig = ref(app?.page?.data || {}); app?.dataSourceManager?.on('update-data', (nodes: MNode[], sourceId: string, changeEvent: ChangeEvent) => { diff --git a/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts b/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts index e511e215..6d86fe54 100644 --- a/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts +++ b/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts @@ -1,4 +1,4 @@ -import { computed, inject, nextTick, reactive, ref, watch } from 'vue-demi'; +import { computed, nextTick, reactive, ref, watch } from 'vue-demi'; import Core from '@tmagic/core'; import type { Id, MApp, MNode } from '@tmagic/schema'; @@ -11,9 +11,7 @@ declare global { } } -export const useEditorDsl = (win = window) => { - const app = inject('app'); - +export const useEditorDsl = (app: Core | undefined, win = window) => { const root = ref(); const curPageId = ref(); const selectedId = ref(); diff --git a/runtime/vue2/package.json b/runtime/vue2/package.json index 4e0ea143..fdd550d3 100644 --- a/runtime/vue2/package.json +++ b/runtime/vue2/package.json @@ -23,8 +23,9 @@ "@tmagic/data-source": "1.4.7", "@tmagic/ui-vue2": "1.4.7", "@tmagic/schema": "1.4.7", + "@tmagic/stage": "1.4.7", "@tmagic/utils": "1.4.7", - "@tmagic/vue-runtime-help": "^0.0.2", + "@tmagic/vue-runtime-help": "^0.0.3", "axios": "^0.25.0", "terser": "^5.31.0", "vue": "^2.7.4" diff --git a/runtime/vue2/page/App.vue b/runtime/vue2/page/App.vue index 90a5fd7c..fef89ecc 100644 --- a/runtime/vue2/page/App.vue +++ b/runtime/vue2/page/App.vue @@ -14,9 +14,8 @@ export default defineComponent({ name: 'App', setup() { - const { pageConfig } = useDsl(); - const app = inject('app'); + const { pageConfig } = useDsl(app); app?.on('page-change', (page?: Page) => { if (!page) { diff --git a/runtime/vue2/playground/App.vue b/runtime/vue2/playground/App.vue index eec601d6..691b6477 100644 --- a/runtime/vue2/playground/App.vue +++ b/runtime/vue2/playground/App.vue @@ -3,13 +3,14 @@