Skip to content

Commit 5a41937

Browse files
brandonrobertsbrandonroberts
committed
Merge branch 'main' into alpha
2 parents 8ae2bd6 + 6480f47 commit 5a41937

File tree

35 files changed

+676
-174
lines changed

35 files changed

+676
-174
lines changed

‎apps/docs-app/docs/features/deployment/providers.md

+35-2
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,8 @@ env:
573573
TARGET_DIR: dist/analog/public
574574

575575
jobs:
576-
build:
576+
# build the project and push it to the gh-pages branch
577+
build-and-push:
577578
runs-on: ubuntu-latest
578579
steps:
579580
- uses: actions/checkout@v4
@@ -597,7 +598,39 @@ jobs:
597598
env:
598599
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }} # A token must be created to be able to deploy on the gh-pages branch
599600
CNAME_OPTION: --cname=yourdomain.dev # omit if your not running it on a custom domain
601+
# run the deployment script to push the built project to the gh-pages branch
602+
# the default contributor is github-actions[bot]
600603
run: |
601604
echo "DRY_RUN_OPTION=$DRY_RUN_OPTION"
602-
npx angular-cli-ghpages --no-silent --dir="${{env.TARGET_DIR}}" $CNAME_OPTION $DRY_RUN_OPTION
605+
npx angular-cli-ghpages --no-silent --dir="${{env.TARGET_DIR}}" \
606+
--name="github-actions[bot]" \
607+
--email="github-actions[bot]@users.noreply.github.com" \
608+
--branch="gh-pages" \
609+
--message="Deploy: $(git log -1 --pretty=%B)" \
610+
$DRY_RUN_OPTION
611+
612+
# deploy from gh-pages branch
613+
deploy-pages:
614+
needs: build-and-push
615+
runs-on: ubuntu-latest
616+
environment:
617+
name: github-pages
618+
url: ${{ steps.deployment.outputs.page_url }}
619+
steps:
620+
- name: Checkout gh-pages
621+
uses: actions/checkout@v4
622+
with:
623+
ref: gh-pages
624+
625+
- name: Setup Pages
626+
uses: actions/configure-pages@v4
627+
628+
- name: Upload artifact
629+
uses: actions/upload-pages-artifact@v3
630+
with:
631+
path: '.'
632+
633+
- name: Deploy to GitHub Pages
634+
id: deployment
635+
uses: actions/deploy-pages@v4
603636
```

‎apps/trpc-app/src/server/routes/trpc/[trpc].ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { appRouter } from '../../trpc/routers';
22
import { createContext } from '../../trpc/context';
3-
import { createTrpcNitroHandler } from '@analogjs/trpc';
3+
import { createTrpcNitroHandler } from '@analogjs/trpc/server';
44
// export API handler
55
export default createTrpcNitroHandler({
66
router: appRouter,

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"e2e": "nx run-many --target e2e --projects create-analog-e2e,analog-app-e2e-cypress --parallel=1 --exclude analog-app-e2e-playwright",
1414
"test": "nx run-many --target test",
1515
"build:vite-ci": "npm run build",
16-
"test:vite-ci": "nx run-many --target test --all --skip-nx-cache",
16+
"test:vite-ci": "nx run-many --target test --exclude card --all --skip-nx-cache",
1717
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
1818
"contributors:add": "all-contributors add",
1919
"contributors:generate": "all-contributors generate",
@@ -150,7 +150,7 @@
150150
"ng-packagr": "^19.0.0",
151151
"nitropack": "^2.10.0",
152152
"nx": "20.1.2",
153-
"playwright": "^1.30.0",
153+
"playwright": "^1.49.1",
154154
"postcss": "^8.4.21",
155155
"postcss-import": "~15.1.0",
156156
"postcss-preset-env": "~8.0.1",
@@ -178,7 +178,7 @@
178178
"vite-plugin-inspect": "~0.8",
179179
"vite-tsconfig-paths": "4.2.0",
180180
"vitefu": "^0.2.5",
181-
"vitest": "^2.0.0",
181+
"vitest": "^3.0.0",
182182
"webpack-bundle-analyzer": "^4.7.0",
183183
"xmlbuilder2": "^3.0.2"
184184
}

‎packages/create-analog/template-blog/angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projects": {
66
"blog": {
77
"projectType": "application",
8-
"root": "",
8+
"root": ".",
99
"sourceRoot": "src",
1010
"prefix": "blog",
1111
"architect": {

‎packages/create-analog/template-blog/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
"typescript": "~5.5.0",
4848
"vite": "^6.0.0",
4949
"vite-tsconfig-paths": "^4.2.0",
50-
"vitest": "^2.0.0"
50+
"vitest": "^3.0.0"
51+
},
52+
"overrides": {
53+
"@nx/vite": {
54+
"vite": "$vite",
55+
"vitest": "$vitest"
56+
}
5157
}
5258
}

‎packages/create-analog/template-latest/angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projects": {
66
"my-app": {
77
"projectType": "application",
8-
"root": "",
8+
"root": ".",
99
"sourceRoot": "src",
1010
"prefix": "app",
1111
"architect": {

‎packages/create-analog/template-latest/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
"typescript": "~5.5.0",
4949
"vite": "^6.0.0",
5050
"vite-tsconfig-paths": "^4.2.0",
51-
"vitest": "^2.0.0"
51+
"vitest": "^3.0.0"
52+
},
53+
"overrides": {
54+
"@nx/vite": {
55+
"vite": "$vite",
56+
"vitest": "$vitest"
57+
}
5258
}
5359
}

‎packages/create-analog/template-minimal/angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projects": {
66
"my-app": {
77
"projectType": "application",
8-
"root": "",
8+
"root": ".",
99
"sourceRoot": "src",
1010
"prefix": "app",
1111
"architect": {

‎packages/create-analog/template-minimal/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
"typescript": "~5.5.0",
4949
"vite": "^6.0.0",
5050
"vite-tsconfig-paths": "^4.2.0",
51-
"vitest": "^2.0.0"
51+
"vitest": "^3.0.0"
52+
},
53+
"overrides": {
54+
"@nx/vite": {
55+
"vite": "$vite",
56+
"vitest": "$vitest"
57+
}
5258
}
5359
}

‎packages/nx-plugin/src/generators/app/files/trpc/src/server/routes/trpc/[trpc].ts__template__

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { appRouter } from '../../trpc/routers';
22
import { createContext } from '../../trpc/context';
3-
import { createTrpcNitroHandler } from '@analogjs/trpc';
3+
import { createTrpcNitroHandler } from '@analogjs/trpc/server';
44
// export API handler
55
export default createTrpcNitroHandler({
66
router: appRouter,

‎packages/nx-plugin/src/generators/app/files/trpc/src/server/trpc/trpc.ts__template__

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { initTRPC } from '@trpc/server';
22
import { Context } from './context';
3+
import { SuperJSON } from 'superjson';
34

4-
const t = initTRPC.context<Context>().create({});
5+
const t = initTRPC.context<Context>().create({
6+
transformer: SuperJSON,
7+
});
58
/**
69
* Unprotected procedure
710
**/

‎packages/nx-plugin/src/generators/app/files/trpc/src/trpc-client.ts__template__

+4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import { AppRouter } from './server/trpc/routers';
22
import { createTrpcClient } from '@analogjs/trpc';
33
import { inject } from '@angular/core';
4+
import { SuperJSON } from 'superjson';
45

56
export const { provideTrpcClient, TrpcClient } = createTrpcClient<AppRouter>({
67
url: '/api/trpc',
8+
options: {
9+
transformer: SuperJSON,
10+
},
711
});
812

913
export function injectTrpcClient() {

‎packages/nx-plugin/src/generators/app/generator.spec.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ describe('nx-plugin generator', () => {
124124
dependencies: Record<string, string>,
125125
devDependencies: Record<string, string>
126126
) => {
127-
expect(dependencies['@analogjs/content']).toBe('^1.10.0');
128-
expect(dependencies['@analogjs/router']).toBe('^1.10.0');
127+
expect(dependencies['@analogjs/content']).toBeDefined();
128+
expect(dependencies['@analogjs/router']).toBeDefined();
129129
expect(dependencies['@angular/platform-server']).toBe(
130130
dependencies['@angular/core']
131131
);
@@ -142,14 +142,14 @@ describe('nx-plugin generator', () => {
142142
// we just check for truthy because @nx/eslint generator
143143
// will install the correct version based on Nx version
144144
expect(devDependencies['@nx/eslint']).toBeTruthy();
145-
expect(devDependencies['@analogjs/platform']).toBe('^1.10.0');
146-
expect(devDependencies['@analogjs/vite-plugin-angular']).toBe('^1.10.0');
147-
expect(devDependencies['@analogjs/vitest-angular']).toBe('^1.10.0');
145+
expect(devDependencies['@analogjs/platform']).toBeDefined();
146+
expect(devDependencies['@analogjs/vite-plugin-angular']).toBeDefined();
147+
expect(devDependencies['@analogjs/vitest-angular']).toBeDefined();
148148
expect(devDependencies['@nx/vite']).toBe('^20.0.0');
149149
expect(devDependencies['jsdom']).toBe('^22.1.0');
150-
expect(devDependencies['vite']).toBe('^5.0.0');
150+
expect(devDependencies['vite']).toBeDefined();
151151
expect(devDependencies['vite-tsconfig-paths']).toBe('^4.2.0');
152-
expect(devDependencies['vitest']).toBe('^2.0.0');
152+
expect(devDependencies['vitest']).toBeDefined();
153153
};
154154

155155
const verifyConfig = (

‎packages/nx-plugin/src/generators/app/versions/dependencies.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export const getAnalogDependencies = (
8484
// install 15.X deps for versions 15.8.0 =< 16.1.0
8585
if (lt(escapedNxVersion, '16.1.0')) {
8686
return {
87-
'@angular/platform-server': angularVersion,
87+
'@angular/platform-server': `^${angularVersion}`,
8888
'@analogjs/content': V15_X_ANALOG_JS_CONTENT,
8989
'@analogjs/router': V15_X_ANALOG_JS_ROUTER,
9090
'front-matter': V15_X_FRONT_MATTER,
@@ -97,7 +97,7 @@ export const getAnalogDependencies = (
9797
// install 16.X deps for versions 16.1.0 =< 16.10.0
9898
if (lt(escapedNxVersion, '17.0.0')) {
9999
return {
100-
'@angular/platform-server': angularVersion,
100+
'@angular/platform-server': `^${angularVersion}`,
101101
'@analogjs/content': V16_X_ANALOG_JS_CONTENT,
102102
'@analogjs/router': V16_X_ANALOG_JS_ROUTER,
103103
'front-matter': V16_X_FRONT_MATTER,
@@ -113,7 +113,7 @@ export const getAnalogDependencies = (
113113
// install 17.X deps for versions <18.0.0
114114
if (lt(escapedNxVersion, '18.0.0')) {
115115
return {
116-
'@angular/platform-server': angularVersion,
116+
'@angular/platform-server': `^${angularVersion}`,
117117
'@analogjs/content': V17_X_ANALOG_JS_CONTENT,
118118
'@analogjs/router': V17_X_ANALOG_JS_ROUTER,
119119
'front-matter': V17_X_FRONT_MATTER,
@@ -128,7 +128,7 @@ export const getAnalogDependencies = (
128128

129129
// return latest 18.X deps for versions >= 18.0.0
130130
return {
131-
'@angular/platform-server': angularVersion,
131+
'@angular/platform-server': `^${angularVersion}`,
132132
'@analogjs/content': V18_X_ANALOG_JS_CONTENT,
133133
'@analogjs/router': V18_X_ANALOG_JS_ROUTER,
134134
'front-matter': V18_X_FRONT_MATTER,

‎packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// dependencies
33
export const V18_X_NX_DEVKIT = '^20.0.0';
44
export const V18_X_NX_ANGULAR = '^20.0.0';
5-
export const V18_X_ANALOG_JS_CONTENT = '^1.10.0';
6-
export const V18_X_ANALOG_JS_ROUTER = '^1.10.0';
7-
export const V18_X_ANALOG_JS_TRPC = '~0.2.46';
8-
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.10.0';
9-
export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^1.10.0';
5+
export const V18_X_ANALOG_JS_CONTENT = '^1.13.0';
6+
export const V18_X_ANALOG_JS_ROUTER = '^1.13.0';
7+
export const V18_X_ANALOG_JS_TRPC = '~0.3.0';
8+
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.13.0';
9+
export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^1.13.0';
1010
export const V18_X_TRPC_CLIENT = '^10.25.0';
1111
export const V18_X_TRPC_SERVER = '^10.25.0';
1212
export const V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -23,12 +23,12 @@ export const V18_X_POSTCSS = '^8.4.5';
2323
export const V18_X_AUTOPREFIXER = '^10.4.0';
2424

2525
// devDependencies
26-
export const V18_X_ANALOG_JS_PLATFORM = '^1.10.0';
26+
export const V18_X_ANALOG_JS_PLATFORM = '^1.13.0';
2727
export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
2828
export const V18_X_NX_VITE = '^20.0.0';
2929
export const V18_X_NX_LINTER = '^20.0.0';
3030
export const V18_X_JSDOM = '^22.1.0';
31-
export const V18_X_VITE = '^5.0.0';
31+
export const V18_X_VITE = '^6.0.0';
3232
export const V18_X_VITE_TSCONFIG_PATHS = '^4.2.0';
33-
export const V18_X_VITEST = '^2.0.0';
33+
export const V18_X_VITEST = '^3.0.0';
3434
export const V18_X_ZOD = '^3.21.4';

‎packages/nx-plugin/src/utils/versions/dev-dependencies.ts

+7
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import {
4444
V19_X_JSDOM,
4545
V19_X_VITE_TSCONFIG_PATHS,
4646
V19_X_VITEST,
47+
V19_X_VITE,
4748
} from './ng_19_X/versions';
4849

4950
const devDependencyKeys = [
@@ -53,6 +54,7 @@ const devDependencyKeys = [
5354
'vite-tsconfig-paths',
5455
'vitest',
5556
'@nx/vite',
57+
'vite',
5658
] as const;
5759
export type AnalogDevDependency = (typeof devDependencyKeys)[number];
5860

@@ -81,6 +83,7 @@ const getDevDependencies = (escapedAngularVersion: string) => {
8183
'@nx/vite': V15_X_NX_VITE,
8284
jsdom: V15_X_JSDOM,
8385
'vite-tsconfig-paths': V15_X_VITE_TSCONFIG_PATHS,
86+
vite: V19_X_VITE,
8487
vitest: V15_X_VITEST,
8588
};
8689
}
@@ -94,6 +97,7 @@ const getDevDependencies = (escapedAngularVersion: string) => {
9497
'@nx/vite': V16_X_NX_VITE,
9598
jsdom: V16_X_JSDOM,
9699
'vite-tsconfig-paths': V16_X_VITE_TSCONFIG_PATHS,
100+
vite: V19_X_VITE,
97101
vitest: V16_X_VITEST,
98102
};
99103
}
@@ -107,6 +111,7 @@ const getDevDependencies = (escapedAngularVersion: string) => {
107111
'@nx/vite': V17_X_NX_VITE,
108112
jsdom: V17_X_JSDOM,
109113
'vite-tsconfig-paths': V17_X_VITE_TSCONFIG_PATHS,
114+
vite: V19_X_VITE,
110115
vitest: V17_X_VITEST,
111116
};
112117
}
@@ -120,6 +125,7 @@ const getDevDependencies = (escapedAngularVersion: string) => {
120125
'@nx/vite': V18_X_NX_VITE,
121126
jsdom: V18_X_JSDOM,
122127
'vite-tsconfig-paths': V18_X_VITE_TSCONFIG_PATHS,
128+
vite: V19_X_VITE,
123129
vitest: V18_X_VITEST,
124130
};
125131
}
@@ -132,6 +138,7 @@ const getDevDependencies = (escapedAngularVersion: string) => {
132138
'@nx/vite': V19_X_NX_VITE,
133139
jsdom: V19_X_JSDOM,
134140
'vite-tsconfig-paths': V19_X_VITE_TSCONFIG_PATHS,
141+
vite: V19_X_VITE,
135142
vitest: V19_X_VITEST,
136143
};
137144
};

‎packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
// V19_X
2-
export const V19_X_ANALOG_JS_ROUTER = '^1.9.0';
3-
export const V19_X_ANALOG_JS_CONTENT = '^1.9.0';
2+
export const V19_X_ANALOG_JS_ROUTER = '^1.13.0';
3+
export const V19_X_ANALOG_JS_CONTENT = '^1.13.0';
44
export const V19_X_MARKED = '^5.0.2';
55
export const V19_X_MARKED_GFM_HEADING_ID = '^3.0.4';
66
export const V19_X_MARKED_HIGHLIGHT = '^2.0.1';
77
export const V19_X_MARKED_MANGLE = '^1.1.7';
88
export const V19_X_PRISMJS = '^1.29.0';
99

1010
// devDependencies
11-
export const V19_X_ANALOG_JS_PLATFORM = '^1.9.0';
12-
export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.9.0';
13-
export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^1.9.0';
11+
export const V19_X_ANALOG_JS_PLATFORM = '^1.13.0';
12+
export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.13.0';
13+
export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^1.13.0';
1414
export const V19_X_NX_ANGULAR = '^20.0.0';
1515
export const V19_X_NX_VITE = '^20.0.0';
1616
export const V19_X_JSDOM = '^22.0.0';
1717
export const V19_X_VITE_TSCONFIG_PATHS = '^4.2.0';
18-
export const V19_X_VITEST = '^2.0.0';
18+
export const V19_X_VITEST = '^3.0.0';
19+
export const V19_X_VITE = '^6.0.0';

‎packages/nx-plugin/tsconfig.lib.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4+
"resolveJsonModule": true,
5+
"esModuleInterop": true,
46
"outDir": "../../dist/out-tsc",
57
"declaration": true,
68
"types": ["node"]

‎packages/platform/package.json

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
"marked-shiki": "^1.1.0",
4545
"shiki": "^1.6.1"
4646
},
47+
"overrides": {
48+
"@nx/vite": {
49+
"vite": "$vite"
50+
}
51+
},
4752
"peerDependenciesMeta": {
4853
"shiki": {
4954
"optional": true

‎packages/platform/src/lib/deps-plugin.ts

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export function depsPlugin(options?: Options): Plugin[] {
2121
'rxfire',
2222
'@ng-web-apis/**',
2323
'@taiga-ui/**',
24+
'@tanstack/angular-query-experimental',
2425
],
2526
},
2627
optimizeDeps: {

0 commit comments

Comments
 (0)