@analogjs/platform 0.2.0-beta.9 → 0.2.0-rc.1

package/src/lib/nx-plugin/src/generators/app/files/welcome-components/tailwind/src/app/pages/analog-welcome.component.ts__template__

@@ -0,0 +1,76 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: '<%= fileName %>-analog-welcome',
+  standalone: true,
+  host: {
+    class:
+      'flex min-h-screen flex-col text-zinc-900 bg-zinc-50 px-4 pt-8 pb-32',
+  },
+  template: `
+    <main class="flex-1 mx-auto">
+        <section class="space-y-6 pb-8 pt-6 md:pb-12 md:pt-10 lg:py-32">
+        <div
+          class="flex max-w-[64rem] flex-col items-center gap-4 text-center"
+        >
+          <img class="h-12 w-12" src="https://analogjs.org/img/logos/analog-logo.svg" alt="AnalogJs logo. Two red triangles and a white analog wave in front"/>
+          <a
+            class="rounded-2xl bg-zinc-200 px-4 py-1.5 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            target="_blank"
+            href="https://twitter.com/analogjs"
+            >Follow along on Twitter</a
+          >
+          <h1
+            class="font-heading font-medium text-3xl sm:text-5xl md:text-6xl lg:text-7xl"
+          >
+            <span class="text-[#DD0031]">Analog.</span> The fullstack Angular
+            meta-framework
+          </h1>
+          <p
+            class="max-w-[42rem] leading-normal text-muted-foreground sm:text-xl sm:leading-8"
+          >
+            Analog is for building applications and websites with Angular.
+            <br />Powered by Vite.
+          </p>
+          <div class="space-x-4">
+            <a
+              class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background bg-zinc-950 text-zinc-50 hover:bg-zinc-950/90 h-11 px-8 rounded-md"
+              href="https://analogjs.org"
+              >Read the docs</a
+            ><a
+              target="_blank"
+              rel="noreferrer"
+              class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background border border-input hover:bg-zinc-100 hover:text-zinc-950 h-11 px-8 rounded-md"
+              href="https://github.com/analogjs/analog"
+              >Star on GitHub</a
+            >
+          </div>
+        </div>
+      </section>
+      <section id="counter-demo" class="container py-8 md:py-12 lg:py-24">
+        <div
+          class="mx-auto flex max-w-[58rem] flex-col items-center justify-center gap-4 text-center"
+        >
+          <h2 class="text-[#DD0031] font-medium text-3xl leading-[1.1]">Counter</h2>
+          <p
+            class="max-w-[85%] leading-normal text-muted-foreground sm:text-lg sm:leading-7"
+          >
+            This is a simple interactive counter. Powered by Angular.
+          </p>
+          <button
+            (click)="increment()"
+             class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background border border-input hover:bg-zinc-100 hover:text-zinc-950 h-11 px-8 rounded-md"
+          >
+            Count: <span class="ml-1 font-mono">{{ count }}</span>
+          </button>
+        </div>
+      </section>
+    </main>
+  `,
+})
+export class AnalogWelcomeComponent {
+  public count = 0;
+  public increment() {
+    this.count++;
+  }
+}

package/src/lib/nx-plugin/src/generators/app/files/welcome-components/tailwind-trpc/src/app/pages/analog-welcome.component.ts__template__

@@ -0,0 +1,162 @@
+import { Component } from '@angular/core';
+import { AsyncPipe, DatePipe, NgFor, NgIf } from '@angular/common';
+import { FormsModule, NgForm } from '@angular/forms';
+import { shareReplay, Subject, switchMap, take } from 'rxjs';
+import { waitFor } from '@analogjs/trpc';
+import { injectTrpcClient } from '../../trpc-client';
+import { Note } from '../../note';
+
+@Component({
+  selector: '<%= fileName %>-analog-welcome',
+  standalone: true,
+  imports: [AsyncPipe, FormsModule, NgFor, DatePipe, NgIf],
+  host: {
+    class:
+      'flex min-h-screen flex-col text-zinc-900 bg-zinc-50 px-4 pt-8 pb-32',
+  },
+  template: `
+    <main class="flex-1 mx-auto">
+      <section class="space-y-6 pb-8 pt-6 md:pb-12 md:pt-10 lg:py-32">
+        <div
+          class="flex max-w-[64rem] flex-col items-center gap-4 text-center"
+        >
+          <img class="h-12 w-12" src="https://analogjs.org/img/logos/analog-logo.svg" alt="AnalogJs logo. Two red triangles and a white analog wave in front"/>
+          <a
+            class="rounded-2xl bg-zinc-200 px-4 py-1.5 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            target="_blank"
+            href="https://twitter.com/analogjs"
+            >Follow along on Twitter</a
+          >
+          <h1
+            class="font-heading font-medium text-3xl sm:text-5xl md:text-6xl lg:text-7xl"
+          >
+            <span class="text-[#DD0031]">Analog.</span> The fullstack Angular
+            meta-framework
+          </h1>
+          <p
+            class="max-w-[42rem] leading-normal text-muted-foreground sm:text-xl sm:leading-8"
+          >
+            Analog is for building applications and websites with Angular.
+            <br />Powered by Vite.
+          </p>
+          <div class="space-x-4">
+            <a
+              class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background bg-zinc-950 text-zinc-50 hover:bg-zinc-950/90 h-11 px-8 rounded-md"
+              href="https://analogjs.org"
+              >Read the docs</a
+            ><a
+              target="_blank"
+              rel="noreferrer"
+              class="inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background border border-input hover:bg-zinc-100 hover:text-zinc-950 h-11 px-8 rounded-md"
+              href="https://github.com/analogjs/analog"
+              >Star on GitHub</a
+            >
+          </div>
+        </div>
+      </section>
+      <section id="trpc-demo" class="py-8 md:py-12 lg:py-24">
+        <div
+          class="mx-auto flex max-w-[58rem] flex-col items-center justify-center gap-4 text-center"
+        >
+          <h2 class="text-[#DD0031] font-medium text-3xl leading-[1.1]">
+            Leave a note
+          </h2>
+          <p
+            class="max-w-[85%] leading-normal sm:text-lg sm:leading-7"
+          >
+            This is an example of how to you can use tRPC to superpower you
+            client server interaction.
+          </p>
+        </div>
+        <form
+          class="mt-8 pb-2 flex items-center"
+          #f="ngForm"
+          (ngSubmit)="addNote(f)"
+        >
+          <label class="sr-only" for="newNote"> Note </label>
+          <input
+            required
+            autocomplete="off"
+            name="newNote"
+            [(ngModel)]="newNote"
+            class="w-full inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background border border-input hover:text-zinc-950 h-11 px-2 rounded-md"
+          />
+          <button
+            class="ml-2 inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background border border-input hover:bg-zinc-100 hover:text-zinc-950 h-11 px-8 rounded-md"
+          >
+            +
+          </button>
+        </form>
+        <div class="mt-4" *ngIf="notes$ | async as notes; else loading">
+          <div
+            class="note mb-4 p-4 font-normal border border-input rounded-md"
+            *ngFor="let note of notes; trackBy: noteTrackBy; let i = index"
+          >
+            <div class="flex items-center justify-between">
+              <p class="text-sm text-zinc-400">{{ note.createdAt | date }}</p>
+              <button
+                [attr.data-testid]="'removeNoteAtIndexBtn' + i"
+                class="text-xs inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none ring-offset-background hover:bg-zinc-100 hover:text-zinc-950 h-6 w-6 rounded-md"
+                (click)="removeNote(note.id)"
+              >
+                x
+              </button>
+            </div>
+            <p class="mb-4">{{ note.note }}</p>
+          </div>
+
+          <div
+            class="no-notes text-center rounded-xl p-20"
+            *ngIf="notes.length === 0"
+          >
+            <h3 class="text-xl font-medium">No notes yet!</h3>
+            <p class="text-zinc-400">
+              Add a new one and see them appear here...
+            </p>
+          </div>
+        </div>
+        <ng-template #loading>
+          <p class="text-center mt-4">Loading...</p>
+        </ng-template>
+      </section>
+    </main>
+  `,
+})
+export class AnalogWelcomeComponent {
+  private _trpc = injectTrpcClient();
+  public triggerRefresh$ = new Subject<void>();
+  public notes$ = this.triggerRefresh$.pipe(
+    switchMap(() => this._trpc.note.list.query()),
+    shareReplay(1)
+  );
+  public newNote = '';
+
+  constructor() {
+    void waitFor(this.notes$);
+    this.triggerRefresh$.next();
+  }
+
+  public noteTrackBy = (index: number, note: Note) => {
+    return note.id;
+  };
+
+  public addNote(form: NgForm) {
+    if (!form.valid) {
+      form.form.markAllAsTouched();
+      return;
+    }
+    this._trpc.note.create
+      .mutate({ note: this.newNote })
+      .pipe(take(1))
+      .subscribe(() => this.triggerRefresh$.next());
+    this.newNote = '';
+    form.form.reset();
+  }
+
+  public removeNote(id: number) {
+    this._trpc.note.remove
+      .mutate({ id })
+      .pipe(take(1))
+      .subscribe(() => this.triggerRefresh$.next());
+  }
+}

package/src/lib/nx-plugin/src/generators/app/generator.js

@@ -11,11 +11,13 @@ const initialize_analog_workspace_1 = require("./lib/initialize-analog-workspace
 const add_files_1 = require("./lib/add-files");
 const add_tailwind_config_1 = require("./lib/add-tailwind-config");
 const add_trpc_1 = require("./lib/add-trpc");
-const add_index_pages_1 = require("./lib/add-index-pages");
+const add_home_page_1 = require("./lib/add-home-page");
+const minimum_supported_versions_1 = require("./versions/minimum-supported-versions");
+const add_eslint_1 = require("./lib/add-eslint");
 function normalizeOptions(tree, options, nxVersion) {
     var _a, _b;
     const appsDir = (0, devkit_1.getWorkspaceLayout)(tree).appsDir;
-    const allNames = (0, devkit_1.names)(options.name);
+    const allNames = (0, devkit_1.names)(options.analogAppName);
     const projectDirectory = allNames.fileName;
     const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
     const projectRoot = `${appsDir}/${projectDirectory}`;
@@ -42,11 +44,18 @@ function appGenerator(tree, options) {
         if (!nxVersion) {
             throw new Error((0, devkit_1.stripIndents) `Nx must be installed to execute this plugin`);
         }
+        if ((0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
+            throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
+        }
+        if ((0, minimum_supported_versions_1.belowMinimumSupportedNxtRPCVersion)(nxVersion) && options.addTRPC) {
+            console.warn('Nx v16.1.0 or newer is required to use tRPC with Analog. Skipping installation.');
+            options.addTRPC = false;
+        }
         const normalizedOptions = normalizeOptions(tree, options, nxVersion);
         const angularVersion = yield (0, initialize_analog_workspace_1.initializeAngularWorkspace)(tree, nxVersion, normalizedOptions);
         const majorNxVersion = (0, semver_1.major)(nxVersion);
-        const majorAngularVersion = (0, semver_1.major)(angularVersion);
-        yield (0, add_analog_dependencies_1.addAnalogDependencies)(tree, majorAngularVersion, majorNxVersion);
+        const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
+        yield (0, add_analog_dependencies_1.addAnalogDependencies)(tree, nxVersion, angularVersion);
         const { projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace, } = normalizedOptions;
         (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace);
         (0, add_files_1.addFiles)(tree, normalizedOptions, majorAngularVersion);
@@ -54,9 +63,10 @@ function appGenerator(tree, options) {
             yield (0, add_tailwind_config_1.addTailwindConfig)(tree, normalizedOptions.projectRoot, normalizedOptions.projectName, majorNxVersion);
         }
         if (normalizedOptions.addTRPC) {
-            yield (0, add_trpc_1.addTRPC)(tree, normalizedOptions.projectRoot, majorAngularVersion, normalizedOptions);
+            yield (0, add_trpc_1.addTrpc)(tree, normalizedOptions.projectRoot, nxVersion, normalizedOptions);
         }
-        (0, add_index_pages_1.addIndexPages)(tree, normalizedOptions);
+        (0, add_home_page_1.addHomePage)(tree, normalizedOptions);
+        yield (0, add_eslint_1.addEslint)(tree, majorNxVersion, normalizedOptions);
         if (!normalizedOptions.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

package/src/lib/nx-plugin/src/generators/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-dependencies.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from '@nrwl/devkit';
-export declare function addAnalogDependencies(tree: Tree, majorAngularVersion: number, majorNxVersion: number): Promise<void>;
+import { Tree } from '@nx/devkit';
+export declare function addAnalogDependencies(tree: Tree, nxVersion: string, angularVersion: string): Promise<void>;

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-dependencies.js

@@ -2,34 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAnalogDependencies = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../versions");
-function addAnalogDependencies(tree, majorAngularVersion, majorNxVersion) {
+const devkit_1 = require("@nx/devkit");
+const dependencies_1 = require("../versions/dependencies");
+const dev_dependencies_1 = require("../versions/dev-dependencies");
+function addAnalogDependencies(tree, nxVersion, angularVersion) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const dependencies = {
-            '@analogjs/content': majorAngularVersion === 15
-                ? versions_1.V15_ANALOG_JS_CONTENT
-                : versions_1.V16_ANALOG_JS_CONTENT,
-            '@analogjs/router': majorAngularVersion === 15 ? versions_1.V15_ANALOG_JS_ROUTER : versions_1.V16_ANALOG_JS_ROUTER,
-            '@angular/platform-server': majorAngularVersion === 15
-                ? versions_1.V15_ANGULAR_PLATFORM_SERVER
-                : versions_1.V16_ANGULAR_PLATFORM_SERVER,
-            'front-matter': majorAngularVersion === 15 ? versions_1.V15_FRONT_MATTER : versions_1.V16_FRONT_MATTER,
-            marked: majorAngularVersion === 15 ? versions_1.V15_MARKED : versions_1.V16_MARKED,
-            prismjs: majorAngularVersion === 15 ? versions_1.V15_PRISMJS : versions_1.V16_PRISMJS,
-        };
-        const nxViteDependency = majorNxVersion === 15
-            ? {
-                '@nrwl/vite': majorAngularVersion === 15 ? versions_1.V15_NRWL_VITE : versions_1.V16_NX_VITE,
-            }
-            : {
-                '@nx/vite': majorAngularVersion === 15 ? versions_1.V15_NRWL_VITE : versions_1.V16_NX_VITE,
-            };
-        const devDependencies = Object.assign(Object.assign({ '@analogjs/platform': majorAngularVersion === 15
-                ? versions_1.V15_ANALOG_JS_PLATFORM
-                : versions_1.V16_ANALOG_JS_PLATFORM }, nxViteDependency), { jsdom: majorAngularVersion === 15 ? versions_1.V15_JSDOM : versions_1.V16_JSDOM, typescript: majorAngularVersion === 15 ? versions_1.V15_TYPESCRIPT : versions_1.V16_TYPESCRIPT, vite: majorAngularVersion === 15 ? versions_1.V15_VITE : versions_1.V16_VITE, 'vite-tsconfig-paths': majorAngularVersion === 15
-                ? versions_1.V15_VITE_TSCONFIG_PATHS
-                : versions_1.V16_VITE_TSCONFIG_PATHS, vitest: majorAngularVersion === 15 ? versions_1.V15_VITEST : versions_1.V16_VITEST });
+        const dependencies = (0, dependencies_1.getAnalogDependencies)(nxVersion, angularVersion);
+        const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(nxVersion);
+        // ensure previous @analogjs/platform version is removed, whether installed
+        // as a dependency or devDependency, before adding analog dependencies.
+        (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@analogjs/platform'], ['@analogjs/platform']);
         (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
     });
 }

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAClE,0CA2BqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,mBAA2B,EAC3B,cAAsB;;QAEtB,MAAM,YAAY,GAAG;YACnB,mBAAmB,EACjB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,gCAAqB;gBACvB,CAAC,CAAC,gCAAqB;YAC3B,kBAAkB,EAChB,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,+BAAoB,CAAC,CAAC,CAAC,+BAAoB;YAC1E,0BAA0B,EACxB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,sCAA2B;gBAC7B,CAAC,CAAC,sCAA2B;YACjC,cAAc,EACZ,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,2BAAgB,CAAC,CAAC,CAAC,2BAAgB;YAClE,MAAM,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAU,CAAC,CAAC,CAAC,qBAAU;YAC5D,OAAO,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,sBAAW,CAAC,CAAC,CAAC,sBAAW;SAChE,CAAC;QAEF,MAAM,gBAAgB,GACpB,cAAc,KAAK,EAAE;YACnB,CAAC,CAAC;gBACE,YAAY,EACV,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,wBAAa,CAAC,CAAC,CAAC,sBAAW;aAC3D;YACH,CAAC,CAAC;gBACE,UAAU,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,wBAAa,CAAC,CAAC,CAAC,sBAAW;aACrE,CAAC;QACR,MAAM,eAAe,iCACnB,oBAAoB,EAClB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,iCAAsB;gBACxB,CAAC,CAAC,iCAAsB,IACzB,gBAAgB,KACnB,KAAK,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,oBAAS,CAAC,CAAC,CAAC,oBAAS,EACzD,UAAU,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,yBAAc,CAAC,CAAC,CAAC,yBAAc,EACxE,IAAI,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,mBAAQ,CAAC,CAAC,CAAC,mBAAQ,EACtD,qBAAqB,EACnB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,kCAAuB;gBACzB,CAAC,CAAC,kCAAuB,EAC7B,MAAM,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAU,CAAC,CAAC,CAAC,qBAAU,GAC7D,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAhDD,sDAgDC"}
+{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,2DAAiE;AACjE,mEAAwE;AAExE,SAAsB,qBAAqB,CACzC,IAAU,EACV,SAAiB,EACjB,cAAsB;;QAEtB,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,SAAS,CAAC,CAAC;QAC5D,2EAA2E;QAC3E,uEAAuE;QACvE,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,oBAAoB,CAAC,EACtB,CAAC,oBAAoB,CAAC,CACvB,CAAC;QACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAfD,sDAeC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js

@@ -55,16 +55,6 @@ function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name
                     browserTarget: `${projectName}:build`,
                 },
             },
-            lint: {
-                executor: `${nxPackageNamespace}/linter:eslint`,
-                outputs: ['{options.outputFile}'],
-                options: {
-                    lintFilePatterns: [
-                        `${appsDir}/${projectName}/**/*.ts`,
-                        `${appsDir}/${projectName}/**/*.html`,
-                    ],
-                },
-            },
             test: {
                 executor: `${nxPackageNamespace}/vite:test`,
                 outputs: [`${appsDir}/${projectName}/coverage`],

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-analog-project-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-project-config.ts"],"names":[],"mappings":";;;AACA,uCAAqD;AAErD,SAAgB,sBAAsB,CACpC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,UAAoB,EACpB,IAAY,EACZ,OAAe,EACf,kBAA0B;IAE1B,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,WAAW,MAAM;QAChC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,aAAa;gBAC5C,OAAO,EAAE;oBACP,sBAAsB;oBACtB,QAAQ,OAAO,IAAI,WAAW,SAAS;oBACvC,QAAQ,OAAO,IAAI,WAAW,MAAM;oBACpC,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACxC;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,GAAG,OAAO,IAAI,WAAW,cAAc;oBAC7C,UAAU,EAAE,GAAG,OAAO,IAAI,WAAW,iBAAiB;oBACtD,UAAU,EAAE,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACpD;gBACD,oBAAoB,EAAE,YAAY;gBAClC,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,IAAI,EAAE,aAAa;qBACpB;oBACD,UAAU,EAAE;wBACV,SAAS,EAAE,KAAK;wBAChB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,kBAAkB;gBACjD,oBAAoB,EAAE,aAAa;gBACnC,OAAO,EAAE;oBACP,WAAW,EAAE,GAAG,WAAW,QAAQ;oBACnC,IAAI,EAAE,IAAI;iBACX;gBACD,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,WAAW,EAAE,GAAG,WAAW,oBAAoB;wBAC/C,GAAG,EAAE,IAAI;qBACV;oBACD,UAAU,EAAE;wBACV,WAAW,EAAE,GAAG,WAAW,mBAAmB;qBAC/C;iBACF;aACF;YACD,cAAc,EAAE;gBACd,QAAQ,EAAE,4CAA4C;gBACtD,OAAO,EAAE;oBACP,aAAa,EAAE,GAAG,WAAW,QAAQ;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,GAAG,kBAAkB,gBAAgB;gBAC/C,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,gBAAgB,EAAE;wBAChB,GAAG,OAAO,IAAI,WAAW,UAAU;wBACnC,GAAG,OAAO,IAAI,WAAW,YAAY;qBACtC;iBACF;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,GAAG,kBAAkB,YAAY;gBAC3C,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,WAAW,WAAW,CAAC;aAChD;SACF;QACD,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;AAC5D,CAAC;AAhFD,wDAgFC"}
+{"version":3,"file":"add-analog-project-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-project-config.ts"],"names":[],"mappings":";;;AACA,uCAAqD;AAErD,SAAgB,sBAAsB,CACpC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,UAAoB,EACpB,IAAY,EACZ,OAAe,EACf,kBAA0B;IAE1B,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,WAAW,MAAM;QAChC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,aAAa;gBAC5C,OAAO,EAAE;oBACP,sBAAsB;oBACtB,QAAQ,OAAO,IAAI,WAAW,SAAS;oBACvC,QAAQ,OAAO,IAAI,WAAW,MAAM;oBACpC,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACxC;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,GAAG,OAAO,IAAI,WAAW,cAAc;oBAC7C,UAAU,EAAE,GAAG,OAAO,IAAI,WAAW,iBAAiB;oBACtD,UAAU,EAAE,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACpD;gBACD,oBAAoB,EAAE,YAAY;gBAClC,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,IAAI,EAAE,aAAa;qBACpB;oBACD,UAAU,EAAE;wBACV,SAAS,EAAE,KAAK;wBAChB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,kBAAkB;gBACjD,oBAAoB,EAAE,aAAa;gBACnC,OAAO,EAAE;oBACP,WAAW,EAAE,GAAG,WAAW,QAAQ;oBACnC,IAAI,EAAE,IAAI;iBACX;gBACD,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,WAAW,EAAE,GAAG,WAAW,oBAAoB;wBAC/C,GAAG,EAAE,IAAI;qBACV;oBACD,UAAU,EAAE;wBACV,WAAW,EAAE,GAAG,WAAW,mBAAmB;qBAC/C;iBACF;aACF;YACD,cAAc,EAAE;gBACd,QAAQ,EAAE,4CAA4C;gBACtD,OAAO,EAAE;oBACP,aAAa,EAAE,GAAG,WAAW,QAAQ;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,GAAG,kBAAkB,YAAY;gBAC3C,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,WAAW,WAAW,CAAC;aAChD;SACF;QACD,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;AAC5D,CAAC;AAtED,wDAsEC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedOptions } from '../generator';
+export declare function addEslint(tree: Tree, majorNxVersion: number, options: NormalizedOptions): Promise<void>;

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addEslint = void 0;
+const tslib_1 = require("tslib");
+function addEslint(tree, majorNxVersion, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const linterOptions = {
+            // needed to not depend on linter package
+            linter: 'eslint',
+            project: options.projectName,
+            eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,html}`],
+            skipFormat: true,
+        };
+        if (majorNxVersion === 16) {
+            yield (yield Promise.resolve().then(() => require(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            '@nx/linter'))).lintProjectGenerator(tree, linterOptions);
+        }
+        else {
+            yield (yield Promise.resolve().then(() => require(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            '@nrwl/linter'))).lintProjectGenerator(tree, linterOptions);
+        }
+    });
+}
+exports.addEslint = addEslint;
+//# sourceMappingURL=add-eslint.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-eslint.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-eslint.ts"],"names":[],"mappings":";;;;AAGA,SAAsB,SAAS,CAC7B,IAAU,EACV,cAAsB,EACtB,OAA0B;;QAE1B,MAAM,aAAa,GAAG;YACpB,yCAAyC;YACzC,MAAM,EAAE,QAAe;YACvB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,iBAAiB,CAAC;YAC7D,UAAU,EAAE,IAAI;SACjB,CAAC;QACF,IAAI,cAAc,KAAK,EAAE,EAAE;YACzB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,YAAY,EACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,cAAc,EACf,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC7C;IACH,CAAC;CAAA;AA7BD,8BA6BC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-files.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 import { NormalizedOptions } from '../generator';
 export declare function addFiles(tree: Tree, options: NormalizedOptions, majorAngularVersion: number): void;

package/src/lib/nx-plugin/src/generators/app/lib/add-files.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFiles = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const path = require("path");
 function addFiles(tree, options, majorAngularVersion) {
     const templateOptions = Object.assign(Object.assign({}, options), { template: '' });

package/src/lib/nx-plugin/src/generators/app/lib/add-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,6BAA6B;AAG7B,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CACP,SAAS,EACT,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,mBAAmB,CAC3C,EACD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AApBD,4BAoBC"}
+{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CACP,SAAS,EACT,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,mBAAmB,CAC3C,EACD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AApBD,4BAoBC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-home-page.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedOptions } from '../generator';
+export declare function addHomePage(tree: Tree, options: NormalizedOptions): void;

package/src/lib/nx-plugin/src/generators/app/lib/add-home-page.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addHomePage = void 0;
+const devkit_1 = require("@nx/devkit");
+const path = require("path");
+function addHomePage(tree, options) {
+    const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'index-page'), options.projectRoot, templateOptions);
+    let pageDirectory = options.addTailwind ? 'tailwind' : 'css';
+    if (options.addTRPC) {
+        pageDirectory += '-trpc';
+    }
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'welcome-components', pageDirectory), options.projectRoot, templateOptions);
+}
+exports.addHomePage = addHomePage;
+//# sourceMappingURL=add-home-page.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-home-page.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-home-page.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-home-page.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,EACjD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,aAAa,IAAI,OAAO,CAAC;KAC1B;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,aAAa,CAAC,EACxE,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAxBD,kCAwBC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 export declare function addTailwindConfig(tree: Tree, projectRoot: string, projectName: string, majorNxVersion: number): Promise<void>;

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTailwindConfig = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const path = require("path");
 function addTailwindConfig(tree, projectRoot, projectName, majorNxVersion) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -15,7 +15,10 @@ function addTailwindConfig(tree, projectRoot, projectName, majorNxVersion) {
             });
         }
         else {
-            yield (yield Promise.resolve().then(() => require('@nrwl/angular/generators'))).setupTailwindGenerator(tree, { project: projectName });
+            yield (yield Promise.resolve().then(() => require(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            '@nrwl/angular/generators'))).setupTailwindGenerator(tree, { project: projectName });
         }
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'tailwind'), projectRoot, { template: '' });
     });

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,6BAA6B;AAE7B,SAAsB,iBAAiB,CACrC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,cAAsB;;QAEtB,IAAI,cAAc,KAAK,EAAE,EAAE;YACzB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,wBAAwB,EACzB,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE;gBAC7B,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CACJ,2CAAa,0BAA0B,EAAC,CACzC,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAC1D;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAC/C,WAAW,EACX,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjB,CAAC;IACJ,CAAC;CAAA;AA5BD,8CA4BC"}
+{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;;AAAA,uCAAiD;AACjD,6BAA6B;AAE7B,SAAsB,iBAAiB,CACrC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,cAAsB;;QAEtB,IAAI,cAAc,KAAK,EAAE,EAAE;YACzB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,wBAAwB,EACzB,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE;gBAC7B,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,0BAA0B,EAC3B,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAC1D;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAC/C,WAAW,EACX,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjB,CAAC;IACJ,CAAC;CAAA;AAhCD,8CAgCC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-trpc.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 import { NormalizedOptions } from '../generator';
-export declare function addTRPC(tree: Tree, projectRoot: string, majorAngularVersion: number, options: NormalizedOptions): Promise<void>;
+export declare function addTrpc(tree: Tree, projectRoot: string, nxVersion: string, options: NormalizedOptions): Promise<void>;

package/src/lib/nx-plugin/src/generators/app/lib/add-trpc.js

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTRPC = void 0;
+exports.addTrpc = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const path = require("path");
-const versions_1 = require("../versions");
-function addTRPC(tree, projectRoot, majorAngularVersion, options) {
+const trpc_dependencies_1 = require("../versions/trpc-dependencies");
+function addTrpc(tree, projectRoot, nxVersion, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@analogjs/trpc': majorAngularVersion === 15 ? versions_1.V15_ANALOG_JS_TRPC : versions_1.V16_ANALOG_JS_TRPC,
-            '@trpc/client': majorAngularVersion === 15 ? versions_1.V15_TRPC_CLIENT : versions_1.V16_TRPC_CLIENT,
-            '@trpc/server': majorAngularVersion === 15 ? versions_1.V15_TRPC_SERVER : versions_1.V16_TRPC_SERVER,
-            superjson: majorAngularVersion === 15 ? versions_1.V15_SUPERJSON : versions_1.V16_SUPERJSON,
-            'isomorphic-fetch': majorAngularVersion === 15
-                ? versions_1.V15_ISOMORPHIC_FETCH
-                : versions_1.V15_ISOMORPHIC_FETCH,
-            zod: majorAngularVersion === 15 ? versions_1.V15_ZOD : versions_1.V16_ZOD,
-        }, {});
+        const dependencies = (0, trpc_dependencies_1.getTrpcDependencies)(nxVersion);
+        (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, {});
         const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'trpc'), projectRoot, templateOptions);
     });
 }
-exports.addTRPC = addTRPC;
+exports.addTrpc = addTrpc;
 //# sourceMappingURL=add-trpc.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-trpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-trpc.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-trpc.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,6BAA6B;AAC7B,0CAYqB;AAGrB,SAAsB,OAAO,CAC3B,IAAU,EACV,WAAmB,EACnB,mBAA2B,EAC3B,OAA0B;;QAE1B,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,gBAAgB,EACd,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,6BAAkB,CAAC,CAAC,CAAC,6BAAkB;YACtE,cAAc,EACZ,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,0BAAe,CAAC,CAAC,CAAC,0BAAe;YAChE,cAAc,EACZ,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,0BAAe,CAAC,CAAC,CAAC,0BAAe;YAChE,SAAS,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,wBAAa,CAAC,CAAC,CAAC,wBAAa;YACrE,kBAAkB,EAChB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,+BAAoB;gBACtB,CAAC,CAAC,+BAAoB;YAC1B,GAAG,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,kBAAO,CAAC,CAAC,CAAC,kBAAO;SACpD,EACD,EAAE,CACH,CAAC;QAEF,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EAC3C,WAAW,EACX,eAAe,CAChB,CAAC;IACJ,CAAC;CAAA;AAnCD,0BAmCC"}
+{"version":3,"file":"add-trpc.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-trpc.ts"],"names":[],"mappings":";;;;AAAA,uCAA+E;AAC/E,6BAA6B;AAE7B,qEAAoE;AAEpE,SAAsB,OAAO,CAC3B,IAAU,EACV,WAAmB,EACnB,SAAiB,EACjB,OAA0B;;QAE1B,MAAM,YAAY,GAAG,IAAA,uCAAmB,EAAC,SAAS,CAAC,CAAC;QACpD,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAErD,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EAC3C,WAAW,EACX,eAAe,CAChB,CAAC;IACJ,CAAC;CAAA;AAnBD,0BAmBC"}