From bdeddbb366255046b90b291fbeff33cf17508ba4 Mon Sep 17 00:00:00 2001 From: Arnoud de Vries <6420061+arnoud-dv@users.noreply.github.com> Date: Sun, 12 May 2024 12:20:09 +0200 Subject: [PATCH 1/3] tslib should be a dependency, see: https://angular.io/guide/angular-package-format#tslib --- .gitignore | 1 + package.json | 2 -- packages/angular-table/package.json | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 70343a4328..7db15c1961 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ stats.html *.log .DS_Store .cache +.idea .pnpm-store package-lock.json diff --git a/package.json b/package.json index e84e463936..fa2ecdb946 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@types/node": "^20.12.7", "jsdom": "^24.0.0", "knip": "^5.10.0", - "ng-packagr": "^17.3.0", "nx": "^18.3.4", "prettier": "^4.0.0-alpha.8", "prettier-plugin-svelte": "^3.2.3", @@ -72,7 +71,6 @@ "rollup-plugin-visualizer": "^5.12.0", "sherif": "^0.8.4", "size-limit": "^11.1.2", - "tslib": "^2.6.2", "typescript": "5.4.5", "vitest": "^1.5.2" } diff --git a/packages/angular-table/package.json b/packages/angular-table/package.json index 5dab28d5c5..0609da8173 100644 --- a/packages/angular-table/package.json +++ b/packages/angular-table/package.json @@ -48,10 +48,12 @@ "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { - "@tanstack/table-core": "workspace:*" + "@tanstack/table-core": "workspace:*", + "tslib": "^2.6.2" }, "devDependencies": { - "@angular/core": "^17.3.1" + "@angular/core": "^17.3.1", + "ng-packagr": "^17.3.0" }, "peerDependencies": { "@angular/core": ">=17" From 267b8c259fe34ae8a9b2cc5abd68fda3244330be Mon Sep 17 00:00:00 2001 From: Arnoud de Vries <6420061+arnoud-dv@users.noreply.github.com> Date: Sun, 12 May 2024 13:10:10 +0200 Subject: [PATCH 2/3] ensure angular examples are run as web container on code sandbox --- examples/angular/basic/.devcontainer/devcontainer.json | 4 ++++ .../angular/column-ordering/.devcontainer/devcontainer.json | 4 ++++ .../column-pinning-sticky/.devcontainer/devcontainer.json | 4 ++++ .../angular/column-pinning/.devcontainer/devcontainer.json | 4 ++++ .../angular/column-visibility/.devcontainer/devcontainer.json | 4 ++++ examples/angular/filters/.devcontainer/devcontainer.json | 4 ++++ examples/angular/grouping/.devcontainer/devcontainer.json | 4 ++++ .../angular/row-selection/.devcontainer/devcontainer.json | 4 ++++ examples/angular/signal-input/.devcontainer/devcontainer.json | 4 ++++ 9 files changed, 36 insertions(+) create mode 100644 examples/angular/basic/.devcontainer/devcontainer.json create mode 100644 examples/angular/column-ordering/.devcontainer/devcontainer.json create mode 100644 examples/angular/column-pinning-sticky/.devcontainer/devcontainer.json create mode 100644 examples/angular/column-pinning/.devcontainer/devcontainer.json create mode 100644 examples/angular/column-visibility/.devcontainer/devcontainer.json create mode 100644 examples/angular/filters/.devcontainer/devcontainer.json create mode 100644 examples/angular/grouping/.devcontainer/devcontainer.json create mode 100644 examples/angular/row-selection/.devcontainer/devcontainer.json create mode 100644 examples/angular/signal-input/.devcontainer/devcontainer.json diff --git a/examples/angular/basic/.devcontainer/devcontainer.json b/examples/angular/basic/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/basic/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/column-ordering/.devcontainer/devcontainer.json b/examples/angular/column-ordering/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/column-ordering/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/column-pinning-sticky/.devcontainer/devcontainer.json b/examples/angular/column-pinning-sticky/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/column-pinning-sticky/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/column-pinning/.devcontainer/devcontainer.json b/examples/angular/column-pinning/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/column-pinning/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/column-visibility/.devcontainer/devcontainer.json b/examples/angular/column-visibility/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/column-visibility/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/filters/.devcontainer/devcontainer.json b/examples/angular/filters/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/filters/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/grouping/.devcontainer/devcontainer.json b/examples/angular/grouping/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/grouping/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/row-selection/.devcontainer/devcontainer.json b/examples/angular/row-selection/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/row-selection/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} diff --git a/examples/angular/signal-input/.devcontainer/devcontainer.json b/examples/angular/signal-input/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..36f47d8762 --- /dev/null +++ b/examples/angular/signal-input/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Node.js", + "image": "mcr.microsoft.com/devcontainers/javascript-node:18" +} From 57c27269a28e22ce4a4da3aa5e5dd6e26f14b743 Mon Sep 17 00:00:00 2001 From: Kevin Vandy Date: Sun, 12 May 2024 09:42:34 -0500 Subject: [PATCH 3/3] update lock file --- pnpm-lock.yaml | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 574836b538..f95e3c9550 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,9 +62,6 @@ importers: knip: specifier: ^5.10.0 version: 5.10.0(@types/node@20.12.7)(typescript@5.4.5) - ng-packagr: - specifier: ^17.3.0 - version: 17.3.0(@angular/compiler-cli@17.3.6)(tslib@2.6.2)(typescript@5.4.5) nx: specifier: ^18.3.4 version: 18.3.4 @@ -95,9 +92,6 @@ importers: size-limit: specifier: ^11.1.2 version: 11.1.2 - tslib: - specifier: ^2.6.2 - version: 2.6.2 typescript: specifier: 5.4.5 version: 5.4.5 @@ -143,7 +137,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -213,7 +207,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -283,7 +277,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -353,7 +347,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -423,7 +417,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -499,7 +493,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -569,7 +563,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -645,7 +639,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -712,7 +706,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: ^17.3.1 - version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5) + version: 17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5) '@angular/cli': specifier: ^17.3.1 version: 17.3.6 @@ -2557,10 +2551,16 @@ importers: '@tanstack/table-core': specifier: workspace:* version: link:../table-core + tslib: + specifier: ^2.6.2 + version: 2.6.2 devDependencies: '@angular/core': specifier: ^17.3.1 version: 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + ng-packagr: + specifier: ^17.3.0 + version: 17.3.0(@angular/compiler-cli@17.3.6)(tslib@2.6.2)(typescript@5.4.5) packages/match-sorter-utils: dependencies: @@ -2666,7 +2666,7 @@ packages: - chokidar dev: true - /@angular-devkit/build-angular@17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(ng-packagr@17.3.0)(typescript@5.4.5): + /@angular-devkit/build-angular@17.3.6(@angular/compiler-cli@17.3.6)(@types/node@20.12.7)(karma@6.4.3)(typescript@5.4.5): resolution: {integrity: sha512-K4CEZvhQZUUOpmXPVoI1YBM8BARbIlqE6FZRxakmnr+YOtVTYE5s+Dr1wgja8hZIohNz6L7j167G9Aut7oPU/w==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: @@ -2747,7 +2747,6 @@ packages: magic-string: 0.30.8 mini-css-extract-plugin: 2.8.1(webpack@5.90.3) mrmime: 2.0.0 - ng-packagr: 17.3.0(@angular/compiler-cli@17.3.6)(tslib@2.6.2)(typescript@5.4.5) open: 8.4.2 ora: 5.4.1 parse5-html-rewriting-stream: 7.0.0 @@ -12362,7 +12361,7 @@ packages: injection-js: 2.4.0 jsonc-parser: 3.2.1 less: 4.2.0 - ora: 5.3.0 + ora: 5.4.1 piscina: 4.4.0 postcss: 8.4.38 rxjs: 7.8.1