From 83d392be0fffbcffafce54de7a56f61ffff35280 Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 9 Aug 2024 19:58:15 +1000
Subject: [PATCH 1/2] ci: rename integration projects for consistency
---
examples/angular/basic/tsconfig.app.json | 1 -
examples/angular/basic/tsconfig.json | 1 -
.../infinite-query-with-max-pages/tsconfig.app.json | 1 -
.../infinite-query-with-max-pages/tsconfig.json | 1 -
examples/angular/router/tsconfig.app.json | 1 -
examples/angular/router/tsconfig.json | 1 -
examples/angular/simple/tsconfig.app.json | 1 -
examples/angular/simple/tsconfig.json | 1 -
.../.gitignore | 0
.../README.md | 2 +-
.../angular.json | 10 +++++-----
.../package.json | 2 +-
.../src/app/app.component.ts | 0
.../src/app/app.config.ts | 0
.../src/assets/.gitkeep | 0
.../src/favicon.ico | Bin
.../src/index.html | 2 +-
.../src/main.ts | 0
.../src/styles.css | 0
.../tsconfig.app.json | 1 -
.../tsconfig.json | 1 -
.../{react-next => react-next-14}/.eslintrc.cjs | 0
.../{react-next => react-next-14}/.gitignore | 0
.../{react-next => react-next-14}/README.md | 0
.../app/client-component.tsx | 0
.../{react-next => react-next-14}/app/favicon.ico | Bin
.../{react-next => react-next-14}/app/layout.tsx | 0
.../{react-next => react-next-14}/app/page.tsx | 0
.../{react-next => react-next-14}/app/providers.tsx | 0
.../{react-next => react-next-14}/next.config.js | 0
.../{react-next => react-next-14}/package.json | 2 +-
.../{react-next => react-next-14}/tsconfig.json | 0
32 files changed, 9 insertions(+), 19 deletions(-)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/.gitignore (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/README.md (97%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/angular.json (89%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/package.json (93%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/app/app.component.ts (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/app/app.config.ts (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/assets/.gitkeep (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/favicon.ico (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/index.html (87%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/main.ts (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/src/styles.css (100%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/tsconfig.app.json (68%)
rename integrations/{angular-cli-standalone-17 => angular-cli-17}/tsconfig.json (91%)
rename integrations/{react-next => react-next-14}/.eslintrc.cjs (100%)
rename integrations/{react-next => react-next-14}/.gitignore (100%)
rename integrations/{react-next => react-next-14}/README.md (100%)
rename integrations/{react-next => react-next-14}/app/client-component.tsx (100%)
rename integrations/{react-next => react-next-14}/app/favicon.ico (100%)
rename integrations/{react-next => react-next-14}/app/layout.tsx (100%)
rename integrations/{react-next => react-next-14}/app/page.tsx (100%)
rename integrations/{react-next => react-next-14}/app/providers.tsx (100%)
rename integrations/{react-next => react-next-14}/next.config.js (100%)
rename integrations/{react-next => react-next-14}/package.json (93%)
rename integrations/{react-next => react-next-14}/tsconfig.json (100%)
diff --git a/examples/angular/basic/tsconfig.app.json b/examples/angular/basic/tsconfig.app.json
index 84f1f992d2..5b9d3c5ecb 100644
--- a/examples/angular/basic/tsconfig.app.json
+++ b/examples/angular/basic/tsconfig.app.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
diff --git a/examples/angular/basic/tsconfig.json b/examples/angular/basic/tsconfig.json
index fd2d87ac26..82c63d482a 100644
--- a/examples/angular/basic/tsconfig.json
+++ b/examples/angular/basic/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
diff --git a/examples/angular/infinite-query-with-max-pages/tsconfig.app.json b/examples/angular/infinite-query-with-max-pages/tsconfig.app.json
index 84f1f992d2..5b9d3c5ecb 100644
--- a/examples/angular/infinite-query-with-max-pages/tsconfig.app.json
+++ b/examples/angular/infinite-query-with-max-pages/tsconfig.app.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
diff --git a/examples/angular/infinite-query-with-max-pages/tsconfig.json b/examples/angular/infinite-query-with-max-pages/tsconfig.json
index fd2d87ac26..82c63d482a 100644
--- a/examples/angular/infinite-query-with-max-pages/tsconfig.json
+++ b/examples/angular/infinite-query-with-max-pages/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
diff --git a/examples/angular/router/tsconfig.app.json b/examples/angular/router/tsconfig.app.json
index 84f1f992d2..5b9d3c5ecb 100644
--- a/examples/angular/router/tsconfig.app.json
+++ b/examples/angular/router/tsconfig.app.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
diff --git a/examples/angular/router/tsconfig.json b/examples/angular/router/tsconfig.json
index fd2d87ac26..82c63d482a 100644
--- a/examples/angular/router/tsconfig.json
+++ b/examples/angular/router/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
diff --git a/examples/angular/simple/tsconfig.app.json b/examples/angular/simple/tsconfig.app.json
index 84f1f992d2..5b9d3c5ecb 100644
--- a/examples/angular/simple/tsconfig.app.json
+++ b/examples/angular/simple/tsconfig.app.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
diff --git a/examples/angular/simple/tsconfig.json b/examples/angular/simple/tsconfig.json
index fd2d87ac26..82c63d482a 100644
--- a/examples/angular/simple/tsconfig.json
+++ b/examples/angular/simple/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
diff --git a/integrations/angular-cli-standalone-17/.gitignore b/integrations/angular-cli-17/.gitignore
similarity index 100%
rename from integrations/angular-cli-standalone-17/.gitignore
rename to integrations/angular-cli-17/.gitignore
diff --git a/integrations/angular-cli-standalone-17/README.md b/integrations/angular-cli-17/README.md
similarity index 97%
rename from integrations/angular-cli-standalone-17/README.md
rename to integrations/angular-cli-17/README.md
index 349ff2d006..0d54414bcc 100644
--- a/integrations/angular-cli-standalone-17/README.md
+++ b/integrations/angular-cli-17/README.md
@@ -1,4 +1,4 @@
-# AngularCliStandalone17
+# AngularCli17
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 17.0.0.
diff --git a/integrations/angular-cli-standalone-17/angular.json b/integrations/angular-cli-17/angular.json
similarity index 89%
rename from integrations/angular-cli-standalone-17/angular.json
rename to integrations/angular-cli-17/angular.json
index 31de28bdec..efe01cbab0 100644
--- a/integrations/angular-cli-standalone-17/angular.json
+++ b/integrations/angular-cli-17/angular.json
@@ -7,7 +7,7 @@
},
"newProjectRoot": "projects",
"projects": {
- "angular-cli-standalone-17": {
+ "angular-cli-17": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
@@ -44,7 +44,7 @@
"build": {
"builder": "@angular-devkit/build-angular:application",
"options": {
- "outputPath": "dist/angular-cli-standalone-17",
+ "outputPath": "dist/angular-cli-17",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
@@ -81,10 +81,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
- "buildTarget": "angular-cli-standalone-17:build:production"
+ "buildTarget": "angular-cli-17:build:production"
},
"development": {
- "buildTarget": "angular-cli-standalone-17:build:development"
+ "buildTarget": "angular-cli-17:build:development"
}
},
"defaultConfiguration": "development"
@@ -92,7 +92,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
- "buildTarget": "angular-cli-standalone-17:build"
+ "buildTarget": "angular-cli-17:build"
}
}
}
diff --git a/integrations/angular-cli-standalone-17/package.json b/integrations/angular-cli-17/package.json
similarity index 93%
rename from integrations/angular-cli-standalone-17/package.json
rename to integrations/angular-cli-17/package.json
index eb9a699779..f848d58120 100644
--- a/integrations/angular-cli-standalone-17/package.json
+++ b/integrations/angular-cli-17/package.json
@@ -1,5 +1,5 @@
{
- "name": "angular-cli-standalone-17",
+ "name": "angular-cli-17",
"private": true,
"scripts": {
"build": "ng build"
diff --git a/integrations/angular-cli-standalone-17/src/app/app.component.ts b/integrations/angular-cli-17/src/app/app.component.ts
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/app/app.component.ts
rename to integrations/angular-cli-17/src/app/app.component.ts
diff --git a/integrations/angular-cli-standalone-17/src/app/app.config.ts b/integrations/angular-cli-17/src/app/app.config.ts
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/app/app.config.ts
rename to integrations/angular-cli-17/src/app/app.config.ts
diff --git a/integrations/angular-cli-standalone-17/src/assets/.gitkeep b/integrations/angular-cli-17/src/assets/.gitkeep
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/assets/.gitkeep
rename to integrations/angular-cli-17/src/assets/.gitkeep
diff --git a/integrations/angular-cli-standalone-17/src/favicon.ico b/integrations/angular-cli-17/src/favicon.ico
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/favicon.ico
rename to integrations/angular-cli-17/src/favicon.ico
diff --git a/integrations/angular-cli-standalone-17/src/index.html b/integrations/angular-cli-17/src/index.html
similarity index 87%
rename from integrations/angular-cli-standalone-17/src/index.html
rename to integrations/angular-cli-17/src/index.html
index dd7dad0daa..c760f9e78d 100644
--- a/integrations/angular-cli-standalone-17/src/index.html
+++ b/integrations/angular-cli-17/src/index.html
@@ -2,7 +2,7 @@
- AngularCliStandalone17
+ AngularCli17
diff --git a/integrations/angular-cli-standalone-17/src/main.ts b/integrations/angular-cli-17/src/main.ts
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/main.ts
rename to integrations/angular-cli-17/src/main.ts
diff --git a/integrations/angular-cli-standalone-17/src/styles.css b/integrations/angular-cli-17/src/styles.css
similarity index 100%
rename from integrations/angular-cli-standalone-17/src/styles.css
rename to integrations/angular-cli-17/src/styles.css
diff --git a/integrations/angular-cli-standalone-17/tsconfig.app.json b/integrations/angular-cli-17/tsconfig.app.json
similarity index 68%
rename from integrations/angular-cli-standalone-17/tsconfig.app.json
rename to integrations/angular-cli-17/tsconfig.app.json
index 84f1f992d2..5b9d3c5ecb 100644
--- a/integrations/angular-cli-standalone-17/tsconfig.app.json
+++ b/integrations/angular-cli-17/tsconfig.app.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
diff --git a/integrations/angular-cli-standalone-17/tsconfig.json b/integrations/angular-cli-17/tsconfig.json
similarity index 91%
rename from integrations/angular-cli-standalone-17/tsconfig.json
rename to integrations/angular-cli-17/tsconfig.json
index d276020ea7..8d7a99b810 100644
--- a/integrations/angular-cli-standalone-17/tsconfig.json
+++ b/integrations/angular-cli-17/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
diff --git a/integrations/react-next/.eslintrc.cjs b/integrations/react-next-14/.eslintrc.cjs
similarity index 100%
rename from integrations/react-next/.eslintrc.cjs
rename to integrations/react-next-14/.eslintrc.cjs
diff --git a/integrations/react-next/.gitignore b/integrations/react-next-14/.gitignore
similarity index 100%
rename from integrations/react-next/.gitignore
rename to integrations/react-next-14/.gitignore
diff --git a/integrations/react-next/README.md b/integrations/react-next-14/README.md
similarity index 100%
rename from integrations/react-next/README.md
rename to integrations/react-next-14/README.md
diff --git a/integrations/react-next/app/client-component.tsx b/integrations/react-next-14/app/client-component.tsx
similarity index 100%
rename from integrations/react-next/app/client-component.tsx
rename to integrations/react-next-14/app/client-component.tsx
diff --git a/integrations/react-next/app/favicon.ico b/integrations/react-next-14/app/favicon.ico
similarity index 100%
rename from integrations/react-next/app/favicon.ico
rename to integrations/react-next-14/app/favicon.ico
diff --git a/integrations/react-next/app/layout.tsx b/integrations/react-next-14/app/layout.tsx
similarity index 100%
rename from integrations/react-next/app/layout.tsx
rename to integrations/react-next-14/app/layout.tsx
diff --git a/integrations/react-next/app/page.tsx b/integrations/react-next-14/app/page.tsx
similarity index 100%
rename from integrations/react-next/app/page.tsx
rename to integrations/react-next-14/app/page.tsx
diff --git a/integrations/react-next/app/providers.tsx b/integrations/react-next-14/app/providers.tsx
similarity index 100%
rename from integrations/react-next/app/providers.tsx
rename to integrations/react-next-14/app/providers.tsx
diff --git a/integrations/react-next/next.config.js b/integrations/react-next-14/next.config.js
similarity index 100%
rename from integrations/react-next/next.config.js
rename to integrations/react-next-14/next.config.js
diff --git a/integrations/react-next/package.json b/integrations/react-next-14/package.json
similarity index 93%
rename from integrations/react-next/package.json
rename to integrations/react-next-14/package.json
index 1b8ccbf7f3..80faffa942 100644
--- a/integrations/react-next/package.json
+++ b/integrations/react-next-14/package.json
@@ -1,5 +1,5 @@
{
- "name": "react-next",
+ "name": "react-next-14",
"private": true,
"scripts": {
"build": "next build"
diff --git a/integrations/react-next/tsconfig.json b/integrations/react-next-14/tsconfig.json
similarity index 100%
rename from integrations/react-next/tsconfig.json
rename to integrations/react-next-14/tsconfig.json
From 9b09ad427e90f4742abd0bdb5b0c9c196f8322a6 Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 9 Aug 2024 20:05:16 +1000
Subject: [PATCH 2/2] Fix lockfile
---
pnpm-lock.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8815772eab..2bbd9cbc03 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1616,7 +1616,7 @@ importers:
specifier: ^5.3.5
version: 5.3.5(@types/node@22.0.2)(less@4.2.0)(sass@1.77.8)(terser@5.31.3)
- integrations/angular-cli-standalone-17:
+ integrations/angular-cli-17:
dependencies:
'@angular/common':
specifier: ^17.3.12
@@ -1700,7 +1700,7 @@ importers:
specifier: ^7.0.3
version: 7.0.3
- integrations/react-next:
+ integrations/react-next-14:
dependencies:
'@tanstack/react-query':
specifier: workspace:*