npm - @analogjs/platform - Versions diffs - 2.0.0-alpha.11 → 2.0.0-alpha.13 - Mend

@analogjs/platform 2.0.0-alpha.11 → 2.0.0-alpha.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap ADDED Viewed

@@ -0,0 +1,149 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+exports[`preset generator > should match index.html 1`] = `
+"<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>my-app</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+  </head>
+  <body>
+    <app-root></app-root>
+    <script type="module" src="/my-app/src/main.ts"></script>
+  </body>
+</html>
+"
+`;
+exports[`preset generator > should match project.json 1`] = `
+"{
+  "name": "my-app",
+  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "prefix": "app",
+  "sourceRoot": "my-app/src",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@analogjs/platform:vite",
+      "options": {
+        "configFile": "my-app/vite.config.ts",
+        "main": "my-app/src/main.ts",
+        "outputPath": "dist/my-app/client",
+        "tsConfig": "my-app/tsconfig.app.json"
+      },
+      "defaultConfiguration": "production",
+      "configurations": {
+        "development": {
+          "mode": "development"
+        },
+        "production": {
+          "sourcemap": false,
+          "mode": "production"
+        }
+      },
+      "outputs": ["{workspaceRoot}/dist/apps/my-app"]
+    },
+    "serve": {
+      "executor": "@analogjs/platform:vite-dev-server",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "my-app:build",
+        "port": 4200
+      },
+      "configurations": {
+        "development": {
+          "buildTarget": "my-app:build:development",
+          "hmr": true
+        },
+        "production": {
+          "buildTarget": "my-app:build:production"
+        }
+      }
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "buildTarget": "my-app:build"
+      }
+    },
+    "test": {
+      "executor": "@analogjs/vitest-angular:test",
+      "options": {
+        "config": "vite.config.ts"
+      }
+    },
+    "serve-static": {
+      "continuous": true,
+      "executor": "@nx/web:file-server",
+      "options": {
+        "buildTarget": "my-app:build",
+        "port": 4200,
+        "staticFilePath": "dist/my-app/browser",
+        "spa": true
+      }
+    }
+  }
+}
+"
+`;
+exports[`preset generator > should match src/test-setup.ts 1`] = `
+"import '@analogjs/vitest-angular/setup-zone';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+import { getTestBed } from '@angular/core/testing';
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);
+"
+`;
+exports[`preset generator > should match vite.config.ts 1`] = `
+"/// <reference types="vitest" />
+import analog from '@analogjs/platform';
+import { defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
+import tailwindcss from '@tailwindcss/vite';
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+  return {
+    root: __dirname,
+    cacheDir: \`../node_modules/.vite\`,
+    build: {
+      outDir: '../dist/./my-app/client',
+      reportCompressedSize: true,
+      target: ['es2020'],
+    },
+    server: {
+      fs: {
+        allow: ['.'],
+      },
+    },
+    plugins: [tailwindcss(), analog(), nxViteTsPaths()],
+    test: {
+      globals: true,
+      environment: 'jsdom',
+      setupFiles: ['src/test-setup.ts'],
+      include: ['**/*.spec.ts'],
+      reporters: ['default'],
+    },
+    define: {
+      'import.meta.vitest': mode !== 'production',
+    },
+  };
+});
+"
+`;

package/src/lib/nx-plugin/src/generators/preset/generator.js CHANGED Viewed

@@ -34,7 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
 async function default_1(tree, options) {
+    (0, devkit_1.ensurePackage)('@nx/angular', devkit_1.NX_VERSION);
+    (0, devkit_1.ensurePackage)('@angular-devkit/build-angular', 'latest');
     return await Promise.resolve().then(() => __importStar(require('../app/generator'))).then(({ appGenerator }) => appGenerator(tree, options));
 }
 //# sourceMappingURL=generator.js.map

package/src/lib/nx-plugin/src/generators/preset/generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,~~4BAIC~~;~~AAJc~~,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,OAAO,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4BAOC;AAVD,uCAA6D;AAG9C,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,IAAA,sBAAa,EAAC,aAAa,EAAE,mBAAU,CAAC,CAAC;IACzC,IAAA,sBAAa,EAAC,+BAA+B,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC"}

package/src/lib/nx-plugin/src/generators/setup-vitest/files/src/test-setup.ts__template__ CHANGED Viewed

@@ -1,3 +1,18 @@
+<% if (majorAngularVersion > 19) { %>
+import '@angular/compiler';
+import '@analogjs/vitest-angular/setup-zone';
+import {
+  BrowserTestingModule,
+  platformBrowserTesting,
+} from '@angular/platform-browser/testing';
+import { getTestBed } from '@angular/core/testing';
+getTestBed().initTestEnvironment(
+  BrowserTestingModule,
+  platformBrowserTesting()
+);
+<% } else { %>
 import '@analogjs/vitest-angular/setup-zone';
 import {
@@ -10,3 +25,4 @@ getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting()
 );
+<% } %>

package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js CHANGED Viewed

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupVitestGenerator = setupVitestGenerator;
 const devkit_1 = require("@nx/devkit");
 const node_path_1 = require("node:path");
+const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
 const update_test_target_1 = require("./lib/update-test-target");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
-function addFiles(tree, options) {
+function addFiles(tree, options, majorAngularVersion) {
     const projects = (0, devkit_1.getProjects)(tree);
     const isNx = tree.exists('/nx.json');
     const projectConfig = projects.get(options.project);
     const templateOptions = {
         ...options,
+        majorAngularVersion,
         addNxPaths: isNx,
         template: '',
     };
@@ -20,11 +22,12 @@ function addFiles(tree, options) {
 }
 async function setupVitestGenerator(tree, options) {
     const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
+    const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
     const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
     (0, add_analog_dependencies_1.addAnalogDependencies)(tree, angularVersion, nxVersion);
     (0, update_tsconfig_1.updateTsConfig)(tree, options);
     (0, update_test_target_1.updateTestTarget)(tree, options);
-    addFiles(tree, options);
+    addFiles(tree, options, majorAngularVersion);
     await (0, devkit_1.formatFiles)(tree);
     return () => {
         (0, devkit_1.installPackagesTask)(tree);

package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;~~AAmCA~~,~~oDAkBC~~;~~AArDD~~,uCAMoB;AACpB,yCAAiC;~~AAEjC~~,6DAAuE;AACvE,2EAAsE;AACtE,iEAA4D;AAC5D,2DAAuD;AAGvD,SAAS,QAAQ,~~CAAC~~,IAAU,~~EAAE~~,OAAmC;~~IAC/D~~,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IACvD,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;~~IAExB~~,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
1	+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;AAyCA,oDAoBC;AA7DD,uCAMoB;AACpB,yCAAiC;AACjC,mCAAuC;AAEvC,6DAAuE;AACvE,2EAAsE;AACtE,iEAA4D;AAC5D,2DAAuD;AAGvD,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,mBAAmB;QACnB,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IACvD,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
-export declare const V19_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.11";
-export declare const V19_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.11";
+export declare const V19_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.13";
+export declare const V19_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.13";
 export declare const V19_X_MARKED = "^5.0.2";
 export declare const V19_X_MARKED_GFM_HEADING_ID = "^3.0.4";
 export declare const V19_X_MARKED_HIGHLIGHT = "^2.0.1";
 export declare const V19_X_MARKED_MANGLE = "^1.1.7";
 export declare const V19_X_PRISMJS = "^1.29.0";
-export declare const V19_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.11";
-export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.11";
-export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.11";
+export declare const V19_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.13";
+export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.13";
+export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.13";
 export declare const V19_X_NX_ANGULAR = "^20.0.0";
 export declare const V19_X_NX_VITE = "^20.0.0";
 export declare const V19_X_JSDOM = "^22.0.0";

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js CHANGED Viewed

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
 // V19_X
-exports.V19_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.11';
-exports.V19_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.11';
+exports.V19_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.13';
+exports.V19_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.13';
 exports.V19_X_MARKED = '^5.0.2';
 exports.V19_X_MARKED_GFM_HEADING_ID = '^3.0.4';
 exports.V19_X_MARKED_HIGHLIGHT = '^2.0.1';
 exports.V19_X_MARKED_MANGLE = '^1.1.7';
 exports.V19_X_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V19_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.11';
-exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.11';
-exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.11';
+exports.V19_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.13';
+exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.13';
+exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.13';
 exports.V19_X_NX_ANGULAR = '^20.0.0';
 exports.V19_X_NX_VITE = '^20.0.0';
 exports.V19_X_JSDOM = '^22.0.0';

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/.eslintrc.json__template__ DELETED Viewed

@@ -1,36 +0,0 @@
-{
-  "extends": ["<%= offsetFromRoot %>.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "extends": [
-        "plugin:<%= nxPackageNamespace %>/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "<%= className %>",
-            "style": "camelCase"
-          }
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "<%= fileName %>",
-            "style": "kebab-case"
-          }
-        ]
-      }
-    },
-    {
-      "files": ["*.html"],
-      "extends": ["plugin:<%= nxPackageNamespace %>/angular-template"],
-      "rules": {}
-    }
-  ]
-}