Skip to content

Commit

Permalink
feat: update deps and apps to Angular v18 release (#1101)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brandonroberts
brandonroberts committed May 23, 2024
1 parent 00bf117 commit ef9bbee
Show file tree
Hide file tree
Showing 24 changed files with 1,642 additions and 2,035 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- beta
- main

permissions:
contents: read # for checkout
Expand Down
48 changes: 24 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,21 @@
"apps/docs-app"
],
"dependencies": {
"@angular/animations": "^18.0.0-rc.0",
"@angular/cdk": "^18.0.0-rc.0",
"@angular/common": "^18.0.0-rc.0",
"@angular/compiler": "^18.0.0-rc.0",
"@angular/core": "^18.0.0-rc.0",
"@angular/forms": "^18.0.0-rc.0",
"@angular/material": "^18.0.0-rc.0",
"@angular/platform-browser": "^18.0.0-rc.0",
"@angular/platform-browser-dynamic": "^18.0.0-rc.0",
"@angular/platform-server": "^18.0.0-rc.0",
"@angular/router": "^18.0.0-rc.0",
"@astrojs/mdx": "^1.1.0",
"@angular/animations": "^18.0.0",
"@angular/cdk": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/material": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/platform-server": "^18.0.0",
"@angular/router": "^18.0.0",
"@astrojs/mdx": "^3.0.1",
"@astrojs/react": "^3.0.0",
"@babel/core": "^7.21.8",
"@mdx-js/react": "1.6.22",
"@mdx-js/react": "3.0.1",
"@nx/angular": "19.0.3",
"@nx/devkit": "19.0.3",
"@trpc/client": "^10.25.0",
Expand All @@ -83,20 +83,20 @@
"zone.js": "^0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.0-rc.0",
"@angular-devkit/core": "^18.0.0-rc.0",
"@angular-devkit/schematics": "^18.0.0-rc.0",
"@angular-devkit/build-angular": "^18.0.0",
"@angular-devkit/core": "^18.0.0",
"@angular-devkit/schematics": "^18.0.0",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "^18.0.0-rc.0",
"@angular/compiler-cli": "^18.0.0-rc.0",
"@angular/language-service": "^18.0.0-rc.0",
"@angular/cli": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/language-service": "^18.0.0",
"@astrojs/markdown-component": "^1.0.5",
"@commitlint/cli": "^17.4.2",
"@commitlint/config-conventional": "^17.4.2",
"@netlify/functions": "^2.3.0",
"@ngtools/webpack": "^18.0.0-rc.0",
"@ngtools/webpack": "^18.0.0",
"@nx/cypress": "19.0.3",
"@nx/eslint": "19.0.3",
"@nx/eslint-plugin": "19.0.3",
Expand All @@ -105,7 +105,7 @@
"@nx/plugin": "19.0.3",
"@nx/vite": "19.0.3",
"@nx/web": "19.0.3",
"@schematics/angular": "^18.0.0-rc.0",
"@schematics/angular": "^18.0.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
Expand All @@ -124,7 +124,7 @@
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"all-contributors-cli": "^6.24.0",
"astro": "3.0.8",
"astro": "4.8.7",
"conventional-changelog": "^3.1.25",
"conventional-changelog-cli": "^2.2.2",
"cpy-cli": "^4.2.0",
Expand All @@ -145,8 +145,8 @@
"kolorist": "^1.6.0",
"lint-staged": "^13.1.0",
"minimist": "^1.2.7",
"ng-packagr": "^18.0.0-rc.0",
"nitropack": "^2.6.0",
"ng-packagr": "^18.0.0",
"nitropack": "^2.9.0",
"nx": "19.0.3",
"playwright": "^1.30.0",
"postcss": "^8.4.21",
Expand Down
20 changes: 10 additions & 10 deletions packages/astro-angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
"@analogjs/vite-plugin-angular": "^1.4.0-beta.3"
},
"peerDependencies": {
"@angular-devkit/build-angular": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/animations": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/common": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/compiler-cli": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/compiler": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/core": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/language-service": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/platform-browser": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/platform-browser-dynamic": ">=16.0.0 || ^18.0.0-rc.0",
"@angular/platform-server": ">=16.0.0 || ^18.0.0-rc.0",
"@angular-devkit/build-angular": ">=16.0.0",
"@angular/animations": ">=16.0.0",
"@angular/common": ">=16.0.0",
"@angular/compiler-cli": ">=16.0.0",
"@angular/compiler": ">=16.0.0",
"@angular/core": ">=16.0.0",
"@angular/language-service": ">=16.0.0",
"@angular/platform-browser": ">=16.0.0",
"@angular/platform-browser-dynamic": ">=16.0.0",
"@angular/platform-server": ">=16.0.0",
"rxjs": "^7.5.6",
"zone.js": ">=0.13.3",
"tslib": "^2.4.0"
Expand Down
9 changes: 7 additions & 2 deletions packages/astro-angular/src/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import viteAngular, { PluginOptions } from '@analogjs/vite-plugin-angular';
import { enableProdMode } from '@angular/core';
import { AstroIntegration, AstroRenderer } from 'astro';
import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
import type { DeepPartial } from 'astro/dist/type-utils';

interface AngularOptions {
vite?: PluginOptions;
Expand Down Expand Up @@ -79,7 +80,11 @@ export default function (options?: AngularOptions): AstroIntegration {
}

addRenderer(getRenderer());
updateConfig({ vite: getViteConfiguration(options?.vite) });
updateConfig({
vite: getViteConfiguration(
options?.vite
) as DeepPartial<ViteUserConfig>,
});
},
'astro:config:done': ({ config }) => {
if (
Expand Down
8 changes: 4 additions & 4 deletions packages/content/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"url": "https://github.com/analogjs/analog.git"
},
"peerDependencies": {
"@angular/common": ">=15.0.0 || ^18.0.0-rc.0",
"@angular/core": ">=15.0.0 || ^18.0.0-rc.0",
"@angular/platform-browser": ">=15.0.0 || ^18.0.0-rc.0",
"@angular/router": ">=15.0.0 || ^18.0.0-rc.0",
"@angular/common": ">=15.0.0 || ^18.0.0",
"@angular/core": ">=15.0.0 || ^18.0.0",
"@angular/platform-browser": ">=15.0.0 || ^18.0.0",
"@angular/router": ">=15.0.0 || ^18.0.0",
"rxjs": "^6.5.0 || ^7.5.0",
"marked": "^5.0.2",
"marked-gfm-heading-id": "^3.0.4",
Expand Down
32 changes: 16 additions & 16 deletions packages/create-analog/template-blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
"dependencies": {
"@analogjs/content": "^1.4.0-beta.3",
"@analogjs/router": "^1.4.0-beta.3",
"@angular/animations": "^17.2.0",
"@angular/common": "^17.2.0",
"@angular/compiler": "^17.2.0",
"@angular/core": "^17.2.0",
"@angular/forms": "^17.2.0",
"@angular/platform-browser": "^17.2.0",
"@angular/platform-browser-dynamic": "^17.2.0",
"@angular/platform-server": "^17.2.0",
"@angular/router": "^17.2.0",
"@nx/angular": "~18.0.0",
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/platform-server": "^18.0.0",
"@angular/router": "^18.0.0",
"@nx/angular": "~19.0.0",
"front-matter": "^4.0.2",
"marked": "^5.0.2",
"marked-gfm-heading-id": "^3.1.0",
Expand All @@ -40,13 +40,13 @@
"devDependencies": {
"@analogjs/platform": "^1.4.0-beta.3",
"@analogjs/vite-plugin-angular": "^1.4.0-beta.3",
"@angular-devkit/build-angular": "^17.2.0",
"@angular/cli": "^17.2.0",
"@angular/compiler-cli": "^17.2.0",
"@nx/vite": "~18.0.0",
"nx": "~18.0.0",
"@angular-devkit/build-angular": "^18.0.0",
"@angular/cli": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@nx/vite": "~19.0.0",
"nx": "~19.0.0",
"jsdom": "^22.1.0",
"typescript": "~5.3.0",
"typescript": "~5.4.2",
"vite": "^5.0.0",
"vitest": "^1.3.1"
}
Expand Down
0 ...-analog/template-blog/src/assets/.gitkeep → ...eate-analog/template-blog/public/.gitkeep
View file
File renamed without changes.
0 ...nalog/template-blog/src/assets/analog.svg → ...te-analog/template-blog/public/analog.svg
View file
File renamed without changes
0 ...s/create-analog/template-blog/favicon.ico → ...e-analog/template-blog/public/favicon.ico
View file
File renamed without changes.
0 ...-analog/template-blog/src/assets/vite.svg → ...eate-analog/template-blog/public/vite.svg
View file
File renamed without changes
3 changes: 2 additions & 1 deletion packages/create-analog/template-blog/src/app/app.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { provideHttpClient, withFetch } from '@angular/common/http';
import { ApplicationConfig } from '@angular/core';
import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
import { provideClientHydration } from '@angular/platform-browser';
import { provideFileRouter } from '@analogjs/router';
import { provideContent, withMarkdownRenderer } from '@analogjs/content';

export const appConfig: ApplicationConfig = {
providers: [
provideZoneChangeDetection({ eventCoalescing: true }),
provideFileRouter(),
provideHttpClient(withFetch()),
provideClientHydration(),
Expand Down
0 ...s/create-analog/template-blog/src/test.ts → ...te-analog/template-blog/src/test-setup.ts
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/create-analog/template-blog/tsconfig.spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"target": "es2016",
"types": ["node", "vitest/globals"]
},
"files": ["src/test.ts"],
"files": ["src/test-setup.ts"],
"include": ["src/**/*.spec.ts", "src/**/*.ts"]
}
3 changes: 1 addition & 2 deletions packages/create-analog/template-blog/vite.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import analog from '@analogjs/platform';

// https://vitejs.dev/config/
export default defineConfig(({ mode }) => ({
publicDir: 'src/assets',
build: {
target: ['es2020'],
},
Expand All @@ -22,7 +21,7 @@ export default defineConfig(({ mode }) => ({
test: {
globals: true,
environment: 'jsdom',
setupFiles: ['src/test.ts'],
setupFiles: ['src/test-setup.ts'],
include: ['**/*.spec.ts'],
reporters: ['default'],
},
Expand Down
39 changes: 16 additions & 23 deletions packages/create-analog/template-latest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
},
"private": true,
"dependencies": {
"@analogjs/content": "^1.3.1",
"@analogjs/router": "^1.3.1",
"@angular/animations": "^18.0.0-rc.0",
"@angular/common": "^18.0.0-rc.0",
"@angular/compiler": "^18.0.0-rc.0",
"@angular/core": "^18.0.0-rc.0",
"@angular/forms": "^18.0.0-rc.0",
"@angular/platform-browser": "^18.0.0-rc.0",
"@angular/platform-browser-dynamic": "^18.0.0-rc.0",
"@angular/platform-server": "^18.0.0-rc.0",
"@angular/router": "^18.0.0-rc.0",
"@analogjs/content": "^1.4.0-beta.3",
"@analogjs/router": "^1.4.0-beta.3",
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/platform-server": "^18.0.0",
"@angular/router": "^18.0.0",
"@nx/angular": "~19.0.0",
"front-matter": "^4.0.2",
"marked": "^5.0.2",
Expand All @@ -38,20 +38,13 @@
"zone.js": "~0.14.3"
},
"devDependencies": {
"@analogjs/platform": "^1.3.1",
"@analogjs/vite-plugin-angular": "^1.3.1",
"@angular-devkit/build-angular": "^18.0.0-rc.2",
"@angular/cli": "^18.0.0-rc.2",
"@angular/compiler-cli": "^18.0.0-rc.0",
"@analogjs/platform": "^1.4.0-beta.3",
"@analogjs/vite-plugin-angular": "^1.4.0-beta.3",
"@angular-devkit/build-angular": "^18.0.0",
"@angular/cli": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@nx/vite": "~19.0.0",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.1.0",
"jsdom": "^22.0.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"nx": "~19.0.0",
"typescript": "~5.4.2",
"vite": "^5.0.0",
Expand Down
22 changes: 18 additions & 4 deletions packages/nx-plugin/src/utils/versions/dependencies.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import {
V15_X_ANALOG_JS_ROUTER,
V15_X_NX_ANGULAR,
} from './ng_15_X/versions';
import {
V18_X_ANALOG_JS_CONTENT,
V18_X_ANALOG_JS_ROUTER,
V18_X_NX_ANGULAR,
} from './ng_18_X/versions';

const dependencyKeys = [
'@analogjs/content',
Expand Down Expand Up @@ -57,10 +62,19 @@ const getDependencies = (escapedAngularVersion: string) => {
};
}

// return latest 17.x deps for versions >17.0.0
// install 17.x deps for versions <18.0.0
if (lt(escapedAngularVersion, '18.0.0')) {
return {
'@analogjs/content': V17_X_ANALOG_JS_CONTENT,
'@analogjs/router': V17_X_ANALOG_JS_ROUTER,
'@nx/angular': V17_X_NX_ANGULAR,
};
}

// return latest 18.x deps for versions >18.0.0
return {
'@analogjs/content': V17_X_ANALOG_JS_CONTENT,
'@analogjs/router': V17_X_ANALOG_JS_ROUTER,
'@nx/angular': V17_X_NX_ANGULAR,
'@analogjs/content': V18_X_ANALOG_JS_CONTENT,
'@analogjs/router': V18_X_ANALOG_JS_ROUTER,
'@nx/angular': V18_X_NX_ANGULAR,
};
};
34 changes: 27 additions & 7 deletions packages/nx-plugin/src/utils/versions/dev-dependencies.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ import {
V15_X_VITE_TSCONFIG_PATHS,
V15_X_VITEST,
} from './ng_15_X/versions';
import {
V18_X_ANALOG_JS_PLATFORM,
V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
V18_X_NX_VITE,
V18_X_JSDOM,
V18_X_VITE_TSCONFIG_PATHS,
V18_X_VITEST,
} from './ng_18_X/versions';

const devDependencyKeys = [
'@analogjs/platform',
Expand Down Expand Up @@ -75,13 +83,25 @@ const getDevDependencies = (escapedAngularVersion: string) => {
};
}

// return latest 17.x deps for versions >17.0.0
// install 16.x deps for versions <18.0.0
if (lt(escapedAngularVersion, '18.0.0')) {
return {
'@analogjs/platform': V16_X_ANALOG_JS_PLATFORM,
'@analogjs/vite-plugin-angular': V16_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
'@nx/vite': V16_X_NX_VITE,
jsdom: V16_X_JSDOM,
'vite-tsconfig-paths': V16_X_VITE_TSCONFIG_PATHS,
vitest: V16_X_VITEST,
};
}

// return latest 18.x deps for versions >18.0.0
return {
'@analogjs/platform': V17_X_ANALOG_JS_PLATFORM,
'@analogjs/vite-plugin-angular': V17_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
'@nx/vite': V17_X_NX_VITE,
jsdom: V17_X_JSDOM,
'vite-tsconfig-paths': V17_X_VITE_TSCONFIG_PATHS,
vitest: V17_X_VITEST,
'@analogjs/platform': V18_X_ANALOG_JS_PLATFORM,
'@analogjs/vite-plugin-angular': V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
'@nx/vite': V18_X_NX_VITE,
jsdom: V18_X_JSDOM,
'vite-tsconfig-paths': V18_X_VITE_TSCONFIG_PATHS,
vitest: V18_X_VITEST,
};
};
Loading

0 comments on commit ef9bbee

Please sign in to comment.