@analogjs/platform 2.4.0-beta.9 → 2.5.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -4
- package/src/lib/deps-plugin.js +7 -5
- package/src/lib/nx-plugin/executors.json +5 -0
- package/src/lib/nx-plugin/generators.json +25 -0
- package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/test-setup.ts__template__ +1 -0
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +5 -5
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +5 -5
- package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/test-files/src/test-setup.ts__template__ +1 -0
- package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/files/src/test-setup.ts__template__ +1 -0
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts +5 -5
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js +5 -5
- package/src/lib/platform-plugin.js +1 -1
- package/src/lib/router-plugin.js +35 -17
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@analogjs/platform",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.0-beta.1",
|
|
4
4
|
"description": "The fullstack meta-framework for Angular",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "Brandon Roberts <robertsbt@gmail.com>",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"nitropack": "^2.13.1",
|
|
32
|
-
"@analogjs/vite-plugin-angular": "^2.
|
|
33
|
-
"@analogjs/vite-plugin-nitro": "^2.
|
|
32
|
+
"@analogjs/vite-plugin-angular": "^2.5.0-beta.1",
|
|
33
|
+
"@analogjs/vite-plugin-nitro": "^2.5.0-beta.1",
|
|
34
34
|
"vitefu": "^1.1.2"
|
|
35
35
|
},
|
|
36
36
|
"peerDependencies": {
|
|
@@ -85,7 +85,8 @@
|
|
|
85
85
|
"@analogjs/storybook-angular",
|
|
86
86
|
"@analogjs/vite-plugin-angular",
|
|
87
87
|
"@analogjs/vite-plugin-nitro",
|
|
88
|
-
"@analogjs/vitest-angular"
|
|
88
|
+
"@analogjs/vitest-angular",
|
|
89
|
+
"@analogjs/angular-compiler"
|
|
89
90
|
],
|
|
90
91
|
"migrations": "./migrations/migration.json"
|
|
91
92
|
},
|
package/src/lib/deps-plugin.js
CHANGED
|
@@ -7,12 +7,14 @@ export function depsPlugin(options) {
|
|
|
7
7
|
{
|
|
8
8
|
name: 'analogjs-deps-plugin',
|
|
9
9
|
config() {
|
|
10
|
-
const
|
|
11
|
-
options?.vite?.experimental?.useAngularCompilationAPI
|
|
10
|
+
const useCompilationAPI = options?.vite === false ||
|
|
11
|
+
options?.vite?.experimental?.useAngularCompilationAPI;
|
|
12
|
+
const useAnalogCompiler = options?.vite !== false &&
|
|
13
|
+
options?.vite?.experimental?.useAnalogCompiler;
|
|
14
|
+
const esbuild = useCompilationAPI || useAnalogCompiler
|
|
12
15
|
? {}
|
|
13
16
|
: { exclude: ['**/*.ts', '**/*.js'] };
|
|
14
|
-
const oxc =
|
|
15
|
-
options?.vite?.experimental?.useAngularCompilationAPI
|
|
17
|
+
const oxc = useCompilationAPI || useAnalogCompiler
|
|
16
18
|
? {}
|
|
17
19
|
: { exclude: ['**/*.ts', '**/*.js'] };
|
|
18
20
|
return {
|
|
@@ -80,4 +82,4 @@ export function depsPlugin(options) {
|
|
|
80
82
|
},
|
|
81
83
|
];
|
|
82
84
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcy1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2RlcHMtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFJNUMsTUFBTSxVQUFVLFVBQVUsQ0FBQyxPQUFpQjtJQUMxQyxNQUFNLGFBQWEsR0FBRyxPQUFPLEVBQUUsYUFBYSxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUU5RCxPQUFPO1FBQ0w7WUFDRSxJQUFJLEVBQUUsc0JBQXNCO1lBQzVCLE1BQU07Z0JBQ0osTUFBTSxpQkFBaUIsR0FDckIsT0FBTyxFQUFFLElBQUksS0FBSyxLQUFLO29CQUN2QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSx3QkFBd0IsQ0FBQztnQkFDeEQsTUFBTSxpQkFBaUIsR0FDckIsT0FBTyxFQUFFLElBQUksS0FBSyxLQUFLO29CQUN2QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxpQkFBaUIsQ0FBQztnQkFFakQsTUFBTSxPQUFPLEdBQ1gsaUJBQWlCLElBQUksaUJBQWlCO29CQUNwQyxDQUFDLENBQUMsRUFBRTtvQkFDSixDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUUsQ0FBQztnQkFFMUMsTUFBTSxHQUFHLEdBQ1AsaUJBQWlCLElBQUksaUJBQWlCO29CQUNwQyxDQUFDLENBQUMsRUFBRTtvQkFDSixDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUUsQ0FBQztnQkFFMUMsT0FBTztvQkFDTCxHQUFHLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQztvQkFDakQsR0FBRyxFQUFFO3dCQUNILFVBQVUsRUFBRTs0QkFDVixjQUFjOzRCQUNkLGFBQWE7NEJBQ2IsbUJBQW1COzRCQUNuQixRQUFROzRCQUNSLGlCQUFpQjs0QkFDakIsY0FBYzs0QkFDZCxzQ0FBc0M7eUJBQ3ZDO3FCQUNGO29CQUNELFlBQVksRUFBRTt3QkFDWixPQUFPLEVBQUU7NEJBQ1AsaUJBQWlCOzRCQUNqQixzQkFBc0I7NEJBQ3RCLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUU7Z0NBQzVCLENBQUMsQ0FBQyxDQUFDLDRCQUE0QixDQUFDO2dDQUNoQyxDQUFDLENBQUMsRUFBRSxDQUFDOzRCQUNQLGNBQWM7eUJBQ2Y7d0JBQ0QsT0FBTyxFQUFFOzRCQUNQLDBCQUEwQjs0QkFDMUIsbUJBQW1COzRCQUNuQixrQkFBa0I7NEJBQ2xCLGFBQWE7NEJBQ2IsVUFBVTs0QkFDVixZQUFZOzRCQUNaLFFBQVE7NEJBQ1IsWUFBWTs0QkFDWixhQUFhOzRCQUNiLFVBQVU7NEJBQ1YsUUFBUTs0QkFDUixZQUFZOzRCQUNaLGFBQWE7NEJBQ2IsU0FBUzs0QkFDVCxlQUFlOzRCQUNmLFlBQVk7NEJBQ1osdUJBQXVCOzRCQUN2QixZQUFZOzRCQUNaLFNBQVM7NEJBQ1QsVUFBVTs0QkFDVixJQUFJO3lCQUNMO3FCQUNGO2lCQUNGLENBQUM7WUFDSixDQUFDO1NBQ0Y7UUFDRDtZQUNFLElBQUksRUFBRSw2QkFBNkI7WUFDbkMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFPLEVBQUU7Z0JBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sa0JBQWtCLENBQUM7b0JBQ3pDLElBQUksRUFBRSxhQUFhO29CQUNuQixPQUFPLEVBQUUsT0FBTyxLQUFLLE9BQU87b0JBQzVCLGNBQWMsRUFBRSxNQUFNO29CQUN0Qix3QkFBd0IsQ0FBQyxPQUFPO3dCQUM5QixPQUFPLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUNqRSxDQUFDO2lCQUNGLENBQUMsQ0FBQztnQkFDSCxPQUFPLFNBQVMsQ0FBQztZQUNuQixDQUFDO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
{
|
|
2
|
+
"builders": {
|
|
3
|
+
"vite-dev-server": "@analogjs/vite-plugin-angular:vite-dev-server",
|
|
4
|
+
"vite": "@analogjs/vite-plugin-angular:vite",
|
|
5
|
+
"vitest": "@analogjs/vitest-angular:test"
|
|
6
|
+
},
|
|
2
7
|
"executors": {
|
|
3
8
|
"vite-dev-server": {
|
|
4
9
|
"implementation": "./src/executors/vite-dev-server/vite-dev-server.impl",
|
|
@@ -33,5 +33,30 @@
|
|
|
33
33
|
"description": "Migrate and configure an Angular SPA to use Analog.",
|
|
34
34
|
"aliases": ["migrate"]
|
|
35
35
|
}
|
|
36
|
+
},
|
|
37
|
+
"schematics": {
|
|
38
|
+
"application": {
|
|
39
|
+
"factory": "./src/generators/app/compat",
|
|
40
|
+
"schema": "./src/generators/app/schema.json",
|
|
41
|
+
"description": "Generates an Analog application",
|
|
42
|
+
"aliases": ["app"]
|
|
43
|
+
},
|
|
44
|
+
"page": {
|
|
45
|
+
"factory": "./src/generators/page/generator#analogPageGeneratorSchematic",
|
|
46
|
+
"schema": "./src/generators/page/schema.json",
|
|
47
|
+
"description": "Creates a new Analog page in the given or default project.",
|
|
48
|
+
"aliases": ["p"]
|
|
49
|
+
},
|
|
50
|
+
"setup-vitest": {
|
|
51
|
+
"factory": "./src/generators/setup-vitest/compat",
|
|
52
|
+
"schema": "./src/generators/setup-vitest/schema.json",
|
|
53
|
+
"description": "Setup the Vitest configuration."
|
|
54
|
+
},
|
|
55
|
+
"init": {
|
|
56
|
+
"factory": "./src/generators/init/compat",
|
|
57
|
+
"schema": "./src/generators/init/schema.json",
|
|
58
|
+
"description": "Migrate and configure an Angular SPA to use Analog.",
|
|
59
|
+
"aliases": ["migrate"]
|
|
60
|
+
}
|
|
36
61
|
}
|
|
37
62
|
}
|
package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/test-setup.ts__template__
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<% if (majorAngularVersion > 20) { %>
|
|
2
2
|
import '@angular/compiler';
|
|
3
3
|
import '@analogjs/vitest-angular/setup-snapshots';
|
|
4
|
+
import '@analogjs/vitest-angular/setup-serializers';
|
|
4
5
|
import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
|
|
5
6
|
|
|
6
7
|
setupTestBed();
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export declare const V18_X_NX_DEVKIT = "^20.0.0";
|
|
2
2
|
export declare const V18_X_NX_ANGULAR = "^20.0.0";
|
|
3
|
-
export declare const V18_X_ANALOG_JS_CONTENT = "^2.
|
|
4
|
-
export declare const V18_X_ANALOG_JS_ROUTER = "^2.
|
|
3
|
+
export declare const V18_X_ANALOG_JS_CONTENT = "^2.5.0-beta.1";
|
|
4
|
+
export declare const V18_X_ANALOG_JS_ROUTER = "^2.5.0-beta.1";
|
|
5
5
|
export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
|
|
6
|
-
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.
|
|
7
|
-
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.
|
|
6
|
+
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.5.0-beta.1";
|
|
7
|
+
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.5.0-beta.1";
|
|
8
8
|
export declare const V18_X_TRPC_CLIENT = "^10.25.0";
|
|
9
9
|
export declare const V18_X_TRPC_SERVER = "^10.25.0";
|
|
10
10
|
export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
|
|
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
|
|
|
20
20
|
export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
|
|
21
21
|
export declare const V18_X_POSTCSS = "^8.5.3";
|
|
22
22
|
export declare const V18_X_AUTOPREFIXER = "^10.4.0";
|
|
23
|
-
export declare const V18_X_ANALOG_JS_PLATFORM = "^2.
|
|
23
|
+
export declare const V18_X_ANALOG_JS_PLATFORM = "^2.5.0-beta.1";
|
|
24
24
|
export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
|
|
25
25
|
export declare const V18_X_NX_VITE = "^21.0.0";
|
|
26
26
|
export declare const V18_X_NX_LINTER = "^21.0.0";
|
|
@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
|
|
|
5
5
|
// dependencies
|
|
6
6
|
exports.V18_X_NX_DEVKIT = '^20.0.0';
|
|
7
7
|
exports.V18_X_NX_ANGULAR = '^20.0.0';
|
|
8
|
-
exports.V18_X_ANALOG_JS_CONTENT = '^2.
|
|
9
|
-
exports.V18_X_ANALOG_JS_ROUTER = '^2.
|
|
8
|
+
exports.V18_X_ANALOG_JS_CONTENT = '^2.5.0-beta.1';
|
|
9
|
+
exports.V18_X_ANALOG_JS_ROUTER = '^2.5.0-beta.1';
|
|
10
10
|
exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
|
|
11
|
-
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.
|
|
12
|
-
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.
|
|
11
|
+
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.5.0-beta.1';
|
|
12
|
+
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.5.0-beta.1';
|
|
13
13
|
exports.V18_X_TRPC_CLIENT = '^10.25.0';
|
|
14
14
|
exports.V18_X_TRPC_SERVER = '^10.25.0';
|
|
15
15
|
exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
|
|
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
|
|
|
26
26
|
exports.V18_X_POSTCSS = '^8.5.3';
|
|
27
27
|
exports.V18_X_AUTOPREFIXER = '^10.4.0';
|
|
28
28
|
// devDependencies
|
|
29
|
-
exports.V18_X_ANALOG_JS_PLATFORM = '^2.
|
|
29
|
+
exports.V18_X_ANALOG_JS_PLATFORM = '^2.5.0-beta.1';
|
|
30
30
|
exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
|
|
31
31
|
exports.V18_X_NX_VITE = '^21.0.0';
|
|
32
32
|
exports.V18_X_NX_LINTER = '^21.0.0';
|
|
@@ -9,7 +9,7 @@ function updateIndex(tree, schema) {
|
|
|
9
9
|
const newIndexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'index.html');
|
|
10
10
|
if (tree.exists(indexPath)) {
|
|
11
11
|
const indexContents = tree.read(indexPath, 'utf-8');
|
|
12
|
-
let updatedIndex = indexContents.replace('</body>', `<script type="module" src="
|
|
12
|
+
let updatedIndex = indexContents.replace('</body>', `<script type="module" src="/src/main.ts"></script></body>`);
|
|
13
13
|
updatedIndex = updatedIndex.replace(`"favicon.ico"`, `"/favicon.ico"`);
|
|
14
14
|
tree.write(indexPath, updatedIndex);
|
|
15
15
|
tree.rename(indexPath, newIndexPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,2DAA2D,CAC5D,CAAC;QACF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<% if (majorAngularVersion > 20) { %>
|
|
2
2
|
import '@angular/compiler';
|
|
3
3
|
import '@analogjs/vitest-angular/setup-snapshots';
|
|
4
|
+
import '@analogjs/vitest-angular/setup-serializers';
|
|
4
5
|
import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
|
|
5
6
|
|
|
6
7
|
setupTestBed();
|
|
@@ -13,7 +13,7 @@ exports[`preset generator > should match index.html 1`] = `
|
|
|
13
13
|
</head>
|
|
14
14
|
<body>
|
|
15
15
|
<app-root></app-root>
|
|
16
|
-
<script type="module" src="/
|
|
16
|
+
<script type="module" src="/src/main.ts"></script>
|
|
17
17
|
</body>
|
|
18
18
|
</html>
|
|
19
19
|
"
|
|
@@ -90,6 +90,7 @@ exports[`preset generator > should match project.json 1`] = `
|
|
|
90
90
|
exports[`preset generator > should match src/test-setup.ts 1`] = `
|
|
91
91
|
"import '@angular/compiler';
|
|
92
92
|
import '@analogjs/vitest-angular/setup-snapshots';
|
|
93
|
+
import '@analogjs/vitest-angular/setup-serializers';
|
|
93
94
|
import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
|
|
94
95
|
|
|
95
96
|
setupTestBed();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<% if (majorAngularVersion > 20) { %>
|
|
2
2
|
import '@angular/compiler';
|
|
3
3
|
import '@analogjs/vitest-angular/setup-snapshots';
|
|
4
|
+
import '@analogjs/vitest-angular/setup-serializers';
|
|
4
5
|
import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
|
|
5
6
|
|
|
6
7
|
setupTestBed();
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
export declare const V19_X_ANALOG_JS_ROUTER = "^2.
|
|
2
|
-
export declare const V19_X_ANALOG_JS_CONTENT = "^2.
|
|
1
|
+
export declare const V19_X_ANALOG_JS_ROUTER = "^2.5.0-beta.1";
|
|
2
|
+
export declare const V19_X_ANALOG_JS_CONTENT = "^2.5.0-beta.1";
|
|
3
3
|
export declare const V19_X_MARKED = "^15.0.7";
|
|
4
4
|
export declare const V19_X_MARKED_GFM_HEADING_ID = "^4.1.1";
|
|
5
5
|
export declare const V19_X_MARKED_HIGHLIGHT = "^2.2.1";
|
|
6
6
|
export declare const V19_X_MARKED_MANGLE = "^1.1.10";
|
|
7
7
|
export declare const V19_X_PRISMJS = "^1.29.0";
|
|
8
|
-
export declare const V19_X_ANALOG_JS_PLATFORM = "^2.
|
|
9
|
-
export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.
|
|
10
|
-
export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.
|
|
8
|
+
export declare const V19_X_ANALOG_JS_PLATFORM = "^2.5.0-beta.1";
|
|
9
|
+
export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.5.0-beta.1";
|
|
10
|
+
export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.5.0-beta.1";
|
|
11
11
|
export declare const V19_X_NX_ANGULAR = "^22.0.0";
|
|
12
12
|
export declare const V19_X_NX_VITE = "^22.0.0";
|
|
13
13
|
export declare const V19_X_JSDOM = "^22.0.0";
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
|
|
4
4
|
// V19_X
|
|
5
|
-
exports.V19_X_ANALOG_JS_ROUTER = '^2.
|
|
6
|
-
exports.V19_X_ANALOG_JS_CONTENT = '^2.
|
|
5
|
+
exports.V19_X_ANALOG_JS_ROUTER = '^2.5.0-beta.1';
|
|
6
|
+
exports.V19_X_ANALOG_JS_CONTENT = '^2.5.0-beta.1';
|
|
7
7
|
exports.V19_X_MARKED = '^15.0.7';
|
|
8
8
|
exports.V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
|
|
9
9
|
exports.V19_X_MARKED_HIGHLIGHT = '^2.2.1';
|
|
10
10
|
exports.V19_X_MARKED_MANGLE = '^1.1.10';
|
|
11
11
|
exports.V19_X_PRISMJS = '^1.29.0';
|
|
12
12
|
// devDependencies
|
|
13
|
-
exports.V19_X_ANALOG_JS_PLATFORM = '^2.
|
|
14
|
-
exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.
|
|
15
|
-
exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.
|
|
13
|
+
exports.V19_X_ANALOG_JS_PLATFORM = '^2.5.0-beta.1';
|
|
14
|
+
exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.5.0-beta.1';
|
|
15
|
+
exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.5.0-beta.1';
|
|
16
16
|
exports.V19_X_NX_ANGULAR = '^22.0.0';
|
|
17
17
|
exports.V19_X_NX_VITE = '^22.0.0';
|
|
18
18
|
exports.V19_X_JSDOM = '^22.0.0';
|
|
@@ -59,4 +59,4 @@ export function platformPlugin(opts = {}) {
|
|
|
59
59
|
clearClientPageEndpointsPlugin(),
|
|
60
60
|
];
|
|
61
61
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxlQUFlLE1BQU0sNkJBQTZCLENBQUM7QUFDMUQsT0FBTyxPQUFPLE1BQU0sK0JBQStCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZ0IsRUFBRTtJQUMvQyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLE1BQU0sSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM3RSxNQUFNLEVBQUUsR0FBRyxlQUFlLEVBQUUsR0FBRztRQUM3QixHQUFHLEVBQUUsSUFBSTtRQUNULEdBQUcsSUFBSTtLQUNSLENBQUM7SUFFRixJQUFJLFlBQVksR0FBRyxlQUFlLEVBQUUsS0FBSyxDQUFDO0lBRTFDLElBQUksWUFBWSxFQUFFLFVBQVUsRUFBRSxDQUFDO1FBQzdCLFlBQVksR0FBRztZQUNiLEdBQUcsWUFBWTtZQUNmLFVBQVUsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQ3JELENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxFQUFFO2dCQUNmLE9BQU87b0JBQ0wsR0FBRyxNQUFNO29CQUNULENBQUMsSUFBSSxDQUFDLEVBQUU7d0JBQ04sR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDO3dCQUNmLE9BQU8sRUFBRTs0QkFDUCxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPOzRCQUN2QixpQkFBaUIsRUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxTQUFTO3lCQUM1QztxQkFDVDtpQkFDRixDQUFDO1lBQ0osQ0FBQyxFQUNELFlBQVksQ0FBQyxVQUFVLENBQ3hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPO1FBQ0wsR0FBRyxlQUFlLENBQUMsZUFBZSxFQUFFLFlBQVksQ0FBQztRQUNqRCxHQUFHLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxjQUFjLEVBQUUsRUFBRSxHQUFHLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3pFLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDL0MsR0FBRyxZQUFZLENBQUMsZUFBZSxDQUFDO1FBQ2hDLEdBQUcsYUFBYSxDQUFDLGVBQWUsRUFBRSxPQUFPLEVBQUUsZUFBZSxDQUFDO1FBQzNELEdBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxLQUFLLEtBQUs7WUFDdkIsQ0FBQyxDQUFDLEVBQUU7WUFDSixDQUFDLENBQUMsT0FBTyxDQUFDO2dCQUNOLEdBQUcsRUFBRSxlQUFlLENBQUMsR0FBRztnQkFDeEIsYUFBYSxFQUFFLGVBQWUsQ0FBQyxhQUFhO2dCQUM1QyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsbUJBQW1CLElBQUksS0FBSztnQkFDakUsT0FBTyxFQUFFO29CQUNQLEdBQUcsQ0FBQyxlQUFlLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztvQkFDbEMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxtQkFBbUIsSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQ2hELENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sZUFBZSxDQUN2QztpQkFDRjtnQkFDRCxxQkFBcUIsRUFBRSxlQUFlLENBQUMscUJBQXFCO2dCQUM1RCxVQUFVLEVBQUUsZUFBZSxDQUFDLFVBQVU7Z0JBQ3RDLHFCQUFxQixFQUFFLGVBQWUsQ0FBQyxxQkFBcUI7Z0JBQzVELGdCQUFnQixFQUFFLGVBQWUsQ0FBQyxnQkFBZ0I7Z0JBQ2xELEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQzthQUN0QixDQUFDLENBQVM7UUFDZixnQkFBZ0IsRUFBRTtRQUNsQixpQkFBaUIsRUFBWTtRQUM3Qiw4QkFBOEIsRUFBWTtLQUMzQyxDQUFDO0FBQ0osQ0FBQyJ9
|
package/src/lib/router-plugin.js
CHANGED
|
@@ -23,6 +23,23 @@ export function routerPlugin(options) {
|
|
|
23
23
|
const workspaceRoot = normalizePath(options?.workspaceRoot ?? process.cwd());
|
|
24
24
|
let config;
|
|
25
25
|
let root;
|
|
26
|
+
const isRouteLikeFile = (path) => path.includes(`routes`) ||
|
|
27
|
+
path.includes(`pages`) ||
|
|
28
|
+
path.includes('content');
|
|
29
|
+
const invalidateFileModules = (server, path) => {
|
|
30
|
+
const normalizedPath = normalizePath(path);
|
|
31
|
+
// A newly added page can be discovered before its final contents settle.
|
|
32
|
+
// Invalidate the page module itself so later edits don't keep serving the
|
|
33
|
+
// first incomplete transform from Vite's module graph.
|
|
34
|
+
const fileModules = server.moduleGraph.getModulesByFile?.(normalizedPath) ??
|
|
35
|
+
server.moduleGraph.fileToModulesMap.get(normalizedPath);
|
|
36
|
+
fileModules?.forEach((mod) => {
|
|
37
|
+
server.moduleGraph.invalidateModule(mod);
|
|
38
|
+
mod.importers.forEach((imp) => {
|
|
39
|
+
server.moduleGraph.invalidateModule(imp);
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
};
|
|
26
43
|
return [
|
|
27
44
|
{
|
|
28
45
|
name: 'analogjs-router-invalidate-routes',
|
|
@@ -34,25 +51,26 @@ export function routerPlugin(options) {
|
|
|
34
51
|
* @param path The file path that was added or deleted
|
|
35
52
|
*/
|
|
36
53
|
function invalidateRoutes(path) {
|
|
37
|
-
if (path
|
|
38
|
-
|
|
39
|
-
path.includes('content')) {
|
|
40
|
-
server.moduleGraph.fileToModulesMap.forEach((mods) => {
|
|
41
|
-
mods.forEach((mod) => {
|
|
42
|
-
if (mod.id?.includes('analogjs') && mod.id?.includes('fesm')) {
|
|
43
|
-
server.moduleGraph.invalidateModule(mod);
|
|
44
|
-
mod.importers.forEach((imp) => {
|
|
45
|
-
server.moduleGraph.invalidateModule(imp);
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
|
-
server.ws.send({
|
|
51
|
-
type: 'full-reload',
|
|
52
|
-
});
|
|
54
|
+
if (!isRouteLikeFile(path)) {
|
|
55
|
+
return;
|
|
53
56
|
}
|
|
57
|
+
invalidateFileModules(server, path);
|
|
58
|
+
server.moduleGraph.fileToModulesMap.forEach((mods) => {
|
|
59
|
+
mods.forEach((mod) => {
|
|
60
|
+
if (mod.id?.includes('analogjs') && mod.id?.includes('fesm')) {
|
|
61
|
+
server.moduleGraph.invalidateModule(mod);
|
|
62
|
+
mod.importers.forEach((imp) => {
|
|
63
|
+
server.moduleGraph.invalidateModule(imp);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
server.ws.send({
|
|
69
|
+
type: 'full-reload',
|
|
70
|
+
});
|
|
54
71
|
}
|
|
55
72
|
server.watcher.on('add', invalidateRoutes);
|
|
73
|
+
server.watcher.on('change', invalidateRoutes);
|
|
56
74
|
server.watcher.on('unlink', invalidateRoutes);
|
|
57
75
|
},
|
|
58
76
|
},
|
|
@@ -149,4 +167,4 @@ export function routerPlugin(options) {
|
|
|
149
167
|
},
|
|
150
168
|
];
|
|
151
169
|
}
|
|
152
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvcm91dGVyLXBsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFxQyxNQUFNLE1BQU0sQ0FBQztBQUN4RSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFJcEM7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBaUJHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FBQyxPQUFpQjtJQUM1QyxNQUFNLGFBQWEsR0FBRyxhQUFhLENBQUMsT0FBTyxFQUFFLGFBQWEsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUM3RSxJQUFJLE1BQWtCLENBQUM7SUFDdkIsSUFBSSxJQUFZLENBQUM7SUFDakIsTUFBTSxlQUFlLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztRQUN2QixJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQztRQUN0QixJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzNCLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxNQUFxQixFQUFFLElBQVksRUFBRSxFQUFFO1FBQ3BFLE1BQU0sY0FBYyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzQyx5RUFBeUU7UUFDekUsMEVBQTBFO1FBQzFFLHVEQUF1RDtRQUN2RCxNQUFNLFdBQVcsR0FDZixNQUFNLENBQUMsV0FBVyxDQUFDLGdCQUFnQixFQUFFLENBQUMsY0FBYyxDQUFDO1lBQ3JELE1BQU0sQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBRTFELFdBQVcsRUFBRSxPQUFP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
|