@analogjs/platform 2.0.0-alpha.9 → 2.0.0-beta.2
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 +21 -7
- package/src/lib/content-plugin.js +3 -14
- package/src/lib/nx-plugin/README.md +1 -1
- package/src/lib/nx-plugin/executors.json +3 -15
- package/src/lib/nx-plugin/generators.json +10 -6
- package/src/lib/nx-plugin/src/generators/app/files/template-angular/package.json__template__ +3 -0
- package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.component.ts__template__ +1 -2
- package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.config.server.ts__template__ +2 -1
- package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/app/app.config.ts__template__ +30 -0
- package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/main.server.ts__template__ +8 -0
- package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/test-setup.ts__template__ +28 -0
- package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.app.json__template__ +2 -2
- package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/vite.config.ts__template__ +14 -21
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v15/vite.config.ts__template__ +1 -2
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__ +1 -2
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/vite.config.ts__template__ +1 -2
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/src/main.server.ts__template__ +3 -27
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/vite.config.ts__template__ +3 -12
- package/src/lib/nx-plugin/src/generators/app/generator.d.ts +1 -0
- package/src/lib/nx-plugin/src/generators/app/generator.js +47 -20
- package/src/lib/nx-plugin/src/generators/app/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js +14 -8
- package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.d.ts +3 -0
- package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js +58 -0
- package/src/lib/nx-plugin/src/generators/app/lib/add-angular-app.js.map +1 -0
- package/src/lib/nx-plugin/src/generators/app/lib/add-files.js +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-files.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.d.ts +2 -0
- package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.js +47 -0
- package/src/lib/nx-plugin/src/generators/app/lib/add-vite-plugin.js.map +1 -0
- package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.d.ts +3 -0
- package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.js +23 -0
- package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.js.map +1 -0
- package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.d.ts +2 -0
- package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js +16 -0
- package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js.map +1 -0
- package/src/lib/nx-plugin/src/generators/app/versions/dependencies.d.ts +3 -7
- package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js +23 -55
- package/src/lib/nx-plugin/src/generators/app/versions/dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js +23 -65
- package/src/lib/nx-plugin/src/generators/app/versions/dev-dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js +15 -41
- package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.d.ts +3 -3
- package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.js +3 -3
- package/src/lib/nx-plugin/src/generators/app/versions/nx_17_X/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +8 -8
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +8 -8
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js +16 -40
- package/src/lib/nx-plugin/src/generators/app/versions/trpc-dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions.d.ts +1 -24
- package/src/lib/nx-plugin/src/generators/app/versions.js +2 -29
- package/src/lib/nx-plugin/src/generators/app/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/files/src/app/app.config.server.ts__template__ +10 -0
- package/src/lib/nx-plugin/src/generators/init/files/src/main.server.ts__template__ +14 -0
- package/src/lib/nx-plugin/src/generators/init/files/src/server/routes/api/v1/hello.ts__template__ +3 -0
- package/src/lib/nx-plugin/src/generators/init/generator.js +5 -2
- package/src/lib/nx-plugin/src/generators/init/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js +4 -1
- package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js +2 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js +10 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js.map +1 -1
- 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/lib/update-package-json.js +12 -5
- package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js +5 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-test-tsconfig.js +1 -1
- package/src/lib/nx-plugin/src/generators/init/test-files/src/test-setup.ts__template__ +16 -0
- package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap +151 -0
- package/src/lib/nx-plugin/src/generators/preset/generator.js +3 -0
- package/src/lib/nx-plugin/src/generators/preset/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/files/src/test-setup.ts__template__ +16 -0
- package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js +5 -2
- package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/lib/update-tsconfig.js +1 -1
- package/src/lib/nx-plugin/src/utils/versions/dependencies.js +29 -57
- package/src/lib/nx-plugin/src/utils/versions/dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/utils/versions/dev-dependencies.js +31 -59
- package/src/lib/nx-plugin/src/utils/versions/dev-dependencies.js.map +1 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.d.ts +3 -3
- package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.js +3 -3
- package/src/lib/nx-plugin/src/utils/versions/ng_17_X/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.d.ts +4 -4
- package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.js +4 -4
- package/src/lib/nx-plugin/src/utils/versions/ng_18_X/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts +8 -8
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js +8 -8
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js.map +1 -1
- package/src/lib/options.d.ts +8 -0
- package/src/lib/platform-plugin.js +3 -1
- package/src/lib/router-plugin.js +3 -5
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/.eslintrc.json__template__ +0 -36
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/index.html__template__ +0 -15
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/app/app.config.ts__template__ +0 -18
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/main.server.ts__template__ +0 -23
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v16/src/test-setup.ts__template__ +0 -12
- package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/.eslintrc.json__template__ +0 -36
- package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.d.ts +0 -30
- package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.js +0 -37
- package/src/lib/nx-plugin/src/generators/app/versions/nx_15_X/versions.js.map +0 -1
- package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.d.ts +0 -29
- package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.js +0 -36
- package/src/lib/nx-plugin/src/generators/app/versions/nx_16_X/versions.js.map +0 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.d.ts +0 -15
- package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.js +0 -21
- package/src/lib/nx-plugin/src/utils/versions/ng_15_X/versions.js.map +0 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.d.ts +0 -15
- package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.js +0 -21
- package/src/lib/nx-plugin/src/utils/versions/ng_16_X/versions.js.map +0 -1
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/public/assets → template-angular/public}/.gitkeep__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/public/assets → template-angular/public}/analog.svg__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src → template-angular/public}/favicon.ico__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/app/app.component.spec.ts__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/main.ts__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16/src/server/routes → template-angular/src/server/routes/api}/v1/hello.ts__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/styles.css__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/src/vite-env.d.ts__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.editor.json__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.json__template__ +0 -0
- /package/src/lib/nx-plugin/src/generators/app/files/{template-angular-v16 → template-angular}/tsconfig.spec.json__template__ +0 -0
|
@@ -22,7 +22,8 @@ function updateServeTarget(tree, schema) {
|
|
|
22
22
|
};
|
|
23
23
|
if (tree.exists(angularJsonPath)) {
|
|
24
24
|
(0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
|
|
25
|
-
json.projects[schema.project].root =
|
|
25
|
+
json.projects[schema.project].root =
|
|
26
|
+
json.projects[schema.project].root || '.';
|
|
26
27
|
json.projects[schema.project].architect.serve = {
|
|
27
28
|
builder: '@analogjs/platform:vite-dev-server',
|
|
28
29
|
...commonConfig,
|
|
@@ -37,6 +38,9 @@ function updateServeTarget(tree, schema) {
|
|
|
37
38
|
executor: '@analogjs/platform:vite-dev-server',
|
|
38
39
|
...commonConfig,
|
|
39
40
|
};
|
|
41
|
+
projectConfig.targets.build.outputs = [
|
|
42
|
+
`{workspaceRoot}/dist/apps/${projectConfig.name}`,
|
|
43
|
+
];
|
|
40
44
|
(0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
|
|
41
45
|
}
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,8CAsDC;AA/DD,uCAKoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,QAAQ;YACtC,IAAI,EAAE,IAAI;SACX;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBAClD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;aAClD;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EACR,IAAI,EACJ,eAAe,EACf,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI;gBAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,oCAAoC;gBAC7C,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,GAAG,YAAY;SAChB,CAAC;QACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG;YACpC,6BAA6B,aAAa,CAAC,IAAI,EAAE;SAClD,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
|
|
@@ -10,7 +10,7 @@ function updateTestTsConfig(tree, schema) {
|
|
|
10
10
|
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|
|
11
11
|
json.compilerOptions ??= {};
|
|
12
12
|
json.compilerOptions.module = undefined;
|
|
13
|
-
json.compilerOptions.target ??= '
|
|
13
|
+
json.compilerOptions.target ??= 'es2022';
|
|
14
14
|
json.compilerOptions.types = ['vitest/globals', 'node'];
|
|
15
15
|
json.files = ['src/test-setup.ts'];
|
|
16
16
|
return json;
|
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
<% if (majorAngularVersion > 19) { %>
|
|
2
|
+
import '@angular/compiler';
|
|
3
|
+
import '@analogjs/vitest-angular/setup-zone';
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
BrowserTestingModule,
|
|
7
|
+
platformBrowserTesting,
|
|
8
|
+
} from '@angular/platform-browser/testing';
|
|
9
|
+
import { getTestBed } from '@angular/core/testing';
|
|
10
|
+
|
|
11
|
+
getTestBed().initTestEnvironment(
|
|
12
|
+
BrowserTestingModule,
|
|
13
|
+
platformBrowserTesting()
|
|
14
|
+
);
|
|
15
|
+
<% } else { %>
|
|
1
16
|
import '@analogjs/vitest-angular/setup-zone';
|
|
2
17
|
|
|
3
18
|
import {
|
|
@@ -10,3 +25,4 @@ getTestBed().initTestEnvironment(
|
|
|
10
25
|
BrowserDynamicTestingModule,
|
|
11
26
|
platformBrowserDynamicTesting()
|
|
12
27
|
);
|
|
28
|
+
<% } %>
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
2
|
+
|
|
3
|
+
exports[`preset generator > should match index.html 1`] = `
|
|
4
|
+
"<!doctype html>
|
|
5
|
+
<html lang="en">
|
|
6
|
+
<head>
|
|
7
|
+
<meta charset="utf-8" />
|
|
8
|
+
<title>my-app</title>
|
|
9
|
+
<base href="/" />
|
|
10
|
+
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
11
|
+
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
|
12
|
+
<link rel="stylesheet" href="/src/styles.css" />
|
|
13
|
+
</head>
|
|
14
|
+
<body>
|
|
15
|
+
<app-root></app-root>
|
|
16
|
+
<script type="module" src="/my-app/src/main.ts"></script>
|
|
17
|
+
</body>
|
|
18
|
+
</html>
|
|
19
|
+
"
|
|
20
|
+
`;
|
|
21
|
+
|
|
22
|
+
exports[`preset generator > should match project.json 1`] = `
|
|
23
|
+
"{
|
|
24
|
+
"name": "my-app",
|
|
25
|
+
"$schema": "../node_modules/nx/schemas/project-schema.json",
|
|
26
|
+
"projectType": "application",
|
|
27
|
+
"prefix": "app",
|
|
28
|
+
"sourceRoot": "my-app/src",
|
|
29
|
+
"tags": ["tag1", "tag2", "type:app"],
|
|
30
|
+
"targets": {
|
|
31
|
+
"build": {
|
|
32
|
+
"executor": "@analogjs/platform:vite",
|
|
33
|
+
"options": {
|
|
34
|
+
"configFile": "my-app/vite.config.ts",
|
|
35
|
+
"main": "my-app/src/main.ts",
|
|
36
|
+
"outputPath": "dist/my-app/client",
|
|
37
|
+
"tsConfig": "my-app/tsconfig.app.json"
|
|
38
|
+
},
|
|
39
|
+
"defaultConfiguration": "production",
|
|
40
|
+
"configurations": {
|
|
41
|
+
"development": {
|
|
42
|
+
"mode": "development"
|
|
43
|
+
},
|
|
44
|
+
"production": {
|
|
45
|
+
"sourcemap": false,
|
|
46
|
+
"mode": "production"
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
"outputs": ["{workspaceRoot}/dist/apps/my-app"]
|
|
50
|
+
},
|
|
51
|
+
"serve": {
|
|
52
|
+
"executor": "@analogjs/platform:vite-dev-server",
|
|
53
|
+
"defaultConfiguration": "development",
|
|
54
|
+
"options": {
|
|
55
|
+
"buildTarget": "my-app:build",
|
|
56
|
+
"port": 4200
|
|
57
|
+
},
|
|
58
|
+
"configurations": {
|
|
59
|
+
"development": {
|
|
60
|
+
"buildTarget": "my-app:build:development",
|
|
61
|
+
"hmr": true
|
|
62
|
+
},
|
|
63
|
+
"production": {
|
|
64
|
+
"buildTarget": "my-app:build:production"
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
"extract-i18n": {
|
|
69
|
+
"executor": "@angular/build:extract-i18n",
|
|
70
|
+
"options": {
|
|
71
|
+
"buildTarget": "my-app:build"
|
|
72
|
+
}
|
|
73
|
+
},
|
|
74
|
+
"test": {
|
|
75
|
+
"executor": "@analogjs/vitest-angular:test",
|
|
76
|
+
"options": {
|
|
77
|
+
"config": "vite.config.ts"
|
|
78
|
+
}
|
|
79
|
+
},
|
|
80
|
+
"serve-static": {
|
|
81
|
+
"continuous": true,
|
|
82
|
+
"executor": "@nx/web:file-server",
|
|
83
|
+
"options": {
|
|
84
|
+
"buildTarget": "my-app:build",
|
|
85
|
+
"port": 4200,
|
|
86
|
+
"staticFilePath": "dist/my-app/browser",
|
|
87
|
+
"spa": true
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
"
|
|
93
|
+
`;
|
|
94
|
+
|
|
95
|
+
exports[`preset generator > should match src/test-setup.ts 1`] = `
|
|
96
|
+
"import '@angular/compiler';
|
|
97
|
+
import '@analogjs/vitest-angular/setup-zone';
|
|
98
|
+
|
|
99
|
+
import {
|
|
100
|
+
BrowserTestingModule,
|
|
101
|
+
platformBrowserTesting,
|
|
102
|
+
} from '@angular/platform-browser/testing';
|
|
103
|
+
import { getTestBed } from '@angular/core/testing';
|
|
104
|
+
|
|
105
|
+
getTestBed().initTestEnvironment(
|
|
106
|
+
BrowserTestingModule,
|
|
107
|
+
platformBrowserTesting(),
|
|
108
|
+
);
|
|
109
|
+
"
|
|
110
|
+
`;
|
|
111
|
+
|
|
112
|
+
exports[`preset generator > should match vite.config.ts 1`] = `
|
|
113
|
+
"/// <reference types="vitest" />
|
|
114
|
+
|
|
115
|
+
import analog from '@analogjs/platform';
|
|
116
|
+
import { defineConfig } from 'vite';
|
|
117
|
+
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
|
|
118
|
+
|
|
119
|
+
// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
|
|
120
|
+
import tailwindcss from '@tailwindcss/vite';
|
|
121
|
+
|
|
122
|
+
// https://vitejs.dev/config/
|
|
123
|
+
export default defineConfig(({ mode }) => {
|
|
124
|
+
return {
|
|
125
|
+
root: __dirname,
|
|
126
|
+
cacheDir: \`../node_modules/.vite\`,
|
|
127
|
+
build: {
|
|
128
|
+
outDir: '../dist/./my-app/client',
|
|
129
|
+
reportCompressedSize: true,
|
|
130
|
+
target: ['es2020'],
|
|
131
|
+
},
|
|
132
|
+
server: {
|
|
133
|
+
fs: {
|
|
134
|
+
allow: ['.'],
|
|
135
|
+
},
|
|
136
|
+
},
|
|
137
|
+
plugins: [tailwindcss(), analog(), nxViteTsPaths()],
|
|
138
|
+
test: {
|
|
139
|
+
globals: true,
|
|
140
|
+
environment: 'jsdom',
|
|
141
|
+
setupFiles: ['src/test-setup.ts'],
|
|
142
|
+
include: ['**/*.spec.ts'],
|
|
143
|
+
reporters: ['default'],
|
|
144
|
+
},
|
|
145
|
+
define: {
|
|
146
|
+
'import.meta.vitest': mode !== 'production',
|
|
147
|
+
},
|
|
148
|
+
};
|
|
149
|
+
});
|
|
150
|
+
"
|
|
151
|
+
`;
|
|
@@ -34,7 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.default = default_1;
|
|
37
|
+
const devkit_1 = require("@nx/devkit");
|
|
37
38
|
async function default_1(tree, options) {
|
|
39
|
+
(0, devkit_1.ensurePackage)('@nx/angular', devkit_1.NX_VERSION);
|
|
40
|
+
(0, devkit_1.ensurePackage)('@angular-devkit/build-angular', 'latest');
|
|
38
41
|
return await Promise.resolve().then(() => __importStar(require('../app/generator'))).then(({ appGenerator }) => appGenerator(tree, options));
|
|
39
42
|
}
|
|
40
43
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4BAOC;AAVD,uCAA6D;AAG9C,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,IAAA,sBAAa,EAAC,aAAa,EAAE,mBAAU,CAAC,CAAC;IACzC,IAAA,sBAAa,EAAC,+BAA+B,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
<% if (majorAngularVersion > 19) { %>
|
|
2
|
+
import '@angular/compiler';
|
|
3
|
+
import '@analogjs/vitest-angular/setup-zone';
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
BrowserTestingModule,
|
|
7
|
+
platformBrowserTesting,
|
|
8
|
+
} from '@angular/platform-browser/testing';
|
|
9
|
+
import { getTestBed } from '@angular/core/testing';
|
|
10
|
+
|
|
11
|
+
getTestBed().initTestEnvironment(
|
|
12
|
+
BrowserTestingModule,
|
|
13
|
+
platformBrowserTesting()
|
|
14
|
+
);
|
|
15
|
+
<% } else { %>
|
|
1
16
|
import '@analogjs/vitest-angular/setup-zone';
|
|
2
17
|
|
|
3
18
|
import {
|
|
@@ -10,3 +25,4 @@ getTestBed().initTestEnvironment(
|
|
|
10
25
|
BrowserDynamicTestingModule,
|
|
11
26
|
platformBrowserDynamicTesting()
|
|
12
27
|
);
|
|
28
|
+
<% } %>
|
|
@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupVitestGenerator = setupVitestGenerator;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
|
+
const semver_1 = require("semver");
|
|
6
7
|
const version_utils_1 = require("../../utils/version-utils");
|
|
7
8
|
const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
|
|
8
9
|
const update_test_target_1 = require("./lib/update-test-target");
|
|
9
10
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
10
|
-
function addFiles(tree, options) {
|
|
11
|
+
function addFiles(tree, options, majorAngularVersion) {
|
|
11
12
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
12
13
|
const isNx = tree.exists('/nx.json');
|
|
13
14
|
const projectConfig = projects.get(options.project);
|
|
14
15
|
const templateOptions = {
|
|
15
16
|
...options,
|
|
17
|
+
majorAngularVersion,
|
|
16
18
|
addNxPaths: isNx,
|
|
17
19
|
template: '',
|
|
18
20
|
};
|
|
@@ -20,11 +22,12 @@ function addFiles(tree, options) {
|
|
|
20
22
|
}
|
|
21
23
|
async function setupVitestGenerator(tree, options) {
|
|
22
24
|
const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
|
|
25
|
+
const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
|
|
23
26
|
const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
|
|
24
27
|
(0, add_analog_dependencies_1.addAnalogDependencies)(tree, angularVersion, nxVersion);
|
|
25
28
|
(0, update_tsconfig_1.updateTsConfig)(tree, options);
|
|
26
29
|
(0, update_test_target_1.updateTestTarget)(tree, options);
|
|
27
|
-
addFiles(tree, options);
|
|
30
|
+
addFiles(tree, options, majorAngularVersion);
|
|
28
31
|
await (0, devkit_1.formatFiles)(tree);
|
|
29
32
|
return () => {
|
|
30
33
|
(0, devkit_1.installPackagesTask)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/setup-vitest/generator.ts"],"names":[],"mappings":";;AAyCA,oDAoBC;AA7DD,uCAMoB;AACpB,yCAAiC;AACjC,mCAAuC;AAEvC,6DAAuE;AACvE,2EAAsE;AACtE,iEAA4D;AAC5D,2DAAuD;AAGvD,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAErC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,mBAAmB;QACnB,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IACvD,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -10,7 +10,7 @@ function updateTsConfig(tree, schema) {
|
|
|
10
10
|
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|
|
11
11
|
json.compilerOptions ??= {};
|
|
12
12
|
json.compilerOptions.module = undefined;
|
|
13
|
-
json.compilerOptions.target ??= '
|
|
13
|
+
json.compilerOptions.target ??= 'es2022';
|
|
14
14
|
json.files = ['src/test-setup.ts'];
|
|
15
15
|
json.compilerOptions.types = (json.compilerOptions.types ?? ['node'])
|
|
16
16
|
.filter((type) => type !== 'jest')
|
|
@@ -2,12 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAnalogDependencies = void 0;
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
|
-
const versions_1 = require("./ng_16_X/versions");
|
|
6
5
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const versions_5 = require("./ng_19_X/versions");
|
|
6
|
+
const versions_1 = require("./ng_17_X/versions");
|
|
7
|
+
const versions_2 = require("./ng_18_X/versions");
|
|
8
|
+
const versions_3 = require("./ng_19_X/versions");
|
|
11
9
|
const dependencyKeys = [
|
|
12
10
|
'@analogjs/content',
|
|
13
11
|
'@analogjs/router',
|
|
@@ -24,72 +22,46 @@ const getAnalogDependencies = (ngVersion) => {
|
|
|
24
22
|
};
|
|
25
23
|
exports.getAnalogDependencies = getAnalogDependencies;
|
|
26
24
|
const getDependencies = (escapedAngularVersion) => {
|
|
27
|
-
// fail out for versions <
|
|
28
|
-
if ((0, semver_1.lt)(escapedAngularVersion, '15.0.0')) {
|
|
29
|
-
throw new Error((0, devkit_1.stripIndents) `Angular v15.0.0 or newer is required.`);
|
|
30
|
-
}
|
|
31
|
-
// install 15.x deps for versions <16.0.0
|
|
32
|
-
if ((0, semver_1.lt)(escapedAngularVersion, '16.0.0')) {
|
|
33
|
-
return {
|
|
34
|
-
'@analogjs/content': versions_3.V15_X_ANALOG_JS_CONTENT,
|
|
35
|
-
'@analogjs/router': versions_3.V15_X_ANALOG_JS_ROUTER,
|
|
36
|
-
'@nx/angular': versions_3.V15_X_NX_ANGULAR,
|
|
37
|
-
marked: versions_3.V15_X_MARKED,
|
|
38
|
-
'marked-gfm-heading-id': versions_3.V15_X_MARKED_GFM_HEADING_ID,
|
|
39
|
-
'marked-highlight': versions_3.V15_X_MARKED_HIGHLIGHT,
|
|
40
|
-
'marked-mangle': versions_3.V15_X_MARKED_MANGLE,
|
|
41
|
-
prismjs: versions_3.V15_X_PRISMJS,
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
// install 16.x deps for versions <17.0.0
|
|
25
|
+
// fail out for versions <17.0.0
|
|
45
26
|
if ((0, semver_1.lt)(escapedAngularVersion, '17.0.0')) {
|
|
46
|
-
|
|
47
|
-
'@analogjs/content': versions_1.V16_X_ANALOG_JS_CONTENT,
|
|
48
|
-
'@analogjs/router': versions_1.V16_X_ANALOG_JS_ROUTER,
|
|
49
|
-
'@nx/angular': versions_1.V16_X_NX_ANGULAR,
|
|
50
|
-
marked: versions_1.V16_X_MARKED,
|
|
51
|
-
'marked-gfm-heading-id': versions_1.V16_X_MARKED_GFM_HEADING_ID,
|
|
52
|
-
'marked-highlight': versions_1.V16_X_MARKED_HIGHLIGHT,
|
|
53
|
-
'marked-mangle': versions_1.V16_X_MARKED_MANGLE,
|
|
54
|
-
prismjs: versions_1.V16_X_PRISMJS,
|
|
55
|
-
};
|
|
27
|
+
throw new Error((0, devkit_1.stripIndents) `Angular v17.0.0 or newer is required.`);
|
|
56
28
|
}
|
|
57
29
|
// install 17.x deps for versions <18.0.0
|
|
58
30
|
if ((0, semver_1.lt)(escapedAngularVersion, '18.0.0')) {
|
|
59
31
|
return {
|
|
60
|
-
'@analogjs/content':
|
|
61
|
-
'@analogjs/router':
|
|
62
|
-
'@nx/angular':
|
|
63
|
-
marked:
|
|
64
|
-
'marked-gfm-heading-id':
|
|
65
|
-
'marked-highlight':
|
|
66
|
-
'marked-mangle':
|
|
67
|
-
prismjs:
|
|
32
|
+
'@analogjs/content': versions_1.V17_X_ANALOG_JS_CONTENT,
|
|
33
|
+
'@analogjs/router': versions_1.V17_X_ANALOG_JS_ROUTER,
|
|
34
|
+
'@nx/angular': versions_1.V17_X_NX_ANGULAR,
|
|
35
|
+
marked: versions_1.V17_X_MARKED,
|
|
36
|
+
'marked-gfm-heading-id': versions_1.V17_X_MARKED_GFM_HEADING_ID,
|
|
37
|
+
'marked-highlight': versions_1.V17_X_MARKED_HIGHLIGHT,
|
|
38
|
+
'marked-mangle': versions_1.V17_X_MARKED_MANGLE,
|
|
39
|
+
prismjs: versions_1.V17_X_PRISMJS,
|
|
68
40
|
};
|
|
69
41
|
}
|
|
70
42
|
// install 18.x deps for versions <19.0.0
|
|
71
43
|
if ((0, semver_1.lt)(escapedAngularVersion, '19.0.0')) {
|
|
72
44
|
return {
|
|
73
|
-
'@analogjs/content':
|
|
74
|
-
'@analogjs/router':
|
|
75
|
-
'@nx/angular':
|
|
76
|
-
marked:
|
|
77
|
-
'marked-gfm-heading-id':
|
|
78
|
-
'marked-highlight':
|
|
79
|
-
'marked-mangle':
|
|
80
|
-
prismjs:
|
|
45
|
+
'@analogjs/content': versions_2.V18_X_ANALOG_JS_CONTENT,
|
|
46
|
+
'@analogjs/router': versions_2.V18_X_ANALOG_JS_ROUTER,
|
|
47
|
+
'@nx/angular': versions_2.V18_X_NX_ANGULAR,
|
|
48
|
+
marked: versions_2.V18_X_MARKED,
|
|
49
|
+
'marked-gfm-heading-id': versions_2.V18_X_MARKED_GFM_HEADING_ID,
|
|
50
|
+
'marked-highlight': versions_2.V18_X_MARKED_HIGHLIGHT,
|
|
51
|
+
'marked-mangle': versions_2.V18_X_MARKED_MANGLE,
|
|
52
|
+
prismjs: versions_2.V18_X_PRISMJS,
|
|
81
53
|
};
|
|
82
54
|
}
|
|
83
55
|
// return latest 19.x deps for versions >19.0.0
|
|
84
56
|
return {
|
|
85
|
-
'@analogjs/content':
|
|
86
|
-
'@analogjs/router':
|
|
87
|
-
'@nx/angular':
|
|
88
|
-
marked:
|
|
89
|
-
'marked-gfm-heading-id':
|
|
90
|
-
'marked-highlight':
|
|
91
|
-
'marked-mangle':
|
|
92
|
-
prismjs:
|
|
57
|
+
'@analogjs/content': versions_3.V19_X_ANALOG_JS_CONTENT,
|
|
58
|
+
'@analogjs/router': versions_3.V19_X_ANALOG_JS_ROUTER,
|
|
59
|
+
'@nx/angular': versions_3.V19_X_NX_ANGULAR,
|
|
60
|
+
marked: versions_3.V19_X_MARKED,
|
|
61
|
+
'marked-gfm-heading-id': versions_3.V19_X_MARKED_GFM_HEADING_ID,
|
|
62
|
+
'marked-highlight': versions_3.V19_X_MARKED_HIGHLIGHT,
|
|
63
|
+
'marked-mangle': versions_3.V19_X_MARKED_MANGLE,
|
|
64
|
+
prismjs: versions_3.V19_X_PRISMJS,
|
|
93
65
|
};
|
|
94
66
|
};
|
|
95
67
|
//# sourceMappingURL=dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/utils/versions/dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/utils/versions/dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,uCAA0C;AAC1C,iDAS4B;AAC5B,iDAS4B;AAC5B,iDAS4B;AAE5B,MAAM,cAAc,GAAG;IACrB,mBAAmB;IACnB,kBAAkB;IAClB,aAAa;IACb,QAAQ;IACR,uBAAuB;IACvB,kBAAkB;IAClB,SAAS;CACD,CAAC;AAGJ,MAAM,qBAAqB,GAAG,CACnC,SAAiB,EACiB,EAAE;IACpC,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IAEvD,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;AAC7B,CAAC,CAAC;AARW,QAAA,qBAAqB,yBAQhC;AAEF,MAAM,eAAe,GAAG,CAAC,qBAA6B,EAAE,EAAE;IACxD,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,uCAAuC,CAAC,CAAC;IACvE,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,aAAa,EAAE,2BAAgB;YAC/B,MAAM,EAAE,uBAAY;YACpB,uBAAuB,EAAE,sCAA2B;YACpD,kBAAkB,EAAE,iCAAsB;YAC1C,eAAe,EAAE,8BAAmB;YACpC,OAAO,EAAE,wBAAa;SACvB,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,mBAAmB,EAAE,kCAAuB;YAC5C,kBAAkB,EAAE,iCAAsB;YAC1C,aAAa,EAAE,2BAAgB;YAC/B,MAAM,EAAE,uBAAY;YACpB,uBAAuB,EAAE,sCAA2B;YACpD,kBAAkB,EAAE,iCAAsB;YAC1C,eAAe,EAAE,8BAAmB;YACpC,OAAO,EAAE,wBAAa;SACvB,CAAC;IACJ,CAAC;IAED,+CAA+C;IAC/C,OAAO;QACL,mBAAmB,EAAE,kCAAuB;QAC5C,kBAAkB,EAAE,iCAAsB;QAC1C,aAAa,EAAE,2BAAgB;QAC/B,MAAM,EAAE,uBAAY;QACpB,uBAAuB,EAAE,sCAA2B;QACpD,kBAAkB,EAAE,iCAAsB;QAC1C,eAAe,EAAE,8BAAmB;QACpC,OAAO,EAAE,wBAAa;KACvB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -2,12 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAnalogDevDependencies = void 0;
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
|
-
const versions_1 = require("./ng_16_X/versions");
|
|
6
5
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const versions_5 = require("./ng_19_X/versions");
|
|
6
|
+
const versions_1 = require("./ng_17_X/versions");
|
|
7
|
+
const versions_2 = require("./ng_18_X/versions");
|
|
8
|
+
const versions_3 = require("./ng_19_X/versions");
|
|
11
9
|
const devDependencyKeys = [
|
|
12
10
|
'@analogjs/platform',
|
|
13
11
|
'@analogjs/vite-plugin-angular',
|
|
@@ -25,76 +23,50 @@ const getAnalogDevDependencies = (ngVersion, nxVersion) => {
|
|
|
25
23
|
};
|
|
26
24
|
exports.getAnalogDevDependencies = getAnalogDevDependencies;
|
|
27
25
|
const getDevDependencies = (escapedAngularVersion, escapedNxVersion) => {
|
|
28
|
-
// fail out for versions <
|
|
29
|
-
if ((0, semver_1.lt)(escapedAngularVersion, '15.0.0')) {
|
|
30
|
-
throw new Error((0, devkit_1.stripIndents) `Angular v15.0.0 or newer is required.`);
|
|
31
|
-
}
|
|
32
|
-
// install 15.x deps for versions <16.0.0
|
|
33
|
-
if ((0, semver_1.lt)(escapedAngularVersion, '16.0.0')) {
|
|
34
|
-
return {
|
|
35
|
-
'@analogjs/platform': versions_3.V15_X_ANALOG_JS_PLATFORM,
|
|
36
|
-
'@analogjs/vite-plugin-angular': versions_3.V15_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
|
|
37
|
-
'@analogjs/vitest-angular': versions_3.V15_X_ANALOG_JS_VITEST_ANGULAR,
|
|
38
|
-
'@nx/vite': versions_3.V15_X_NX_VITE,
|
|
39
|
-
jsdom: versions_3.V15_X_JSDOM,
|
|
40
|
-
'vite-tsconfig-paths': versions_3.V15_X_VITE_TSCONFIG_PATHS,
|
|
41
|
-
vite: versions_5.V19_X_VITE,
|
|
42
|
-
vitest: versions_3.V15_X_VITEST,
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
// install 16.x deps for versions <17.0.0
|
|
26
|
+
// fail out for versions <17.0.0
|
|
46
27
|
if ((0, semver_1.lt)(escapedAngularVersion, '17.0.0')) {
|
|
47
|
-
|
|
48
|
-
'@analogjs/platform': versions_1.V16_X_ANALOG_JS_PLATFORM,
|
|
49
|
-
'@analogjs/vite-plugin-angular': versions_1.V16_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
|
|
50
|
-
'@analogjs/vitest-angular': versions_1.V16_X_ANALOG_JS_VITEST_ANGULAR,
|
|
51
|
-
'@nx/vite': versions_1.V16_X_NX_VITE,
|
|
52
|
-
jsdom: versions_1.V16_X_JSDOM,
|
|
53
|
-
'vite-tsconfig-paths': versions_1.V16_X_VITE_TSCONFIG_PATHS,
|
|
54
|
-
vite: versions_5.V19_X_VITE,
|
|
55
|
-
vitest: versions_1.V16_X_VITEST,
|
|
56
|
-
};
|
|
28
|
+
throw new Error((0, devkit_1.stripIndents) `Angular v17.0.0 or newer is required.`);
|
|
57
29
|
}
|
|
58
30
|
// install 17.x deps for versions <18.0.0
|
|
59
31
|
if ((0, semver_1.lt)(escapedAngularVersion, '18.0.0')) {
|
|
60
32
|
return {
|
|
61
|
-
'@analogjs/platform':
|
|
62
|
-
'@analogjs/vite-plugin-angular':
|
|
63
|
-
'@analogjs/vitest-angular':
|
|
64
|
-
'@nx/vite':
|
|
65
|
-
jsdom:
|
|
66
|
-
'vite-tsconfig-paths':
|
|
67
|
-
vite:
|
|
68
|
-
vitest:
|
|
33
|
+
'@analogjs/platform': versions_1.V17_X_ANALOG_JS_PLATFORM,
|
|
34
|
+
'@analogjs/vite-plugin-angular': versions_1.V17_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
|
|
35
|
+
'@analogjs/vitest-angular': versions_1.V17_X_ANALOG_JS_VITEST_ANGULAR,
|
|
36
|
+
'@nx/vite': versions_1.V17_X_NX_VITE,
|
|
37
|
+
jsdom: versions_1.V17_X_JSDOM,
|
|
38
|
+
'vite-tsconfig-paths': versions_1.V17_X_VITE_TSCONFIG_PATHS,
|
|
39
|
+
vite: versions_3.V19_X_VITE,
|
|
40
|
+
vitest: versions_1.V17_X_VITEST,
|
|
69
41
|
};
|
|
70
42
|
}
|
|
71
43
|
// install 18.x deps for versions <19.0.0
|
|
72
44
|
if ((0, semver_1.lt)(escapedAngularVersion, '19.0.0')) {
|
|
73
45
|
return {
|
|
74
|
-
'@analogjs/platform':
|
|
75
|
-
'@analogjs/vite-plugin-angular':
|
|
76
|
-
'@analogjs/vitest-angular':
|
|
77
|
-
'@nx/vite':
|
|
78
|
-
jsdom:
|
|
79
|
-
'vite-tsconfig-paths':
|
|
80
|
-
vite:
|
|
81
|
-
vitest:
|
|
46
|
+
'@analogjs/platform': versions_2.V18_X_ANALOG_JS_PLATFORM,
|
|
47
|
+
'@analogjs/vite-plugin-angular': versions_2.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
|
|
48
|
+
'@analogjs/vitest-angular': versions_2.V18_X_ANALOG_JS_VITEST_ANGULAR,
|
|
49
|
+
'@nx/vite': versions_2.V18_X_NX_VITE,
|
|
50
|
+
jsdom: versions_2.V18_X_JSDOM,
|
|
51
|
+
'vite-tsconfig-paths': versions_2.V18_X_VITE_TSCONFIG_PATHS,
|
|
52
|
+
vite: versions_3.V19_X_VITE,
|
|
53
|
+
vitest: versions_2.V18_X_VITEST,
|
|
82
54
|
};
|
|
83
55
|
}
|
|
84
56
|
// return latest 19.x deps for versions >=19.0.0
|
|
85
57
|
return {
|
|
86
|
-
'@analogjs/platform':
|
|
87
|
-
'@analogjs/vite-plugin-angular':
|
|
88
|
-
'@analogjs/vitest-angular':
|
|
89
|
-
'@nx/vite':
|
|
90
|
-
jsdom:
|
|
91
|
-
'vite-tsconfig-paths':
|
|
58
|
+
'@analogjs/platform': versions_3.V19_X_ANALOG_JS_PLATFORM,
|
|
59
|
+
'@analogjs/vite-plugin-angular': versions_3.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
|
|
60
|
+
'@analogjs/vitest-angular': versions_3.V19_X_ANALOG_JS_VITEST_ANGULAR,
|
|
61
|
+
'@nx/vite': versions_3.V19_X_NX_VITE,
|
|
62
|
+
jsdom: versions_3.V19_X_JSDOM,
|
|
63
|
+
'vite-tsconfig-paths': versions_3.V19_X_VITE_TSCONFIG_PATHS,
|
|
92
64
|
vite: escapedNxVersion && (0, semver_1.lt)(escapedNxVersion, '20.5.0')
|
|
93
|
-
?
|
|
94
|
-
:
|
|
65
|
+
? versions_3.V19_X_VITE
|
|
66
|
+
: versions_3.NX_X_LATEST_VITE,
|
|
95
67
|
vitest: escapedNxVersion && (0, semver_1.lt)(escapedNxVersion, '20.5.0')
|
|
96
|
-
?
|
|
97
|
-
:
|
|
68
|
+
? versions_3.V19_X_VITEST
|
|
69
|
+
: versions_3.NX_X_LATEST_VITEST,
|
|
98
70
|
};
|
|
99
71
|
};
|
|
100
72
|
//# sourceMappingURL=dev-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/utils/versions/dev-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"dev-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/utils/versions/dev-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,uCAA0C;AAC1C,iDAQ4B;AAC5B,iDAQ4B;AAC5B,iDAW4B;AAE5B,MAAM,iBAAiB,GAAG;IACxB,oBAAoB;IACpB,+BAA+B;IAC/B,OAAO;IACP,qBAAqB;IACrB,QAAQ;IACR,UAAU;IACV,MAAM;CACE,CAAC;AAGJ,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACjB,SAAkB,EACmB,EAAE;IACvC,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1E,MAAM,eAAe,GAAG,kBAAkB,CACxC,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;IAEF,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;AAChC,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC;AAEF,MAAM,kBAAkB,GAAG,CACzB,qBAA6B,EAC7B,gBAA+B,EAC/B,EAAE;IACF,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,uCAAuC,CAAC,CAAC;IACvE,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,oBAAoB,EAAE,mCAAwB;YAC9C,+BAA+B,EAAE,8CAAmC;YACpE,0BAA0B,EAAE,yCAA8B;YAC1D,UAAU,EAAE,wBAAa;YACzB,KAAK,EAAE,sBAAW;YAClB,qBAAqB,EAAE,oCAAyB;YAChD,IAAI,EAAE,qBAAU;YAChB,MAAM,EAAE,uBAAY;SACrB,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAA,WAAE,EAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,oBAAoB,EAAE,mCAAwB;YAC9C,+BAA+B,EAAE,8CAAmC;YACpE,0BAA0B,EAAE,yCAA8B;YAC1D,UAAU,EAAE,wBAAa;YACzB,KAAK,EAAE,sBAAW;YAClB,qBAAqB,EAAE,oCAAyB;YAChD,IAAI,EAAE,qBAAU;YAChB,MAAM,EAAE,uBAAY;SACrB,CAAC;IACJ,CAAC;IAED,gDAAgD;IAChD,OAAO;QACL,oBAAoB,EAAE,mCAAwB;QAC9C,+BAA+B,EAAE,8CAAmC;QACpE,0BAA0B,EAAE,yCAA8B;QAC1D,UAAU,EAAE,wBAAa;QACzB,KAAK,EAAE,sBAAW;QAClB,qBAAqB,EAAE,oCAAyB;QAChD,IAAI,EACF,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC;YAChD,CAAC,CAAC,qBAAU;YACZ,CAAC,CAAC,2BAAgB;QACtB,MAAM,EACJ,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC;YAChD,CAAC,CAAC,uBAAY;YACd,CAAC,CAAC,6BAAkB;KACzB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export declare const V17_X_ANALOG_JS_ROUTER = "^1.7.0";
|
|
2
2
|
export declare const V17_X_ANALOG_JS_CONTENT = "^1.7.0";
|
|
3
3
|
export declare const V17_X_MARKED = "^5.0.2";
|
|
4
|
-
export declare const V17_X_MARKED_GFM_HEADING_ID = "^
|
|
5
|
-
export declare const V17_X_MARKED_HIGHLIGHT = "^2.
|
|
6
|
-
export declare const V17_X_MARKED_MANGLE = "^1.1.
|
|
4
|
+
export declare const V17_X_MARKED_GFM_HEADING_ID = "^4.1.1";
|
|
5
|
+
export declare const V17_X_MARKED_HIGHLIGHT = "^2.2.1";
|
|
6
|
+
export declare const V17_X_MARKED_MANGLE = "^1.1.10";
|
|
7
7
|
export declare const V17_X_PRISMJS = "^1.29.0";
|
|
8
8
|
export declare const V17_X_ANALOG_JS_PLATFORM = "^1.7.0";
|
|
9
9
|
export declare const V17_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^1.7.0";
|
|
@@ -5,9 +5,9 @@ exports.V17_X_VITEST = exports.V17_X_VITE_TSCONFIG_PATHS = exports.V17_X_JSDOM =
|
|
|
5
5
|
exports.V17_X_ANALOG_JS_ROUTER = '^1.7.0';
|
|
6
6
|
exports.V17_X_ANALOG_JS_CONTENT = '^1.7.0';
|
|
7
7
|
exports.V17_X_MARKED = '^5.0.2';
|
|
8
|
-
exports.V17_X_MARKED_GFM_HEADING_ID = '^
|
|
9
|
-
exports.V17_X_MARKED_HIGHLIGHT = '^2.
|
|
10
|
-
exports.V17_X_MARKED_MANGLE = '^1.1.
|
|
8
|
+
exports.V17_X_MARKED_GFM_HEADING_ID = '^4.1.1';
|
|
9
|
+
exports.V17_X_MARKED_HIGHLIGHT = '^2.2.1';
|
|
10
|
+
exports.V17_X_MARKED_MANGLE = '^1.1.10';
|
|
11
11
|
exports.V17_X_PRISMJS = '^1.29.0';
|
|
12
12
|
// devDependencies
|
|
13
13
|
exports.V17_X_ANALOG_JS_PLATFORM = '^1.7.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_17_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_17_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AAC/C,QAAA,8BAA8B,GAAG,QAAQ,CAAC;AAC1C,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export declare const V18_X_ANALOG_JS_ROUTER = "^1.7.0";
|
|
2
2
|
export declare const V18_X_ANALOG_JS_CONTENT = "^1.7.0";
|
|
3
|
-
export declare const V18_X_MARKED = "^
|
|
4
|
-
export declare const V18_X_MARKED_GFM_HEADING_ID = "^
|
|
5
|
-
export declare const V18_X_MARKED_HIGHLIGHT = "^2.
|
|
6
|
-
export declare const V18_X_MARKED_MANGLE = "^1.1.
|
|
3
|
+
export declare const V18_X_MARKED = "^15.0.7";
|
|
4
|
+
export declare const V18_X_MARKED_GFM_HEADING_ID = "^4.1.1";
|
|
5
|
+
export declare const V18_X_MARKED_HIGHLIGHT = "^2.2.1";
|
|
6
|
+
export declare const V18_X_MARKED_MANGLE = "^1.1.10";
|
|
7
7
|
export declare const V18_X_PRISMJS = "^1.29.0";
|
|
8
8
|
export declare const V18_X_ANALOG_JS_PLATFORM = "^1.7.0";
|
|
9
9
|
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^1.7.0";
|