Commit 5f17bd5
committed
Merge remote-tracking branch 'origin/main' into worktree-persistence-conformance-v1
# Conflicts:
# server/java/metadata/conformance-expected-failures.json
# server/java/metadata/src/main/java/com/metaobjects/MetaRoot.java
# server/java/metadata/src/main/java/com/metaobjects/loader/ValidationPhase.java
# server/java/metadata/src/main/java/com/metaobjects/template/MetaTemplate.java
# server/java/metadata/src/main/java/com/metaobjects/template/OutputTemplate.java
# server/java/metadata/src/main/java/com/metaobjects/template/PromptTemplate.java
# server/java/metadata/src/main/java/com/metaobjects/template/TemplateTypesMetaDataProvider.java
# server/java/metadata/src/main/resources/META-INF/services/com.metaobjects.registry.MetaDataTypeProvider108 files changed
Lines changed: 8402 additions & 388 deletions
File tree
- client/web/packages
- react
- runtime-web
- tanstack
- docs/superpowers
- plans
- specs
- server
- java
- metadata-ktx
- src
- main/kotlin/com/metaobjects/metadata/ktx
- test
- kotlin/com/metaobjects/metadata/ktx
- resources
- metadata/src
- main/java/com/metaobjects
- loader
- template
- test/java/com/metaobjects/template
- render
- src
- main/java/com/metaobjects/render
- test
- java/com/metaobjects/render
- resources
- prompts/lobby
- snapshots
- python/tests/conformance
- typescript/packages
- cli
- codegen-ts-react
- codegen-ts-tanstack
- codegen-ts
- metadata
- src
- core
- loader
- persistence/source
- test
- conformance
- loader
- migrate-ts
- render
- runtime-ts
- sdk
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
11 | 26 | | |
12 | 27 | | |
13 | 28 | | |
| |||
42 | 57 | | |
43 | 58 | | |
44 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
45 | 73 | | |
46 | 74 | | |
47 | 75 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments