Merge pull request #1118 from analogjs/beta

chore: release 1.4.0
analogjs · May 27, 2024 · bc106c5 · bc106c5
2 parents 04f3758 + e09987d
commit bc106c5
Show file tree

Hide file tree

Showing 119 changed files with 3,906 additions and 2,445 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -953,6 +953,43 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "BoogieMonsta",
+      "name": "BoogMon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73052877?v=4",
+      "profile": "https://boogiemonsta.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AmGarera",
+      "name": "Anthony Garera",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6021169?v=4",
+      "profile": "https://www.anthonygarera.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "stewones",
+      "name": "Stewan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/719763?v=4",
+      "profile": "http://stewan.io",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "NateRadebaugh",
+      "name": "Nate Radebaugh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/130445?v=4",
+      "profile": "https://naterad.com",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -24,12 +24,18 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": "*.json",

diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@@ -26,6 +26,7 @@ body:
         - create-analog
         - vite-plugin-angular
         - vite-plugin-nitro
+        - vitest-angular
         - router
         - content
         - platform

diff --git a/.github/ISSUE_TEMPLATE/02-feature-request.yml b/.github/ISSUE_TEMPLATE/02-feature-request.yml
@@ -17,6 +17,7 @@ body:
         - create-analog
         - vite-plugin-angular
         - vite-plugin-nitro
+        - vitest-angular
         - router
         - content
         - platform

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,6 +25,7 @@ What kind of change does this PR introduce?
 
 - [ ] vite-plugin-angular
 - [ ] vite-plugin-nitro
+- [ ] vitest-angular
 - [ ] astro-angular
 - [ ] create-analog
 - [ ] router

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - beta
+      - main
 
 permissions:
   contents: read # for checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,69 @@
+# [1.4.0-beta.11](https://github.com/analogjs/analog/compare/v1.4.0-beta.10...v1.4.0-beta.11) (2024-05-27)
+
+### Bug Fixes
+
+- **platform:** add Nx deps as peerDependencies ([#1117](https://github.com/analogjs/analog/issues/1117)) ([b255370](https://github.com/analogjs/analog/commit/b255370182e8ff8bc1792113c8583a824c42ad8b))
+
+# [1.4.0-beta.10](https://github.com/analogjs/analog/compare/v1.4.0-beta.9...v1.4.0-beta.10) (2024-05-27)
+
+### Bug Fixes
+
+- **vitest-angular:** update peerDependencies for @angular-devkit/architect version pattern range ([#1113](https://github.com/analogjs/analog/issues/1113)) ([1765d48](https://github.com/analogjs/analog/commit/1765d481bceb7815665bd4461109607d52551100))
+
+# [1.4.0-beta.9](https://github.com/analogjs/analog/compare/v1.4.0-beta.8...v1.4.0-beta.9) (2024-05-26)
+
+### Bug Fixes
+
+- **content:** getContentFile stream should be finished ([#1110](https://github.com/analogjs/analog/issues/1110)) ([e0ce74f](https://github.com/analogjs/analog/commit/e0ce74fd0513122ba416ac4be74bd4e55d3d572d))
+
+# [1.4.0-beta.8](https://github.com/analogjs/analog/compare/v1.4.0-beta.7...v1.4.0-beta.8) (2024-05-26)
+
+### Bug Fixes
+
+- **nx-plugin:** update typescript dependency ([#1109](https://github.com/analogjs/analog/issues/1109)) ([4b9a51e](https://github.com/analogjs/analog/commit/4b9a51e8eaf450e5c91020bb93b37c104a54bf68))
+
+# [1.4.0-beta.7](https://github.com/analogjs/analog/compare/v1.4.0-beta.6...v1.4.0-beta.7) (2024-05-24)
+
+### Bug Fixes
+
+- **vitest-angular:** rename testing setup file and add to build ([#1106](https://github.com/analogjs/analog/issues/1106)) ([9ef4f3b](https://github.com/analogjs/analog/commit/9ef4f3b5bb224b600e6ddc8cc7ef689f676cff12))
+
+# [1.4.0-beta.6](https://github.com/analogjs/analog/compare/v1.4.0-beta.5...v1.4.0-beta.6) (2024-05-24)
+
+### Features
+
+- introduce vitest-angular package ([#1105](https://github.com/analogjs/analog/issues/1105)) ([4d73542](https://github.com/analogjs/analog/commit/4d735423a7cffb523fca2d5866c08cb4d1594bdb))
+
+# [1.4.0-beta.5](https://github.com/analogjs/analog/compare/v1.4.0-beta.4...v1.4.0-beta.5) (2024-05-23)
+
+### Bug Fixes
+
+- adjust peer dependency ranges ([1bc4e59](https://github.com/analogjs/analog/commit/1bc4e59e3cc850a4cf6bf8956ebd38ff70265e4b))
+
+# [1.4.0-beta.4](https://github.com/analogjs/analog/compare/v1.4.0-beta.3...v1.4.0-beta.4) (2024-05-23)
+
+### Features
+
+- update deps and apps to Angular v18 release ([#1101](https://github.com/analogjs/analog/issues/1101)) ([ef9bbee](https://github.com/analogjs/analog/commit/ef9bbeee6aeb73edcb66d94569fffd5443273ca5))
+
+# [1.4.0-beta.3](https://github.com/analogjs/analog/compare/v1.4.0-beta.2...v1.4.0-beta.3) (2024-05-21)
+
+### Bug Fixes
+
+- **vite-plugin-angular:** add @analogjs/router to vitest inline deps ([#1098](https://github.com/analogjs/analog/issues/1098)) ([69f4efa](https://github.com/analogjs/analog/commit/69f4efa0f6785d51518d1c087c515f9220a69ca6))
+
+# [1.4.0-beta.2](https://github.com/analogjs/analog/compare/v1.4.0-beta.1...v1.4.0-beta.2) (2024-05-17)
+
+### Bug Fixes
+
+- **create-analog:** add fixes for v18 template ([#1095](https://github.com/analogjs/analog/issues/1095)) ([759a341](https://github.com/analogjs/analog/commit/759a341d84e3d0c2cf4b9f4c6d27e6a4ea91445b))
+
+# [1.4.0-beta.1](https://github.com/analogjs/analog/compare/v1.3.1...v1.4.0-beta.1) (2024-05-17)
+
+### Features
+
+- **create-analog:** simplify prompts add template for upcoming Angular v18 release ([#1094](https://github.com/analogjs/analog/issues/1094)) ([29c42a1](https://github.com/analogjs/analog/commit/29c42a133a0602667b3282620ef7ad1365262476))
+
 ## [1.3.1](https://github.com/analogjs/analog/compare/v1.3.1-beta.9...v1.3.1) (2024-05-14)
 
 ## [1.3.1-beta.9](https://github.com/analogjs/analog/compare/v1.3.1-beta.8...v1.3.1-beta.9) (2024-05-14)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <!-- prettier-ignore-start -->
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-100-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-104-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <!-- prettier-ignore-end -->
 
@@ -18,7 +18,8 @@ Visit the docs at [https://analogjs.org](https://analogjs.org)
 
 ## Features
 
-- Supports Vite/Vitest/Playwright
+- Powered by Vite
+- Supports Vitest/Storybook
 - Server and deployment integrations powered by [Nitro](https://nitro.unjs.io)
 - File-based routing
 - Server-side data fetching
@@ -230,6 +231,10 @@ Thanks goes to these wonderful people for contributing to Analog ([emoji key](ht
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://byeonggi.vercel.app/"><img src="https://avatars.githubusercontent.com/u/11059706?v=4?s=100" width="100px;" alt="ByeongGi"/><br /><sub><b>ByeongGi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=ByeongGi" title="Documentation">📖</a> <a href="#translation-ByeongGi" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://marmicode.io"><img src="https://avatars.githubusercontent.com/u/2674658?v=4?s=100" width="100px;" alt="Younes Jaaidi"/><br /><sub><b>Younes Jaaidi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://boogiemonsta.com/"><img src="https://avatars.githubusercontent.com/u/73052877?v=4?s=100" width="100px;" alt="BoogMon"/><br /><sub><b>BoogMon</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=BoogieMonsta" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.anthonygarera.com"><img src="https://avatars.githubusercontent.com/u/6021169?v=4?s=100" width="100px;" alt="Anthony Garera"/><br /><sub><b>Anthony Garera</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=AmGarera" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://stewan.io"><img src="https://avatars.githubusercontent.com/u/719763?v=4?s=100" width="100px;" alt="Stewan"/><br /><sub><b>Stewan</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=stewones" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=stewones" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://naterad.com"><img src="https://avatars.githubusercontent.com/u/130445?v=4?s=100" width="100px;" alt="Nate Radebaugh"/><br /><sub><b>Nate Radebaugh</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=NateRadebaugh" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/apps/docs-app/docs/contributors.mdx b/apps/docs-app/docs/contributors.mdx
@@ -188,6 +188,10 @@ Andres is a software engineer for HeroDevs, Angular and Firebase GDE.
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://byeonggi.vercel.app/"><img src="https://avatars.githubusercontent.com/u/11059706?v=4?s=100" width="100px;" alt="ByeongGi"/><br /><sub><b>ByeongGi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=ByeongGi" title="Documentation">📖</a> <a href="#translation-ByeongGi" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://marmicode.io"><img src="https://avatars.githubusercontent.com/u/2674658?v=4?s=100" width="100px;" alt="Younes Jaaidi"/><br /><sub><b>Younes Jaaidi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://boogiemonsta.com/"><img src="https://avatars.githubusercontent.com/u/73052877?v=4?s=100" width="100px;" alt="BoogMon"/><br /><sub><b>BoogMon</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=BoogieMonsta" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.anthonygarera.com"><img src="https://avatars.githubusercontent.com/u/6021169?v=4?s=100" width="100px;" alt="Anthony Garera"/><br /><sub><b>Anthony Garera</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=AmGarera" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://stewan.io"><img src="https://avatars.githubusercontent.com/u/719763?v=4?s=100" width="100px;" alt="Stewan"/><br /><sub><b>Stewan</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=stewones" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=stewones" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://naterad.com"><img src="https://avatars.githubusercontent.com/u/130445?v=4?s=100" width="100px;" alt="Nate Radebaugh"/><br /><sub><b>Nate Radebaugh</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=NateRadebaugh" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/apps/docs-app/docs/features/routing/content.md b/apps/docs-app/docs/features/routing/content.md
@@ -161,6 +161,62 @@ export default class BlogPostComponent {
 }
 ```
 
+### Using A Resolver For Metatags
+
+In your route configuration, you can use the `RouteMeta` object to resolve meta tags for a route. This is done by assigning the `postMetaResolver` function to the `meta` property.
+
+Below is an example of using a `postMetaResolver` function that fetches the meta tags for a post. This function returns an array of meta tags.
+
+```ts
+export const postMetaResolver: ResolveFn<MetaTag[]> = (route) => {
+  const postAttributes = injectActivePostAttributes(route);
+
+  return [
+    {
+      name: 'description',
+      content: postAttributes.description,
+    },
+    {
+      name: 'author',
+      content: 'Analog Team',
+    },
+    {
+      property: 'og:title',
+      content: postAttributes.title,
+    },
+    {
+      property: 'og:description',
+      content: postAttributes.description,
+    },
+    {
+      property: 'og:image',
+      content: postAttributes.coverImage,
+    },
+  ];
+};
+```
+
+The meta tags can be done asynchronously also. Assign the `postMetaResolver` function to the `meta` property.
+
+```ts
+export const routeMeta: RouteMeta = {
+  title: postTitleResolver,
+  meta: postMetaResolver,
+};
+```
+
+The resolved meta tags can also be accessed in the component using the `ActivatedRoute` service.
+
+```ts
+export default class BlogPostComponent {
+  readonly route = inject(ActivatedRoute);
+  readonly metaTags$ = this.route.data.pipe(map(data => data['meta']));
+
+  // In the template
+  <my-component [metaTags]="metaTags$ | async"></my-component>
+}
+```
+
 ### Enabling support for Mermaid
 
 Analog's markdown component supports [Mermaid](https://mermaid.js.org/). To enable support by the `MarkdownComponent` define a dynamic import for `loadMermaid` in `withMarkdownRenderer()`.

diff --git a/apps/docs-app/docs/features/testing/vitest.md b/apps/docs-app/docs/features/testing/vitest.md
@@ -15,23 +15,23 @@ First, install the `@analogjs/platform` package:
   <TabItem value="npm">
 
 ```shell
-npm install @analogjs/platform nx --save-dev
+npm install @analogjs/platform --save-dev
 ```
 
   </TabItem>
 
   <TabItem label="Yarn" value="yarn">
 
 ```shell
-yarn add @analogjs/platform nx --dev
+yarn add @analogjs/platform --dev
 ```
 
   </TabItem>
 
   <TabItem value="pnpm">
 
 ```shell
-pnpm install -w @analogjs/platform nx
+pnpm install -w @analogjs/platform
 ```
 
   </TabItem>

diff --git a/apps/docs-app/docs/getting-started.md b/apps/docs-app/docs/getting-started.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 Analog requires the following Node and Angular versions:
 
-- Node 16.17.0, or v18.13.0 and higher is recommended
+- Node v18.13.0 and higher is recommended
 - Angular v15 or higher
 
 ## Creating a New Application
@@ -115,3 +115,7 @@ The server for the API/SSR build artifacts is located in the `dist/analog/server
 
   </TabItem>
 </Tabs>
+
+## Migrating an Existing Application
+
+You can also migrate an existing Angular application to Analog. See the [migration guide](/docs/guides/migrating) for migration steps.
diff --git a/apps/docs-app/docs/guides/migrating.md b/apps/docs-app/docs/guides/migrating.md
@@ -15,23 +15,23 @@ First, install the `@analogjs/platform` package:
   <TabItem value="npm">
 
 ```shell
-npm install @analogjs/platform nx@18 --save-dev
+npm install @analogjs/platform --save-dev
 ```
 
   </TabItem>
 
   <TabItem label="Yarn" value="yarn">
 
 ```shell
-yarn add @analogjs/platform nx@18 --dev
+yarn add @analogjs/platform --dev
 ```
 
   </TabItem>
 
   <TabItem value="pnpm">
 
 ```shell
-pnpm install -w @analogjs/platform nx@18
+pnpm install -w @analogjs/platform
 ```
 
   </TabItem>

diff --git a/apps/docs-app/i18n/es/docusaurus-plugin-content-docs/current/contributors.mdx b/apps/docs-app/i18n/es/docusaurus-plugin-content-docs/current/contributors.mdx
@@ -188,6 +188,10 @@ Andres es un ingeniero en software para HeroDevs, GDE en Angular y Firebase.
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://byeonggi.vercel.app/"><img src="https://avatars.githubusercontent.com/u/11059706?v=4?s=100" width="100px;" alt="ByeongGi"/><br /><sub><b>ByeongGi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=ByeongGi" title="Documentation">📖</a> <a href="#translation-ByeongGi" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://marmicode.io"><img src="https://avatars.githubusercontent.com/u/2674658?v=4?s=100" width="100px;" alt="Younes Jaaidi"/><br /><sub><b>Younes Jaaidi</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=yjaaidi" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://boogiemonsta.com/"><img src="https://avatars.githubusercontent.com/u/73052877?v=4?s=100" width="100px;" alt="BoogMon"/><br /><sub><b>BoogMon</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=BoogieMonsta" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.anthonygarera.com"><img src="https://avatars.githubusercontent.com/u/6021169?v=4?s=100" width="100px;" alt="Anthony Garera"/><br /><sub><b>Anthony Garera</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=AmGarera" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://stewan.io"><img src="https://avatars.githubusercontent.com/u/719763?v=4?s=100" width="100px;" alt="Stewan"/><br /><sub><b>Stewan</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=stewones" title="Code">💻</a> <a href="https://github.com/analogjs/analog/commits?author=stewones" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://naterad.com"><img src="https://avatars.githubusercontent.com/u/130445?v=4?s=100" width="100px;" alt="Nate Radebaugh"/><br /><sub><b>Nate Radebaugh</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=NateRadebaugh" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/commitlint.config.cjs b/commitlint.config.cjs
@@ -9,6 +9,7 @@ module.exports = {
       [
         'vite-plugin-angular',
         'vite-plugin-nitro',
+        'vitest-angular',
         'create-analog',
         'astro-angular',
         'router',
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - beta
+          - main
     permissions:
       contents: read # for checkout
@@ Expand Down @@