Skip to content

Commit

Permalink
fix(nx-plugin): update Nx preset to 20.x and Angular 19.x (#1484)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonroberts authored Dec 8, 2024
1 parent 38a7688 commit 7d8ee23
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ jobs:

unit:
runs-on: ubuntu-latest
needs:
- build
- build-windows
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand All @@ -104,7 +101,6 @@ jobs:
runs-on: ubuntu-latest
needs:
- build
- build-windows
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
TAG="$(${{ github.ref_name == 'main' }} && echo 'latest' || echo '${{ github.ref_name }}')"
- name: Create Nx Workspace
run: |
npx create-nx-workspace@${{ inputs.nx_build_tag }} analog-nx-workspace --preset @analogjs/platform@$TAG --analogAppName my-analog-app --ci skip
npx create-nx-workspace@${{ inputs.nx_build_tag }} analog-nx-workspace --preset @analogjs/platform@$TAG --analogAppName my-analog-app --addTailwind=false --addTRPC=false --ci skip
- name: Build, Test, and Validate
run: |
cd analog-nx-workspace
Expand Down
19 changes: 10 additions & 9 deletions packages/nx-plugin/src/generators/app/generator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { AnalogNxApplicationGeneratorOptions } from './schema';
describe('nx-plugin generator', () => {
const setup = async (
options: AnalogNxApplicationGeneratorOptions,
nxVersion = '18.0.0',
nxVersion = '20.0.0',
standalone = false
) => {
const tree = createTreeWithEmptyWorkspace(
Expand Down Expand Up @@ -124,8 +124,8 @@ describe('nx-plugin generator', () => {
dependencies: Record<string, string>,
devDependencies: Record<string, string>
) => {
expect(dependencies['@analogjs/content']).toBe('^1.7.0');
expect(dependencies['@analogjs/router']).toBe('^1.7.0');
expect(dependencies['@analogjs/content']).toBe('^1.10.0');
expect(dependencies['@analogjs/router']).toBe('^1.10.0');
expect(dependencies['@angular/platform-server']).toBe(
dependencies['@angular/core']
);
Expand All @@ -137,18 +137,19 @@ describe('nx-plugin generator', () => {
expect(dependencies['mermaid']).toBe('^10.2.4');
expect(dependencies['prismjs']).toBe('^1.29.0');

expect(devDependencies['@nx/devkit']).toBe('^19.1.0');
expect(devDependencies['@nx/angular']).toBe('^19.1.0');
expect(devDependencies['@nx/devkit']).toBe('^20.0.0');
expect(devDependencies['@nx/angular']).toBe('^20.0.0');
// we just check for truthy because @nx/eslint generator
// will install the correct version based on Nx version
expect(devDependencies['@nx/eslint']).toBeTruthy();
expect(devDependencies['@analogjs/platform']).toBe('^1.7.0');
expect(devDependencies['@analogjs/vite-plugin-angular']).toBe('^1.7.0');
expect(devDependencies['@nx/vite']).toBe('^19.1.0');
expect(devDependencies['@analogjs/platform']).toBe('^1.10.0');
expect(devDependencies['@analogjs/vite-plugin-angular']).toBe('^1.10.0');
expect(devDependencies['@analogjs/vitest-angular']).toBe('^1.10.0');
expect(devDependencies['@nx/vite']).toBe('^20.0.0');
expect(devDependencies['jsdom']).toBe('^22.1.0');
expect(devDependencies['vite']).toBe('^5.0.0');
expect(devDependencies['vite-tsconfig-paths']).toBe('^4.2.0');
expect(devDependencies['vitest']).toBe('^1.3.1');
expect(devDependencies['vitest']).toBe('^2.0.0');
};

const verifyConfig = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@ const initWithNxNamespace = async (
addDependenciesToPackageJson(
tree,
{
'@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',
'@angular/animations': '^19.0.0',
'@angular/common': '^19.0.0',
'@angular/compiler': '^19.0.0',
'@angular/core': '^19.0.0',
'@angular/forms': '^19.0.0',
'@angular/platform-browser': '^19.0.0',
'@angular/platform-browser-dynamic': '^19.0.0',
'@angular/platform-server': '^19.0.0',
'@angular/router': '^19.0.0',
rxjs: '~7.8.0',
tslib: '^2.4.0',
'zone.js': '~0.14.0',
'zone.js': '~0.15.0',
},
{
'@angular-devkit/build-angular': '^18.0.0',
'@angular/compiler-cli': '^18.0.0',
'@angular-devkit/build-angular': '^19.0.0',
'@angular/compiler-cli': '^19.0.0',
'@nx/angular': versions['@nx/angular'],
'@nx/devkit': versions['@nx/devkit'],
'@nx/eslint': versions['@nx/eslint'],
typescript: '~5.4.2',
typescript: '~5.5.0',
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
V18_X_VITE_TSCONFIG_PATHS,
V18_X_VITEST,
V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR,
V18_X_ANALOG_JS_VITEST_ANGULAR,
} from './nx_18_X/versions';

// TODO: @analogjs/vite-plugin-angular is being defined as we must pin
Expand Down Expand Up @@ -155,6 +156,7 @@ const getDevDependencies = (escapedNxVersion: string) => {
return {
'@analogjs/platform': V18_X_ANALOG_JS_PLATFORM,
'@analogjs/vite-plugin-angular': V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
'@analogjs/vitest-angular': V18_X_ANALOG_JS_VITEST_ANGULAR,
'@angular-devkit/build-angular': V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR,
jsdom: V18_X_JSDOM,
vite: V18_X_VITE,
Expand Down
21 changes: 11 additions & 10 deletions packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// V18_X
// dependencies
export const V18_X_NX_DEVKIT = '^19.1.0';
export const V18_X_NX_ANGULAR = '^19.1.0';
export const V18_X_ANALOG_JS_CONTENT = '^1.7.0';
export const V18_X_ANALOG_JS_ROUTER = '^1.7.0';
export const V18_X_NX_DEVKIT = '^20.0.0';
export const V18_X_NX_ANGULAR = '^20.0.0';
export const V18_X_ANALOG_JS_CONTENT = '^1.10.0';
export const V18_X_ANALOG_JS_ROUTER = '^1.10.0';
export const V18_X_ANALOG_JS_TRPC = '~0.2.46';
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.7.0';
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.10.0';
export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^1.10.0';
export const V18_X_TRPC_CLIENT = '^10.25.0';
export const V18_X_TRPC_SERVER = '^10.25.0';
export const V18_X_ISOMORPHIC_FETCH = '^3.0.0';
Expand All @@ -22,12 +23,12 @@ export const V18_X_POSTCSS = '^8.4.5';
export const V18_X_AUTOPREFIXER = '^10.4.0';

// devDependencies
export const V18_X_ANALOG_JS_PLATFORM = '^1.7.0';
export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^18.0.0';
export const V18_X_NX_VITE = '^19.1.0';
export const V18_X_NX_LINTER = '^19.1.0';
export const V18_X_ANALOG_JS_PLATFORM = '^1.10.0';
export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
export const V18_X_NX_VITE = '^20.0.0';
export const V18_X_NX_LINTER = '^20.0.0';
export const V18_X_JSDOM = '^22.1.0';
export const V18_X_VITE = '^5.0.0';
export const V18_X_VITE_TSCONFIG_PATHS = '^4.2.0';
export const V18_X_VITEST = '^1.3.1';
export const V18_X_VITEST = '^2.0.0';
export const V18_X_ZOD = '^3.21.4';

0 comments on commit 7d8ee23

Please sign in to comment.