Skip to content

Transplant DataTable from tailor-data-viewer#130

Draft
IzumiSy wants to merge 13 commits intomainfrom
data-table
Draft

Transplant DataTable from tailor-data-viewer#130
IzumiSy wants to merge 13 commits intomainfrom
data-table

Conversation

@IzumiSy
Copy link
Copy Markdown
Contributor

@IzumiSy IzumiSy commented Mar 27, 2026

  • Fetch and merge latest main into data-table branch
  • Resolve conflict in packages/core/src/index.ts (keep both DataTable and CsvImporter exports)
  • Resolve conflict in examples/app-module/src/custom-module.tsx (keep both demo resources and links)
  • Regenerate pnpm-lock.yaml via pnpm install
  • Type-check, lint, test, and format all pass cleanly

@IzumiSy IzumiSy self-assigned this Mar 27, 2026
@pkg-pr-new
Copy link
Copy Markdown

pkg-pr-new bot commented Mar 27, 2026

Open in StackBlitz

npm i https://pkg.pr.new/tailor-platform/app-shell/@tailor-platform/app-shell@130
npm i https://pkg.pr.new/tailor-platform/app-shell/@tailor-platform/app-shell-sdk-plugins@130
npm i https://pkg.pr.new/tailor-platform/app-shell/@tailor-platform/app-shell-vite-plugin@130

commit: 87446d1

@IzumiSy IzumiSy force-pushed the data-table branch 2 times, most recently from 80203fd to 232c898 Compare April 3, 2026 06:35
@IzumiSy
Copy link
Copy Markdown
Contributor Author

IzumiSy commented Apr 6, 2026

@copilot fix the conflict

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 6, 2026

@copilot fix the conflict

Fixed in 87446d1. Merged origin/main into the branch and resolved the three conflicts:

  • packages/core/src/index.ts — kept both DataTable and CsvImporter exports
  • examples/app-module/src/custom-module.tsx — kept both demo resources and nav links
  • pnpm-lock.yaml — regenerated via pnpm install

All type-checks, lint, and tests pass.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants