diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e191f2f5..88615a040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# [1.7.0-beta.4](https://github.com/analogjs/analog/compare/v1.7.0-beta.3...v1.7.0-beta.4) (2024-07-26) + +### Bug Fixes + +- **platform:** adjust transform filters for routes ([#1231](https://github.com/analogjs/analog/issues/1231)) ([8b488ff](https://github.com/analogjs/analog/commit/8b488ffd0b97c2db0e6cd067b2dbeefbbfcee523)) + # [1.7.0-beta.3](https://github.com/analogjs/analog/compare/v1.7.0-beta.2...v1.7.0-beta.3) (2024-07-26) ### Features diff --git a/package.json b/package.json index bb0016ff5..fc0b740bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "analogjs-platform", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "license": "MIT", "type": "module", "scripts": { diff --git a/packages/astro-angular/package.json b/packages/astro-angular/package.json index 4ab44b640..31e81a19b 100644 --- a/packages/astro-angular/package.json +++ b/packages/astro-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/astro-angular", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "Use Angular components within Astro", "type": "module", "author": "Brandon Roberts ", @@ -28,7 +28,7 @@ "url": "https://github.com/analogjs/analog.git" }, "dependencies": { - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3" + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4" }, "peerDependencies": { "@angular-devkit/build-angular": ">=16.0.0", diff --git a/packages/content/package.json b/packages/content/package.json index 489149b36..32fe55be8 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/content", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "Content Rendering for Analog", "type": "module", "author": "Brandon Roberts ", diff --git a/packages/create-analog/package.json b/packages/create-analog/package.json index fbca83eca..8fa44a8d3 100644 --- a/packages/create-analog/package.json +++ b/packages/create-analog/package.json @@ -1,6 +1,6 @@ { "name": "create-analog", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "type": "module", "license": "MIT", "author": "Brandon Roberts", diff --git a/packages/create-analog/template-angular-v16/package.json b/packages/create-analog/template-angular-v16/package.json index 8f859057d..785ba150b 100644 --- a/packages/create-analog/template-angular-v16/package.json +++ b/packages/create-analog/template-angular-v16/package.json @@ -15,8 +15,8 @@ "test": "ng test" }, "dependencies": { - "@analogjs/content": "^1.7.0-beta.3", - "@analogjs/router": "^1.7.0-beta.3", + "@analogjs/content": "^1.7.0-beta.4", + "@analogjs/router": "^1.7.0-beta.4", "@angular/animations": "^16.2.0", "@angular/common": "^16.2.0", "@angular/compiler": "^16.2.0", @@ -38,9 +38,9 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@analogjs/platform": "^1.7.0-beta.3", - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3", - "@analogjs/vitest-angular": "^1.7.0-beta.3", + "@analogjs/platform": "^1.7.0-beta.4", + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4", + "@analogjs/vitest-angular": "^1.7.0-beta.4", "@angular-devkit/build-angular": "^16.2.0", "@angular/cli": "^16.2.0", "@angular/compiler-cli": "^16.2.0", diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json index 2be7cfc88..660213fc6 100644 --- a/packages/create-analog/template-angular-v17/package.json +++ b/packages/create-analog/template-angular-v17/package.json @@ -15,8 +15,8 @@ "test": "ng test" }, "dependencies": { - "@analogjs/content": "^1.7.0-beta.3", - "@analogjs/router": "^1.7.0-beta.3", + "@analogjs/content": "^1.7.0-beta.4", + "@analogjs/router": "^1.7.0-beta.4", "@angular/animations": "^17.2.0", "@angular/common": "^17.2.0", "@angular/compiler": "^17.2.0", @@ -38,9 +38,9 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@analogjs/platform": "^1.7.0-beta.3", - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3", - "@analogjs/vitest-angular": "^1.7.0-beta.3", + "@analogjs/platform": "^1.7.0-beta.4", + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4", + "@analogjs/vitest-angular": "^1.7.0-beta.4", "@angular-devkit/build-angular": "^17.2.0", "@angular/cli": "^17.2.0", "@angular/compiler-cli": "^17.2.0", diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json index 62fae97ba..663d0c415 100644 --- a/packages/create-analog/template-blog/package.json +++ b/packages/create-analog/template-blog/package.json @@ -15,8 +15,8 @@ "test": "ng test" }, "dependencies": { - "@analogjs/content": "^1.7.0-beta.3", - "@analogjs/router": "^1.7.0-beta.3", + "@analogjs/content": "^1.7.0-beta.4", + "@analogjs/router": "^1.7.0-beta.4", "@angular/animations": "^18.0.0", "@angular/common": "^18.0.0", "@angular/compiler": "^18.0.0", @@ -35,9 +35,9 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@analogjs/platform": "^1.7.0-beta.3", - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3", - "@analogjs/vitest-angular": "^1.7.0-beta.3", + "@analogjs/platform": "^1.7.0-beta.4", + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4", + "@analogjs/vitest-angular": "^1.7.0-beta.4", "@angular-devkit/build-angular": "^18.0.0", "@angular/cli": "^18.0.0", "@angular/compiler-cli": "^18.0.0", diff --git a/packages/create-analog/template-latest/package.json b/packages/create-analog/template-latest/package.json index bdd8f53b1..03eeb4654 100644 --- a/packages/create-analog/template-latest/package.json +++ b/packages/create-analog/template-latest/package.json @@ -15,8 +15,8 @@ }, "private": true, "dependencies": { - "@analogjs/content": "^1.7.0-beta.3", - "@analogjs/router": "^1.7.0-beta.3", + "@analogjs/content": "^1.7.0-beta.4", + "@analogjs/router": "^1.7.0-beta.4", "@angular/animations": "^18.0.0", "@angular/common": "^18.0.0", "@angular/compiler": "^18.0.0", @@ -37,9 +37,9 @@ "zone.js": "~0.14.3" }, "devDependencies": { - "@analogjs/platform": "^1.7.0-beta.3", - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3", - "@analogjs/vitest-angular": "^1.7.0-beta.3", + "@analogjs/platform": "^1.7.0-beta.4", + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4", + "@analogjs/vitest-angular": "^1.7.0-beta.4", "@angular-devkit/build-angular": "^18.0.0", "@angular/cli": "^18.0.0", "@angular/compiler-cli": "^18.0.0", diff --git a/packages/platform/package.json b/packages/platform/package.json index b735cc548..545d382c8 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/platform", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "The fullstack meta-framework for Angular", "type": "module", "author": "Brandon Roberts ", @@ -25,8 +25,8 @@ }, "dependencies": { "nitropack": "^2.9.0", - "@analogjs/vite-plugin-angular": "^1.7.0-beta.3", - "@analogjs/vite-plugin-nitro": "^1.7.0-beta.3", + "@analogjs/vite-plugin-angular": "^1.7.0-beta.4", + "@analogjs/vite-plugin-nitro": "^1.7.0-beta.4", "vitefu": "^0.2.5" }, "peerDependencies": { diff --git a/packages/platform/src/lib/content-plugin.ts b/packages/platform/src/lib/content-plugin.ts index 6745b5ccd..528adf563 100644 --- a/packages/platform/src/lib/content-plugin.ts +++ b/packages/platform/src/lib/content-plugin.ts @@ -146,11 +146,10 @@ export function contentPlugin( config = _config; root = resolve(workspaceRoot, config.root || '.') || '.'; }, - transform(code, id) { + transform(code) { if ( code.includes('ANALOG_CONTENT_FILE_LIST') && - code.includes('ANALOG_AGX_FILES') && - id.includes('analogjs') + code.includes('ANALOG_AGX_FILES') ) { const contentFilesList: string[] = fg.sync( [ @@ -209,7 +208,7 @@ export function contentPlugin( return { code: result, - map: null, + map: { mappings: '' }, }; } @@ -220,7 +219,7 @@ export function contentPlugin( name: 'analogjs-invalidate-content-dirs', configureServer(server) { function invalidateContent(path: string) { - if (path.includes(normalizePath(`/src/content/`))) { + if (path.includes(normalizePath(`/content/`))) { server.moduleGraph.fileToModulesMap.forEach((mods) => { mods.forEach((mod) => { if ( diff --git a/packages/platform/src/lib/deps-plugin.ts b/packages/platform/src/lib/deps-plugin.ts index 1fe75d636..3c40dd158 100644 --- a/packages/platform/src/lib/deps-plugin.ts +++ b/packages/platform/src/lib/deps-plugin.ts @@ -26,7 +26,6 @@ export function depsPlugin(options?: Options): Plugin[] { ], exclude: [ '@angular/platform-server', - '@analogjs/content', '@analogjs/router', '@nx/angular', '@nx/vite', diff --git a/packages/platform/src/lib/router-plugin.ts b/packages/platform/src/lib/router-plugin.ts index 0ba2474ef..4511d6d6a 100644 --- a/packages/platform/src/lib/router-plugin.ts +++ b/packages/platform/src/lib/router-plugin.ts @@ -1,4 +1,3 @@ -import { VERSION } from '@angular/compiler-cli'; import { normalizePath, Plugin, UserConfig } from 'vite'; import fg from 'fast-glob'; import { resolve } from 'node:path'; @@ -58,11 +57,10 @@ export function routerPlugin(options?: Options): Plugin[] { config = _config; root = resolve(workspaceRoot, config.root || '.') || '.'; }, - transform(code, id) { + transform(code) { if ( - (code.includes('ANALOG_ROUTE_FILES') || - code.includes('ANALOG_CONTENT_ROUTE_FILES')) && - id.includes('analogjs') + code.includes('ANALOG_ROUTE_FILES') || + code.includes('ANALOG_CONTENT_ROUTE_FILES') ) { const routeFiles: string[] = fg.sync( [ @@ -114,7 +112,7 @@ export function routerPlugin(options?: Options): Plugin[] { return { code: result, - map: null, + map: { mappings: '' }, }; } @@ -123,8 +121,8 @@ export function routerPlugin(options?: Options): Plugin[] { }, { name: 'analog-glob-endpoints', - transform(code, id) { - if (code.includes('PAGE_ENDPOINTS') && id.includes('analogjs')) { + transform(code) { + if (code.includes('ANALOG_PAGE_ENDPOINTS')) { const endpointFiles: string[] = fg.sync( [ `${root}/src/app/pages/**/*.server.ts`, @@ -136,9 +134,9 @@ export function routerPlugin(options?: Options): Plugin[] { ); const result = code.replace( - 'let PAGE_ENDPOINTS = {};', + 'let ANALOG_PAGE_ENDPOINTS = {};', ` - let PAGE_ENDPOINTS = {${endpointFiles.map( + let ANALOG_PAGE_ENDPOINTS = {${endpointFiles.map( (module) => `"${module.replace(root, '')}": () => import('${module}')` )}}; @@ -147,7 +145,7 @@ export function routerPlugin(options?: Options): Plugin[] { return { code: result, - map: null, + map: { mappings: '' }, }; } diff --git a/packages/router/package.json b/packages/router/package.json index 5a9789a69..cb5de3f84 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/router", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "Filesystem-based routing for Angular", "type": "module", "author": "Brandon Roberts ", @@ -24,7 +24,7 @@ "@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" }, "optionalDependencies": { - "@analogjs/content": "^1.7.0-beta.3" + "@analogjs/content": "^1.7.0-beta.4" }, "dependencies": { "tslib": "^2.0.0" diff --git a/packages/router/src/lib/endpoints.ts b/packages/router/src/lib/endpoints.ts index a47cf2eab..54b983050 100644 --- a/packages/router/src/lib/endpoints.ts +++ b/packages/router/src/lib/endpoints.ts @@ -5,4 +5,4 @@ export const ANALOG_META_KEY = Symbol( /** * This variable reference is replaced with a glob of all route endpoints. */ -export let PAGE_ENDPOINTS: any = {}; +export let ANALOG_PAGE_ENDPOINTS: any = {}; diff --git a/packages/router/src/lib/route-config.ts b/packages/router/src/lib/route-config.ts index a12583329..386aa7b3e 100644 --- a/packages/router/src/lib/route-config.ts +++ b/packages/router/src/lib/route-config.ts @@ -6,7 +6,7 @@ import { firstValueFrom } from 'rxjs'; import { RedirectRouteMeta, RouteConfig, RouteMeta } from './models'; import { ROUTE_META_TAGS_KEY } from './meta-tags'; -import { PAGE_ENDPOINTS, ANALOG_META_KEY } from './endpoints'; +import { ANALOG_PAGE_ENDPOINTS, ANALOG_META_KEY } from './endpoints'; export function toRouteConfig(routeMeta: RouteMeta | undefined): RouteConfig { if (routeMeta && isRedirectRouteMeta(routeMeta)) { @@ -36,7 +36,7 @@ export function toRouteConfig(routeMeta: RouteMeta | undefined): RouteConfig { [ANALOG_META_KEY]: { endpoint: string; endpointKey: string }; }; - if (PAGE_ENDPOINTS[routeConfig[ANALOG_META_KEY].endpointKey]) { + if (ANALOG_PAGE_ENDPOINTS[routeConfig[ANALOG_META_KEY].endpointKey]) { const { queryParams, fragment: hash, params, parent } = route; const segment = parent?.url.map((segment) => segment.path).join('/') || ''; diff --git a/packages/vite-plugin-angular/package.json b/packages/vite-plugin-angular/package.json index 1b7042965..5a70d7036 100644 --- a/packages/vite-plugin-angular/package.json +++ b/packages/vite-plugin-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vite-plugin-angular", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "Vite Plugin for Angular", "type": "module", "keywords": [ diff --git a/packages/vite-plugin-nitro/package.json b/packages/vite-plugin-nitro/package.json index c6d02f762..9aab1f510 100644 --- a/packages/vite-plugin-nitro/package.json +++ b/packages/vite-plugin-nitro/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vite-plugin-nitro", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "A Vite plugin for adding a nitro API server", "type": "module", "author": "Brandon Roberts ", diff --git a/packages/vitest-angular/package.json b/packages/vitest-angular/package.json index 1e9b2e3a1..427dc0d21 100644 --- a/packages/vitest-angular/package.json +++ b/packages/vitest-angular/package.json @@ -1,6 +1,6 @@ { "name": "@analogjs/vitest-angular", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "Vitest Builder for Angular", "type": "module", "author": "Brandon Roberts ",