@analogjs/vite-plugin-angular 2.0.0-alpha.2 → 2.0.0-alpha.20

package/README.md

@@ -46,6 +46,8 @@ export default defineConfig({
 });
 ```
 
+> The `angular` plugin should be listed **first** in the plugins array.
+
 ## Setting up the TypeScript config
 
 The integration needs a `tsconfig.app.json` at the root of the project for compilation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/vite-plugin-angular",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.20",
   "description": "Vite Plugin for Angular",
   "type": "module",
   "keywords": [
@@ -24,8 +24,8 @@
     "url": "https://github.com/sponsors/brandonroberts"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@angular/build": "^18.0.0 || ^19.0.0"
+    "@angular-devkit/build-angular": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
+    "@angular/build": "^18.0.0 || ^19.0.0 || ^20.0.0"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/build-angular": {
@@ -39,11 +39,13 @@
     "ts-morph": "^21.0.0",
     "vfile": "^6.0.3"
   },
+  "builders": "./src/lib/tools/builders.json",
   "ng-update": {
     "packageGroup": [
       "@analogjs/platform",
       "@analogjs/content",
       "@analogjs/router",
+      "@analogjs/storybook-angular",
       "@analogjs/vite-plugin-angular",
       "@analogjs/vite-plugin-nitro",
       "@analogjs/vitest-angular"
@@ -54,7 +56,9 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./src/index.d.ts",
-      "import": "./src/index.js"
+      "import": "./src/index.js",
+      "require": "./src/index.js",
+      "default": "./src/index.js"
     },
     "./esbuild": "./esbuild.js",
     "./setup-vitest": "./setup-vitest.js"

package/src/index.d.ts

@@ -1,5 +1,3 @@
 import { angular } from './lib/angular-vite-plugin.js';
 export { PluginOptions } from './lib/angular-vite-plugin.js';
-export { compileAnalogFile } from './lib/authoring/analog.js';
-export { MarkdownTemplateTransform, defaultMarkdownTemplateTransforms, } from './lib/authoring/markdown-transform.js';
 export default angular;

package/src/index.js

@@ -1,5 +1,3 @@
 import { angular } from './lib/angular-vite-plugin.js';
-export { compileAnalogFile } from './lib/authoring/analog.js';
-export { defaultMarkdownTemplateTransforms, } from './lib/authoring/markdown-transform.js';
 export default angular;
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/vite-plugin-angular/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAEL,iCAAiC,GAClC,MAAM,uCAAuC,CAAC;AAE/C,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/vite-plugin-angular/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAGvD,eAAe,OAAO,CAAC"}

package/src/lib/angular-pending-tasks.plugin.js

@@ -1,4 +1,4 @@
-import { angularMajor, angularPatch } from './utils/devkit.js';
+import { angularMajor, angularMinor, angularPatch } from './utils/devkit.js';
 /**
  * This plugin is a workaround for the ɵPendingTasks symbol being renamed
  * to ɵPendingTasksInternal in Angular v19.0.4. The symbol is renamed to support previous versions of
@@ -10,7 +10,8 @@ export function pendingTasksPlugin() {
     return {
         name: 'analogjs-pending-tasks-plugin',
         transform(code, id) {
-            if (Number(`${angularMajor}.${angularPatch}`) < 19.4 &&
+            const padVersion = (version) => String(version).padStart(2, '0');
+            if (Number(`${angularMajor}${padVersion(angularMinor)}${padVersion(angularPatch)}`) < 190004 &&
                 id.includes('analogjs-content.mjs')) {
                 return {
                     code: code.replace('ɵPendingTasksInternal', 'ɵPendingTasks'),

package/src/lib/angular-pending-tasks.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"angular-pending-tasks.plugin.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-angular/src/lib/angular-pending-tasks.plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO;QACL,IAAI,EAAE,+BAA+B;QACrC,SAAS,CAAC,IAAI,EAAE,EAAE;YAChB,IACE,MAAM,CAAC,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC,GAAG,IAAI;gBAChD,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EACnC,CAAC;gBACD,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,eAAe,CAAC;iBAC7D,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"angular-pending-tasks.plugin.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-angular/src/lib/angular-pending-tasks.plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE7E;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO;QACL,IAAI,EAAE,+BAA+B;QACrC,SAAS,CAAC,IAAI,EAAE,EAAE;YAChB,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAEzE,IACE,MAAM,CACJ,GAAG,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,EAAE,CACxE,GAAG,MAAM;gBACV,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EACnC,CAAC;gBACD,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,eAAe,CAAC;iBAC7D,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/lib/angular-storybook-plugin.d.ts

@@ -1,4 +1,4 @@
-export declare function angularStorybookPlugin(): {
+export declare function angularStorybookPlugin(workspaceRoot: string): {
     name: string;
-    transform(code: string): string | undefined;
+    transform(code: string, id: string): string | undefined;
 };

package/src/lib/angular-storybook-plugin.js

@@ -1,12 +1,19 @@
-export function angularStorybookPlugin() {
+import fs from 'node:fs';
+import { resolve } from 'node:path';
+export function angularStorybookPlugin(workspaceRoot) {
+    const esmPath = resolve(workspaceRoot, 'node_modules/@storybook/angular/dist/client/index.mjs');
+    const hasESM = fs.existsSync(esmPath);
     return {
         name: 'analogjs-storybook-import-plugin',
-        transform(code) {
+        transform(code, id) {
+            if (id.includes('node_modules')) {
+                return;
+            }
             if (code.includes('"@storybook/angular"')) {
-                return code.replace(/\"@storybook\/angular\"/g, '"@storybook/angular/dist/client"');
+                return code.replace(/\"@storybook\/angular\"/g, `"@storybook/angular/dist/client/index.${hasESM ? 'm' : ''}js"`);
             }
             if (code.includes("'@storybook/angular'")) {
-                return code.replace(/\'@storybook\/angular\'/g, "'@storybook/angular/dist/client'");
+                return code.replace(/\'@storybook\/angular\'/g, `'@storybook/angular/dist/client/index.${hasESM ? 'm' : ''}js'`);
             }
             return;
         },

package/src/lib/angular-storybook-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"angular-storybook-plugin.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-angular/src/lib/angular-storybook-plugin.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL,IAAI,EAAE,kCAAkC;QACxC,SAAS,CAAC,IAAY;YACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,OAAO,CACjB,0BAA0B,EAC1B,kCAAkC,CACnC,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,OAAO,CACjB,0BAA0B,EAC1B,kCAAkC,CACnC,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"angular-storybook-plugin.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-angular/src/lib/angular-storybook-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,UAAU,sBAAsB,CAAC,aAAqB;IAC1D,MAAM,OAAO,GAAG,OAAO,CACrB,aAAa,EACb,uDAAuD,CACxD,CAAC;IACF,MAAM,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO;QACL,IAAI,EAAE,kCAAkC;QACxC,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,IAAI,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAChC,OAAO;YACT,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,OAAO,CACjB,0BAA0B,EAC1B,yCAAyC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAChE,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,OAAO,CACjB,0BAA0B,EAC1B,yCAAyC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAChE,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/lib/angular-vite-plugin.d.ts

@@ -1,7 +1,6 @@
 import { NgtscProgram } from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import { Plugin } from 'vite';
-import { MarkdownTemplateTransform } from './authoring/markdown-transform.js';
 export interface PluginOptions {
     tsconfig?: string;
     workspaceRoot?: string;
@@ -13,15 +12,6 @@ export interface PluginOptions {
          */
         tsTransformers?: ts.CustomTransformers;
     };
-    experimental?: {
-        /**
-         * Enable experimental support for Analog file extension
-         */
-        supportAnalogFormat?: boolean | {
-            include: string[];
-        };
-        markdownTemplateTransforms?: MarkdownTemplateTransform[];
-    };
     supportedBrowsers?: string[];
     transformFilter?: (code: string, id: string) => boolean;
     /**
@@ -30,17 +20,22 @@ export interface PluginOptions {
     include?: string[];
     additionalContentDirs?: string[];
     liveReload?: boolean;
+    disableTypeChecking?: boolean;
 }
-interface EmitFileResult {
-    content?: string;
-    map?: string;
-    dependencies: readonly string[];
-    hash?: Uint8Array;
-    errors: (string | ts.DiagnosticMessageChain)[];
-    warnings: (string | ts.DiagnosticMessageChain)[];
-    hmrUpdateCode?: string | null;
-}
-type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
 export declare function angular(options?: PluginOptions): Plugin[];
-export declare function createFileEmitter(program: ts.BuilderProgram, transformers?: ts.CustomTransformers, onAfterEmit?: (sourceFile: ts.SourceFile) => void, angularCompiler?: NgtscProgram['compiler'], liveReload?: boolean): FileEmitter;
-export {};
+export declare function getFileMetadata(program: ts.BuilderProgram, angularCompiler?: NgtscProgram['compiler'], liveReload?: boolean, disableTypeChecking?: boolean): (file: string) => {
+    errors?: undefined;
+    warnings?: undefined;
+    hmrUpdateCode?: undefined;
+    hmrEligible?: undefined;
+} | {
+    errors: string[];
+    warnings: (string | ts.DiagnosticMessageChain)[];
+    hmrUpdateCode: string | null | undefined;
+    hmrEligible: boolean;
+};
+/**
+ * Checks for vitest run from the command line
+ * @returns boolean
+ */
+export declare function isTestWatchMode(args?: string[]): boolean;