Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: ci

on:
push:
branches:
- beta
- main
pull_request: {}

env:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Release Test

permissions:
contents: read

on:
release:
types: [released, prereleased]
types: [published]
workflow_dispatch:
inputs:
analog_build_tag:
Expand Down
57 changes: 36 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "19.2.4",
"@angular/cdk": "19.2.7",
"@angular/common": "19.2.4",
"@angular/compiler": "19.2.4",
"@angular/core": "19.2.4",
"@angular/forms": "19.2.4",
"@angular/material": "19.2.7",
"@angular/platform-browser": "19.2.4",
"@angular/platform-browser-dynamic": "19.2.4",
"@angular/platform-server": "19.2.4",
"@angular/router": "19.2.4",
"@angular/animations": "20.0.0-rc.2",
"@angular/cdk": "20.0.0-rc.2",
"@angular/common": "20.0.0-rc.2",
"@angular/compiler": "20.0.0-rc.2",
"@angular/core": "20.0.0-rc.2",
"@angular/forms": "20.0.0-rc.2",
"@angular/material": "20.0.0-rc.2",
"@angular/platform-browser": "20.0.0-rc.2",
"@angular/platform-browser-dynamic": "20.0.0-rc.2",
"@angular/platform-server": "20.0.0-rc.2",
"@angular/router": "20.0.0-rc.2",
"@astrojs/mdx": "^3.0.1",
"@astrojs/react": "^3.0.0",
"@babel/core": "^7.21.8",
Expand Down Expand Up @@ -84,17 +84,17 @@
"zone.js": "^0.15.0"
},
"devDependencies": {
"@angular-devkit/architect": "0.1902.5",
"@angular-devkit/build-angular": "19.2.5",
"@angular-devkit/core": "19.2.5",
"@angular-devkit/schematics": "19.2.5",
"@angular-devkit/architect": "0.2000.0-rc.3",
"@angular-devkit/build-angular": "20.0.0-rc.3",
"@angular-devkit/core": "20.0.0-rc.3",
"@angular-devkit/schematics": "20.0.0-rc.3",
"@angular-eslint/eslint-plugin": "19.3.0",
"@angular-eslint/eslint-plugin-template": "19.3.0",
"@angular-eslint/template-parser": "19.3.0",
"@angular/build": "19.2.5",
"@angular/cli": "~19.2.0",
"@angular/compiler-cli": "19.2.4",
"@angular/language-service": "19.2.4",
"@angular/build": "20.0.0-rc.3",
"@angular/cli": "20.0.0-rc.3",
"@angular/compiler-cli": "20.0.0-rc.2",
"@angular/language-service": "20.0.0-rc.2",
"@astrojs/markdown-component": "^1.0.5",
"@commitlint/cli": "^17.4.2",
"@commitlint/config-conventional": "^17.4.2",
Expand Down Expand Up @@ -162,7 +162,7 @@
"marked-mangle": "^1.1.10",
"marked-shiki": "^1.1.0",
"minimist": "^1.2.7",
"ng-packagr": "19.2.0",
"ng-packagr": "20.0.0-rc.1",
"nitropack": "^2.11.0",
"nx": "21.0.3",
"playwright": "^1.49.1",
Expand All @@ -188,7 +188,7 @@
"ts-jest": "29.1.0",
"ts-morph": "^21.0.1",
"ts-node": "10.9.1",
"typescript": "5.7.3",
"typescript": "~5.8.0",
"vfile": "^6.0.3",
"vite": "6.2.3",
"vite-plugin-eslint": "^1.8.1",
Expand All @@ -198,5 +198,20 @@
"vitest": "^3.0.5",
"webpack-bundle-analyzer": "^4.7.0",
"xmlbuilder2": "^3.0.2"
},
"pnpm": {
"ignoredBuiltDependencies": [
"cypress"
],
"onlyBuiltDependencies": [
"@swc/core",
"core-js",
"core-js-pure",
"esbuild",
"lmdb",
"msgpackr-extract",
"nx",
"sharp"
]
}
}
2 changes: 1 addition & 1 deletion packages/content/og/src/lib/og.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import satori from 'satori';
import { html as toReactElement } from 'satori-html';
import sharp from 'sharp';

import { ImageResponseOptions } from './options.js';
import { ImageResponseOptions } from './options';

export const generateImage = async (
element: string,
Expand Down
8 changes: 4 additions & 4 deletions packages/content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"url": "https://github.com/sponsors/brandonroberts"
},
"peerDependencies": {
"@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"@angular/platform-browser": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/platform-browser": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0",
"front-matter": "^4.0.2",
"marked": "^15.0.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-analog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,10 @@ function setComponentFormat(root, filesDir, write, template, useAnalogSFC) {
__APP_COMPONENT__: useAnalogSFC ? 'App' : 'AppComponent',
__APP_COMPONENT_IMPORT__: useAnalogSFC
? "import App from './app/app-root.ag';"
: "import { AppComponent } from './app/app.component';",
: "import { AppComponent } from './app/app';",
});

const cmpForDelete = useAnalogSFC ? 'app.component' : 'app-root';
const cmpForDelete = useAnalogSFC ? 'app' : 'app-root';
const deleteExt = useAnalogSFC ? 'ts' : 'ag';
deleteFiles(root, [
useAnalogSFC ? `src/app/${cmpForDelete}.ts` : `src/app/${cmpForDelete}.ag`,
Expand Down
16 changes: 16 additions & 0 deletions packages/create-analog/template-angular-v19/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template", "analogjs.vscode-analog"]
}
19 changes: 19 additions & 0 deletions packages/create-analog/template-angular-v19/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:5173/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test"
}
]
}
42 changes: 42 additions & 0 deletions packages/create-analog/template-angular-v19/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"type": "npm",
"script": "test",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}
26 changes: 26 additions & 0 deletions packages/create-analog/template-angular-v19/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# __PROJECT_TITLE__

This project was generated with [Analog](https://analogjs.org), the fullstack meta-framework for Angular.

## Setup

Run `npm install` to install the application dependencies.

## Development

Run `npm start` for a dev server. Navigate to `http://localhost:5173/`. The application automatically reloads if you change any of the source files.

## Build

Run `npm run build` to build the client/server project. The client build artifacts are located in the `dist/analog/public` directory. The server for the API build artifacts are located in the `dist/analog/server` directory.

## Test

Run `npm run test` to run unit tests with [Vitest](https://vitest.dev).

## Community

- Visit and Star the [GitHub Repo](https://github.com/analogjs/analog)
- Join the [Discord](https://chat.analogjs.org)
- Follow us on [Twitter](https://twitter.com/analogjs)
- Become a [Sponsor](https://github.com/sponsors/brandonroberts)
44 changes: 44 additions & 0 deletions packages/create-analog/template-angular-v19/_gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Compiled output
/dist
/tmp
/out-tsc
/bazel-out

# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
/.nx/cache
/.nx/workspace-data
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings

# System files
.DS_Store
Thumbs.db
54 changes: 54 additions & 0 deletions packages/create-analog/template-angular-v19/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"my-app": {
"projectType": "application",
"root": ".",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@analogjs/platform:vite",
"options": {
"configFile": "vite.config.ts",
"main": "src/main.ts",
"outputPath": "dist/client",
"tsConfig": "tsconfig.app.json"
},
"defaultConfiguration": "production",
"configurations": {
"development": {
"mode": "development"
},
"production": {
"sourcemap": false,
"mode": "production"
}
}
},
"serve": {
"builder": "@analogjs/platform:vite-dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "my-app:build",
"port": 5173
},
"configurations": {
"development": {
"buildTarget": "my-app:build:development",
"hmr": true
},
"production": {
"buildTarget": "my-app:build:production"
}
}
},
"test": {
"builder": "@analogjs/vitest-angular:test"
}
}
}
}
}
15 changes: 15 additions & 0 deletions packages/create-analog/template-angular-v19/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>__PROJECT_TITLE__</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<link rel="stylesheet" href="/src/styles.css" />
</head>
<body>
<app-root></app-root>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
Loading