From 01da9ac21725b833bf3ab63943dd9733eee67845 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 00:53:23 +0000 Subject: [PATCH 1/2] Initial plan From b537dbc532411d9d70cbd5c04d5242b7c1f67f09 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 01:00:55 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Restructure=20sample:=20rename=20projects,?= =?UTF-8?q?=20flatten=20client=20dir,=20rename=20@typeshim=E2=86=92@client?= =?UTF-8?q?,=20merge=20people-ui=20into=20app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ArcadeMode <5969155+ArcadeMode@users.noreply.github.com> --- .../{TypeShim.Sample.Client => }/.gitignore | 2 +- .../@typeshim => @client}/app/index.html | 2 +- .../@typeshim => @client}/app/package.json | 7 +--- .../@typeshim => @client}/app/src/App.tsx | 6 +-- .../@typeshim => @client}/app/src/index.css | 0 .../@typeshim => @client}/app/src/main.tsx | 0 .../app/src/pages/Home.tsx | 2 +- .../app/src/pages/People.tsx | 2 +- .../app/src/people}/AppProvider.tsx | 2 +- .../app/src/people}/PeopleGrid.tsx | 2 +- .../app/src/people}/PeopleList.tsx | 2 +- .../app/src/people}/PeopleRepository.tsx | 2 +- .../app/src/people}/PersonCard.tsx | 2 +- .../app/src/people}/PetChip.tsx | 2 +- .../app/src/people}/appContext.ts | 2 +- .../src => @client/app/src/people}/index.ts | 0 .../@typeshim => @client}/app/tsconfig.json | 0 .../app/tsconfig.node.json | 0 .../@typeshim => @client}/app/vite.config.ts | 0 .../wasm-exports/.gitignore | 0 .../wasm-exports/TypeShimProvider.tsx | 2 +- .../wasm-exports/main.ts | 0 .../wasm-exports/package.json | 2 +- .../wasm-exports/wasm-bootstrap.ts | 0 .../Client.Library.csproj} | 2 +- .../Dtos.cs | 2 +- .../Models.cs | 2 +- .../PeopleApiClient.cs | 2 +- .../PeopleApp.cs | 2 +- .../PeopleProvider.cs | 2 +- .../Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../RandomEntityGenerator.cs | 2 +- .../wwwroot/_framework/dotnet.d.ts | 0 sample/Sample.slnx | 9 +--- .../Controllers/PeopleController.cs | 4 +- .../Program.cs | 2 +- .../Properties/launchSettings.json | 0 .../Server.csproj} | 2 +- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../@typeshim/people-ui/package.json | 28 ------------- .../@typeshim/people-ui/tsconfig.json | 19 --------- .../TypeShim.Sample.Client.esproj | 11 ----- .../TypeShim.Sample.Client.esproj.user | 6 --- .../TypeShim.Sample.Server.csproj.user | 6 --- .../package-lock.json | 42 ++++++------------- .../{TypeShim.Sample.Client => }/package.json | 15 ++++--- .../tsconfig.json | 1 - 49 files changed, 51 insertions(+), 149 deletions(-) rename sample/{TypeShim.Sample.Client => }/.gitignore (98%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/index.html (92%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/package.json (71%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/src/App.tsx (89%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/src/index.css (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/src/main.tsx (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/src/pages/Home.tsx (95%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/src/pages/People.tsx (97%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/AppProvider.tsx (91%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/PeopleGrid.tsx (96%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/PeopleList.tsx (95%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/PeopleRepository.tsx (94%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/PersonCard.tsx (98%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/PetChip.tsx (95%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/appContext.ts (69%) rename sample/{TypeShim.Sample.Client/@typeshim/people-ui/src => @client/app/src/people}/index.ts (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/tsconfig.json (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/tsconfig.node.json (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/app/vite.config.ts (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/wasm-exports/.gitignore (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/wasm-exports/TypeShimProvider.tsx (93%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/wasm-exports/main.ts (100%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/wasm-exports/package.json (87%) rename sample/{TypeShim.Sample.Client/@typeshim => @client}/wasm-exports/wasm-bootstrap.ts (100%) rename sample/{TypeShim.Sample/TypeShim.Sample.csproj => Client.Library/Client.Library.csproj} (94%) rename sample/{TypeShim.Sample => Client.Library}/Dtos.cs (97%) rename sample/{TypeShim.Sample => Client.Library}/Models.cs (97%) rename sample/{TypeShim.Sample => Client.Library}/PeopleApiClient.cs (97%) rename sample/{TypeShim.Sample => Client.Library}/PeopleApp.cs (97%) rename sample/{TypeShim.Sample => Client.Library}/PeopleProvider.cs (97%) rename sample/{TypeShim.Sample => Client.Library}/Program.cs (96%) rename sample/{TypeShim.Sample => Client.Library}/Properties/AssemblyInfo.cs (100%) rename sample/{TypeShim.Sample => Client.Library}/RandomEntityGenerator.cs (98%) rename sample/{TypeShim.Sample => Client.Library}/wwwroot/_framework/dotnet.d.ts (100%) rename sample/{TypeShim.Sample.Server => Server}/Controllers/PeopleController.cs (85%) rename sample/{TypeShim.Sample.Server => Server}/Program.cs (88%) rename sample/{TypeShim.Sample.Server => Server}/Properties/launchSettings.json (100%) rename sample/{TypeShim.Sample.Server/TypeShim.Sample.Server.csproj => Server/Server.csproj} (86%) rename sample/{TypeShim.Sample.Server => Server}/appsettings.Development.json (100%) rename sample/{TypeShim.Sample.Server => Server}/appsettings.json (100%) delete mode 100644 sample/TypeShim.Sample.Client/@typeshim/people-ui/package.json delete mode 100644 sample/TypeShim.Sample.Client/@typeshim/people-ui/tsconfig.json delete mode 100644 sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj delete mode 100644 sample/TypeShim.Sample.Client/TypeShim.Sample.Client.esproj.user delete mode 100644 sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj.user rename sample/{TypeShim.Sample.Client => }/package-lock.json (98%) rename sample/{TypeShim.Sample.Client => }/package.json (58%) rename sample/{TypeShim.Sample.Client => }/tsconfig.json (86%) diff --git a/sample/TypeShim.Sample.Client/.gitignore b/sample/.gitignore similarity index 98% rename from sample/TypeShim.Sample.Client/.gitignore rename to sample/.gitignore index b7447368..da2cd498 100644 --- a/sample/TypeShim.Sample.Client/.gitignore +++ b/sample/.gitignore @@ -97,7 +97,7 @@ temp/ # Preserve root lock !package-lock.json # If individual workspace package-locks accidentally get created (npm -w install inside): -@typeshim/*/package-lock.json +@client/*/package-lock.json # ----------------------------- # Misc bundler artifacts diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/index.html b/sample/@client/app/index.html similarity index 92% rename from sample/TypeShim.Sample.Client/@typeshim/app/index.html rename to sample/@client/app/index.html index 78f05e10..7bb81257 100644 --- a/sample/TypeShim.Sample.Client/@typeshim/app/index.html +++ b/sample/@client/app/index.html @@ -4,7 +4,7 @@ - @typeshim/app Demo + @client/app Demo diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/package.json b/sample/@client/app/package.json similarity index 71% rename from sample/TypeShim.Sample.Client/@typeshim/app/package.json rename to sample/@client/app/package.json index 9c409c9c..869f8be8 100644 --- a/sample/TypeShim.Sample.Client/@typeshim/app/package.json +++ b/sample/@client/app/package.json @@ -1,5 +1,5 @@ { - "name": "@typeshim/app", + "name": "@client/app", "version": "1.0.0", "description": "", "main": "index.js", @@ -11,8 +11,5 @@ }, "keywords": [], "author": "", - "license": "ISC", - "dependencies": { - "@typeshim/people-ui": "*" - } + "license": "ISC" } diff --git a/sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx b/sample/@client/app/src/App.tsx similarity index 89% rename from sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx rename to sample/@client/app/src/App.tsx index 83537014..bc625c5a 100644 --- a/sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx +++ b/sample/@client/app/src/App.tsx @@ -1,8 +1,8 @@ import { useState } from 'react'; import Home from './pages/Home'; import People from './pages/People'; -import { TypeShimProvider } from '@typeshim/wasm-exports'; -import { AppProvider } from '@typeshim/people-ui'; +import { TypeShimProvider } from '@client/wasm-exports'; +import { AppProvider } from './people/AppProvider'; type Page = 'home' | 'people'; @@ -28,7 +28,7 @@ function Content() { display: 'flex', gap: '1rem' }}> - @typeshim/app + @client/app