@analogjs/platform 3.0.0-alpha.2 → 3.0.0-alpha.4
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 +3 -3
- package/src/lib/content/marked/marked-content-highlighter.d.ts +1 -3
- package/src/lib/content/marked/marked-content-highlighter.js +1 -1
- package/src/lib/content/marked/marked-setup.service.js +1 -1
- package/src/lib/content/prism/angular.d.ts +1 -0
- package/src/lib/content/prism/angular.js +4 -4
- package/src/lib/content/prism/prism-highlighter.d.ts +1 -1
- package/src/lib/content/shiki/shiki-highlighter.d.ts +1 -1
- package/src/lib/content/shiki/shiki-highlighter.js +1 -1
- package/src/lib/content-plugin.js +2 -2
- package/src/lib/nx-plugin/src/executors/vite/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/executors/vite/compat.js +2 -1
- package/src/lib/nx-plugin/src/executors/vite/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.js +2 -1
- package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/executors/vitest/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/executors/vitest/compat.js +2 -1
- package/src/lib/nx-plugin/src/executors/vitest/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/generators/app/compat.js +2 -1
- package/src/lib/nx-plugin/src/generators/app/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/generator.js +5 -1
- 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 +59 -67
- 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.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js +3 -4
- package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.d.ts +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js +18 -60
- package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js +5 -2
- package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js +6 -0
- package/src/lib/nx-plugin/src/generators/app/lib/update-index-html.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.d.ts +2 -2
- package/src/lib/nx-plugin/src/generators/app/versions/minimum-supported-versions.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/app/versions/nx-dependencies.js +2 -2
- 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_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/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/generators/init/compat.js +2 -1
- package/src/lib/nx-plugin/src/generators/init/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/generator.js +12 -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.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js +3 -0
- 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 +9 -0
- 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-git-ignore.js +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-git-ignore.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js +6 -0
- 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-main.js +3 -0
- package/src/lib/nx-plugin/src/generators/init/lib/update-main.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js +6 -0
- 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 +6 -0
- 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-target.js +6 -0
- package/src/lib/nx-plugin/src/generators/init/lib/update-test-target.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/init/lib/update-test-tsconfig.js +3 -0
- package/src/lib/nx-plugin/src/generators/init/lib/update-test-tsconfig.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/page/generator.d.ts +2 -2
- package/src/lib/nx-plugin/src/generators/page/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/preset/generator.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/compat.d.ts +3 -2
- package/src/lib/nx-plugin/src/generators/setup-vitest/compat.js +2 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/compat.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/generator.js +12 -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-test-target.js +6 -0
- package/src/lib/nx-plugin/src/generators/setup-vitest/lib/update-test-target.js.map +1 -1
- package/src/lib/nx-plugin/src/generators/setup-vitest/lib/update-tsconfig.js +3 -0
- package/src/lib/nx-plugin/src/generators/setup-vitest/lib/update-tsconfig.js.map +1 -1
- package/src/lib/nx-plugin/src/index.js +1 -0
- package/src/lib/nx-plugin/src/utils/version-utils.js +12 -3
- package/src/lib/nx-plugin/src/utils/version-utils.js.map +1 -1
- 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 +2 -1
- package/src/lib/router-plugin.js +3 -3
- package/src/lib/nx-plugin/src/generators/app/files/tailwind/v2/postcss.config.cjs__template__ +0 -10
- package/src/lib/nx-plugin/src/generators/app/files/tailwind/v2/tailwind.config.cjs__template__ +0 -14
- package/src/lib/nx-plugin/src/generators/app/files/tailwind/v3/postcss.config.cjs__template__ +0 -10
- package/src/lib/nx-plugin/src/generators/app/files/tailwind/v3/tailwind.config.ts__template__ +0 -14
|
@@ -24,13 +24,10 @@ function detectTailwindInstalledVersion(tree) {
|
|
|
24
24
|
return undefined;
|
|
25
25
|
}
|
|
26
26
|
const version = (0, semver_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
|
|
27
|
-
if ((0, semver_2.lt)(version, '
|
|
28
|
-
throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to
|
|
27
|
+
if ((0, semver_2.lt)(version, '4.0.0')) {
|
|
28
|
+
throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to v4.0.0 or higher.`);
|
|
29
29
|
}
|
|
30
|
-
|
|
31
|
-
return '2';
|
|
32
|
-
}
|
|
33
|
-
return (0, semver_2.lt)(version, '4.0.0') ? '3' : '4';
|
|
30
|
+
return (0, semver_2.lt)(version, '5.0.0') ? '4' : '5';
|
|
34
31
|
}
|
|
35
32
|
function addTailwindRequiredPackages(tree) {
|
|
36
33
|
const pkgVersions = (0, tailwind_dependencies_1.getTailwindDependencies)();
|
|
@@ -41,7 +38,6 @@ function addTailwindRequiredPackages(tree) {
|
|
|
41
38
|
}, {});
|
|
42
39
|
}
|
|
43
40
|
function updateApplicationStyles(tree, options, project) {
|
|
44
|
-
const tailwindInstalledVersion = detectTailwindInstalledVersion(tree);
|
|
45
41
|
let stylesEntryPoint = options.stylesEntryPoint;
|
|
46
42
|
if (stylesEntryPoint && !tree.exists(stylesEntryPoint)) {
|
|
47
43
|
throw new Error(`The provided styles entry point "${stylesEntryPoint}" could not be found.`);
|
|
@@ -53,26 +49,14 @@ function updateApplicationStyles(tree, options, project) {
|
|
|
53
49
|
Please specify a styles entry point using the "--stylesEntryPoint" option.`);
|
|
54
50
|
}
|
|
55
51
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@tailwind base;
|
|
59
|
-
@tailwind components;
|
|
60
|
-
@tailwind utilities;
|
|
61
|
-
|
|
62
|
-
${stylesEntryPointContent}`);
|
|
52
|
+
if (!stylesEntryPoint.endsWith('.css')) {
|
|
53
|
+
throw new Error(`Tailwind CSS v4 is not compatible with any css preprocessors like sass or less. Please use a css file as the styles entry point.`);
|
|
63
54
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
throw new Error(`Tailwind CSS v4 is not compatible with any css preprocessors like sass or less. Please use a css file as the styles entry point.`);
|
|
67
|
-
}
|
|
68
|
-
tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@import "tailwindcss";
|
|
55
|
+
const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8');
|
|
56
|
+
tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@import "tailwindcss";
|
|
69
57
|
|
|
70
58
|
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
function isStyleEntryPointCss(stylesEntryPoint) {
|
|
75
|
-
return stylesEntryPoint.endsWith('.css');
|
|
59
|
+
${stylesEntryPointContent}`);
|
|
76
60
|
}
|
|
77
61
|
function findStylesEntryPoint(tree, options, project) {
|
|
78
62
|
// first check for common names
|
|
@@ -114,47 +98,21 @@ function addTailwindConfigPathToProject(tree, options, project) {
|
|
|
114
98
|
throw new Error((0, devkit_1.stripIndents) `The "${buildTarget.options.tailwindConfig}" file is already configured for the project "${options.project}". Are you sure this is the right project to set up Tailwind?
|
|
115
99
|
If you are sure, you can remove the configuration and re-run the generator.`);
|
|
116
100
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
|
|
122
|
-
};
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
buildTarget.options = {
|
|
126
|
-
...buildTarget.options,
|
|
127
|
-
tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.ts'),
|
|
128
|
-
};
|
|
129
|
-
}
|
|
101
|
+
buildTarget.options = {
|
|
102
|
+
...buildTarget.options,
|
|
103
|
+
tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.ts'),
|
|
104
|
+
};
|
|
130
105
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
|
|
131
106
|
}
|
|
132
107
|
function addTailwindConfigFile(tree, options, project) {
|
|
133
|
-
if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.
|
|
108
|
+
if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.ts')) ||
|
|
109
|
+
tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
|
|
134
110
|
throw new Error((0, devkit_1.stripIndents) `The "tailwind.config" file already exists in the project "${options.project}". Are you sure this is the right project to set up Tailwind?
|
|
135
111
|
If you are sure, you can remove the existing file and re-run the generator.`);
|
|
136
112
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
template: '',
|
|
142
|
-
});
|
|
143
|
-
return;
|
|
144
|
-
}
|
|
145
|
-
if (tailwindInstalledVersion === '3') {
|
|
146
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/v3'), project.root, {
|
|
147
|
-
relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
|
|
148
|
-
template: '',
|
|
149
|
-
});
|
|
150
|
-
return;
|
|
151
|
-
}
|
|
152
|
-
if (tailwindInstalledVersion === '4') {
|
|
153
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/v4'), project.root, {
|
|
154
|
-
relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
|
|
155
|
-
template: '',
|
|
156
|
-
});
|
|
157
|
-
return;
|
|
158
|
-
}
|
|
113
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/v4'), project.root, {
|
|
114
|
+
relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot ?? project.root),
|
|
115
|
+
template: '',
|
|
116
|
+
});
|
|
159
117
|
}
|
|
160
118
|
//# sourceMappingURL=add-tailwind-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-tailwind-helpers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts"],"names":[],"mappings":";;AAoBA,4CAOC;AAED,
|
|
1
|
+
{"version":3,"file":"add-tailwind-helpers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,9 @@ async function initializeAngularWorkspace(tree, installedNxVersion, normalizedOp
|
|
|
50
50
|
angularVersion = await initWithNrwlNamespace(tree, installedNxVersion, normalizedOptions.skipFormat);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
+
if (!angularVersion) {
|
|
54
|
+
throw new Error('Could not determine installed Angular version.');
|
|
55
|
+
}
|
|
53
56
|
if ((0, minimum_supported_versions_1.belowMinimumSupportedAngularVersion)(angularVersion)) {
|
|
54
57
|
throw new Error((0, devkit_1.stripIndents) `Analog only supports an Angular version of 15 and higher`);
|
|
55
58
|
}
|
|
@@ -78,7 +81,7 @@ const initWithNxNamespace = async (tree, installedNxVersion, skipFormat = true)
|
|
|
78
81
|
'@nx/eslint': versions['@nx/eslint'],
|
|
79
82
|
typescript: '~5.7.0',
|
|
80
83
|
});
|
|
81
|
-
return (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core',
|
|
84
|
+
return (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core', undefined, true);
|
|
82
85
|
};
|
|
83
86
|
const initWithNrwlNamespace = async (tree, installedNxVersion, skipFormat = true) => {
|
|
84
87
|
const versions = (0, nx_dependencies_1.getNrwlDependencies)(installedNxVersion);
|
|
@@ -102,6 +105,6 @@ const initWithNrwlNamespace = async (tree, installedNxVersion, skipFormat = true
|
|
|
102
105
|
skipInstall: true,
|
|
103
106
|
skipFormat: skipFormat,
|
|
104
107
|
});
|
|
105
|
-
return (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core',
|
|
108
|
+
return (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core', undefined, true);
|
|
106
109
|
};
|
|
107
110
|
//# sourceMappingURL=initialize-analog-workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize-analog-workspace.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"initialize-analog-workspace.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,15 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function updateIndex(tree, projectName) {
|
|
6
6
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
7
|
const projectConfig = projects.get(projectName);
|
|
8
|
+
if (!projectConfig) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
8
11
|
const indexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'index.html');
|
|
9
12
|
if (tree.exists(indexPath)) {
|
|
10
13
|
const indexContents = tree.read(indexPath, 'utf-8');
|
|
14
|
+
if (!indexContents) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
11
17
|
const updatedIndex = indexContents.replace('</head>', `<link rel="stylesheet" href="/src/styles.css" />
|
|
12
18
|
</head>`);
|
|
13
19
|
tree.write(indexPath, updatedIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/update-index-html.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/update-index-html.ts"],"names":[],"mappings":";;AAEA,kCAsBC;AAxBD,uCAAkE;AAElE,SAAgB,WAAW,CAAC,IAAU,EAAE,WAAmB;IACzD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEtE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CACxC,SAAS,EACT;cACQ,CACT,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACtC,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const MINIMUM_SUPPORTED_NX_TRPC_VERSION = "16.1.0";
|
|
2
2
|
export declare const MINIMUM_SUPPORTED_NX_VERSION = "15.2.0";
|
|
3
3
|
export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "15.0.0";
|
|
4
|
-
export declare const belowMinimumSupportedNxVersion: (nxVersion: string) =>
|
|
5
|
-
export declare const belowMinimumSupportedAngularVersion: (angularVersion: string) =>
|
|
4
|
+
export declare const belowMinimumSupportedNxVersion: (nxVersion: string) => boolean;
|
|
5
|
+
export declare const belowMinimumSupportedAngularVersion: (angularVersion: string) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimum-supported-versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/minimum-supported-versions.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACvB,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC7C,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AACnD,MAAM,8BAA8B,GAAG,CAAC,SAAiB,
|
|
1
|
+
{"version":3,"file":"minimum-supported-versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/minimum-supported-versions.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACvB,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC7C,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AACnD,MAAM,8BAA8B,GAAG,CAAC,SAAiB,EAAW,EAAE,CAC3E,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,SAAS,CAAE,EAAE,oCAA4B,CAAC,CAAC;AAD1C,QAAA,8BAA8B,kCACY;AAChD,MAAM,mCAAmC,GAAG,CACjD,cAAsB,EACb,EAAE,CAAC,IAAA,WAAE,EAAC,IAAA,eAAM,EAAC,cAAc,CAAE,EAAE,yCAAiC,CAAC,CAAC;AAFhE,QAAA,mCAAmC,uCAE6B"}
|
|
@@ -11,7 +11,7 @@ const nrwlDependencyKeys = [
|
|
|
11
11
|
'@nrwl/linter',
|
|
12
12
|
];
|
|
13
13
|
const getNrwlDependencies = (nxVersion) => {
|
|
14
|
-
const escapedNxVersion = (0, semver_1.clean)(nxVersion);
|
|
14
|
+
const escapedNxVersion = (0, semver_1.clean)(nxVersion) ?? nxVersion;
|
|
15
15
|
// fail out for versions <17.0.0
|
|
16
16
|
if ((0, semver_1.lt)(escapedNxVersion, '17.0.0')) {
|
|
17
17
|
throw new Error((0, devkit_1.stripIndents) `Nx v17.0.0 or newer is required to install Analog`);
|
|
@@ -22,7 +22,7 @@ const getNrwlDependencies = (nxVersion) => {
|
|
|
22
22
|
exports.getNrwlDependencies = getNrwlDependencies;
|
|
23
23
|
const nxDependencyKeys = ['@nx/devkit', '@nx/angular', '@nx/eslint'];
|
|
24
24
|
const getNxDependencies = (nxVersion) => {
|
|
25
|
-
const escapedNxVersion = (0, semver_1.clean)(nxVersion);
|
|
25
|
+
const escapedNxVersion = (0, semver_1.clean)(nxVersion) ?? nxVersion;
|
|
26
26
|
// error for @nrwl to @nx namespace changes for Nx < 17
|
|
27
27
|
if ((0, semver_1.lt)(escapedNxVersion, '17.0.0')) {
|
|
28
28
|
throw new Error((0, devkit_1.stripIndents) `The @nx scope is only supported in Nx 17.0.0 and newer. Please use @nrwl scope to install version ${nxVersion}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,uCAA0C;AAC1C,iDAI4B;AAC5B,iDAI4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,cAAc;IACd,eAAe;IACf,cAAc;CACN,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACe,EAAE;IAClC,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"nx-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx-dependencies.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,uCAA0C;AAC1C,iDAI4B;AAC5B,iDAI4B;AAE5B,MAAM,kBAAkB,GAAG;IACzB,cAAc;IACd,eAAe;IACf,cAAc;CACN,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACe,EAAE;IAClC,MAAM,gBAAgB,GAAW,IAAA,cAAK,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC;IAE/D,gCAAgC;IAChC,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,mDAAmD,CAChE,CAAC;IACJ,CAAC;IACD,uDAAuD;IACvD,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iHAAiH,SAAS,EAAE,CACzI,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEF,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC;AAEvE,MAAM,iBAAiB,GAAG,CAC/B,SAAiB,EACa,EAAE;IAChC,MAAM,gBAAgB,GAAW,IAAA,cAAK,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC;IAE/D,uDAAuD;IACvD,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,qGAAqG,SAAS,EAAE,CAC7H,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,aAAa,EAAE,2BAAgB;YAC/B,YAAY,EAAE,0BAAe;YAC7B,YAAY,EAAE,0BAAe;SAC9B,CAAC;IACJ,CAAC;IAED,8BAA8B;IAC9B,OAAO;QACL,aAAa,EAAE,2BAAgB;QAC/B,YAAY,EAAE,0BAAe;QAC7B,YAAY,EAAE,0BAAe;KAC9B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}
|
|
@@ -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 = "^3.0.0-alpha.
|
|
4
|
-
export declare const V18_X_ANALOG_JS_ROUTER = "^3.0.0-alpha.
|
|
3
|
+
export declare const V18_X_ANALOG_JS_CONTENT = "^3.0.0-alpha.4";
|
|
4
|
+
export declare const V18_X_ANALOG_JS_ROUTER = "^3.0.0-alpha.4";
|
|
5
5
|
export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
|
|
6
|
-
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^3.0.0-alpha.
|
|
7
|
-
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^3.0.0-alpha.
|
|
6
|
+
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^3.0.0-alpha.4";
|
|
7
|
+
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^3.0.0-alpha.4";
|
|
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 = "^3.0.0-alpha.
|
|
23
|
+
export declare const V18_X_ANALOG_JS_PLATFORM = "^3.0.0-alpha.4";
|
|
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 = '^3.0.0-alpha.
|
|
9
|
-
exports.V18_X_ANALOG_JS_ROUTER = '^3.0.0-alpha.
|
|
8
|
+
exports.V18_X_ANALOG_JS_CONTENT = '^3.0.0-alpha.4';
|
|
9
|
+
exports.V18_X_ANALOG_JS_ROUTER = '^3.0.0-alpha.4';
|
|
10
10
|
exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
|
|
11
|
-
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^3.0.0-alpha.
|
|
12
|
-
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^3.0.0-alpha.
|
|
11
|
+
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^3.0.0-alpha.4';
|
|
12
|
+
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^3.0.0-alpha.4';
|
|
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 = '^3.0.0-alpha.
|
|
29
|
+
exports.V18_X_ANALOG_JS_PLATFORM = '^3.0.0-alpha.4';
|
|
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';
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { convertNxGenerator } from '@nx/devkit';
|
|
2
|
+
declare const compat: ReturnType<typeof convertNxGenerator>;
|
|
3
|
+
export default compat;
|
|
@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const generator_1 = tslib_1.__importDefault(require("./generator"));
|
|
6
|
-
|
|
6
|
+
const compat = (0, devkit_1.convertNxGenerator)(generator_1.default);
|
|
7
|
+
exports.default = compat;
|
|
7
8
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/compat.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,oEAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/compat.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAEhD,oEAA+C;AAE/C,MAAM,MAAM,GAA0C,IAAA,2BAAkB,EACtE,mBAAoB,CACoB,CAAC;AAC3C,kBAAe,MAAM,CAAC"}
|
|
@@ -19,6 +19,9 @@ function addFiles(tree, options, majorAngularVersion) {
|
|
|
19
19
|
const isNx = tree.read('/nx.json');
|
|
20
20
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
21
21
|
const projectConfig = projects.get(options.project);
|
|
22
|
+
if (!projectConfig) {
|
|
23
|
+
throw new Error(`Project "${options.project}" not found.`);
|
|
24
|
+
}
|
|
22
25
|
const templateOptions = {
|
|
23
26
|
...options,
|
|
24
27
|
offsetFromRoot: isNx ? '../../' : './',
|
|
@@ -35,8 +38,15 @@ function addFiles(tree, options, majorAngularVersion) {
|
|
|
35
38
|
async function setupAnalogGenerator(tree, options) {
|
|
36
39
|
const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
|
|
37
40
|
const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
|
|
38
|
-
|
|
39
|
-
|
|
41
|
+
if (!angularVersion) {
|
|
42
|
+
throw new Error('@angular/core is not installed.');
|
|
43
|
+
}
|
|
44
|
+
const coercedVersion = (0, semver_1.coerce)(angularVersion);
|
|
45
|
+
if (!coercedVersion) {
|
|
46
|
+
throw new Error(`Unable to coerce Angular version: ${angularVersion}`);
|
|
47
|
+
}
|
|
48
|
+
const majorAngularVersion = (0, semver_1.major)(coercedVersion);
|
|
49
|
+
(0, add_analog_dependencies_1.addAnalogDependencies)(tree, angularVersion, options.vitest, nxVersion ?? undefined);
|
|
40
50
|
(0, update_build_target_1.updateBuildTarget)(tree, options);
|
|
41
51
|
(0, update_serve_target_1.updateServeTarget)(tree, options);
|
|
42
52
|
if (options.vitest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,sDA8BC;AAnCD,uCAAgE;AAEhE,+EAAoF;AACpF,uEAA6E;AAE7E,SAAgB,qBAAqB,CACnC,IAAU,EACV,cAAsB,EACtB,MAAe,EACf,SAAkB;IAElB,MAAM,eAAe,GAA2B,IAAA,2CAAwB,EACtE,cAAc,EACd,SAAS,CACV,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC;IAE3D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,eAAe,CAAC,qBAAqB,CAAC,CAAC;QAC9C,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,IAAA,qCAA4B,EAC1B,IAAI,EACJ;QACE,GAAG,YAAY;QACf,0BAA0B,EAAE,IAAI,cAAc,EAAE;KACjD,EACD,eAAe,CAChB,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,9 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function updateAppTsConfig(tree, schema) {
|
|
6
6
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
7
|
const projectConfig = projects.get(schema.project);
|
|
8
|
+
if (!projectConfig) {
|
|
9
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
10
|
+
}
|
|
8
11
|
const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json');
|
|
9
12
|
if (tree.exists(tsconfigPath)) {
|
|
10
13
|
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AASA,8CAmCC;AA5CD,uCAA8E;AAS9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAE3D,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,4BAA4B;gBAC5B,+BAA+B;aAChC,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -25,6 +25,9 @@ function updateBuildTarget(tree, schema) {
|
|
|
25
25
|
if (tree.exists(angularJsonPath)) {
|
|
26
26
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
27
27
|
const projectConfig = projects.get(schema.project);
|
|
28
|
+
if (!projectConfig) {
|
|
29
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
30
|
+
}
|
|
28
31
|
(0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
|
|
29
32
|
json.projects[schema.project].root = projectConfig.root;
|
|
30
33
|
json.projects[schema.project].sourceRoot = projectConfig.sourceRoot;
|
|
@@ -44,6 +47,12 @@ function updateBuildTarget(tree, schema) {
|
|
|
44
47
|
else {
|
|
45
48
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
46
49
|
const projectConfig = projects.get(schema.project);
|
|
50
|
+
if (!projectConfig) {
|
|
51
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
52
|
+
}
|
|
53
|
+
if (!projectConfig.targets) {
|
|
54
|
+
throw new Error(`Project "${schema.project}" has no targets.`);
|
|
55
|
+
}
|
|
47
56
|
projectConfig.targets.build = {
|
|
48
57
|
executor: '@analogjs/platform:vite',
|
|
49
58
|
...commonConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ function updateGitIgnore(tree) {
|
|
|
5
5
|
const gitIgnorePath = '/.gitignore';
|
|
6
6
|
if (tree.exists(gitIgnorePath)) {
|
|
7
7
|
const gitIgnoreContents = tree.read(gitIgnorePath, 'utf-8');
|
|
8
|
-
if (!gitIgnoreContents.includes('.nx/cache')) {
|
|
8
|
+
if (gitIgnoreContents && !gitIgnoreContents.includes('.nx/cache')) {
|
|
9
9
|
const updatedGitIgnore = `${gitIgnoreContents}\n
|
|
10
10
|
.nx/cache
|
|
11
11
|
.nx/workspace-data`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-git-ignore.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-git-ignore.ts"],"names":[],"mappings":";;AAEA,0CAaC;AAbD,SAAgB,eAAe,CAAC,IAAU;IACxC,MAAM,aAAa,GAAG,aAAa,CAAC;IAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"update-git-ignore.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-git-ignore.ts"],"names":[],"mappings":";;AAEA,0CAaC;AAbD,SAAgB,eAAe,CAAC,IAAU;IACxC,MAAM,aAAa,GAAG,aAAa,CAAC;IAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAClE,MAAM,gBAAgB,GAAG,GAAG,iBAAiB;;mBAEhC,CAAC;YACd,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -5,10 +5,16 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function updateIndex(tree, schema) {
|
|
6
6
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
7
|
const projectConfig = projects.get(schema.project);
|
|
8
|
+
if (!projectConfig) {
|
|
9
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
10
|
+
}
|
|
8
11
|
const indexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'src/index.html');
|
|
9
12
|
const newIndexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'index.html');
|
|
10
13
|
if (tree.exists(indexPath)) {
|
|
11
14
|
const indexContents = tree.read(indexPath, 'utf-8');
|
|
15
|
+
if (!indexContents) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
12
18
|
let updatedIndex = indexContents.replace('</body>', `<script type="module" src="${projectConfig.root && projectConfig.root !== '.' ? `/${projectConfig.root}` : ''}/src/main.ts"></script></body>`);
|
|
13
19
|
updatedIndex = updatedIndex.replace(`"favicon.ico"`, `"/favicon.ico"`);
|
|
14
20
|
tree.write(indexPath, updatedIndex);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCA6BC;AAjCD,uCAAkE;AAIlE,SAAgB,WAAW,CACzB,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,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;QAEpD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,8BAA8B,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,gCAAgC,CAC/I,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"}
|
|
@@ -5,6 +5,9 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function updateMain(tree, schema) {
|
|
6
6
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
7
|
const projectConfig = projects.get(schema.project);
|
|
8
|
+
if (!projectConfig) {
|
|
9
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
10
|
+
}
|
|
8
11
|
const mainPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'src/main.ts');
|
|
9
12
|
if (tree.exists(mainPath)) {
|
|
10
13
|
const mainContents = tree.read(mainPath, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-main.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-main.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"update-main.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-main.ts"],"names":[],"mappings":";;AAIA,gCAmBC;AAvBD,uCAAkE;AAIlE,SAAgB,UAAU,CACxB,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEtE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,sBAAsB,YAAY,EAAE,CAAC;QAEzD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
@@ -7,6 +7,9 @@ function updatePackageJson(tree, schema) {
|
|
|
7
7
|
if (tree.exists(angularJsonPath)) {
|
|
8
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
9
9
|
const projectConfig = projects.get(schema.project);
|
|
10
|
+
if (!projectConfig) {
|
|
11
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
12
|
+
}
|
|
10
13
|
const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root || '.', 'package.json');
|
|
11
14
|
if (tree.exists(packageJsonPath)) {
|
|
12
15
|
(0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
|
|
@@ -21,6 +24,9 @@ function updatePackageJson(tree, schema) {
|
|
|
21
24
|
else {
|
|
22
25
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
23
26
|
const projectConfig = projects.get(schema.project);
|
|
27
|
+
if (!projectConfig) {
|
|
28
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
29
|
+
}
|
|
24
30
|
const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'package.json');
|
|
25
31
|
(0, devkit_1.writeJson)(tree, packageJsonPath, { type: 'module' });
|
|
26
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,8CA2CC;AArDD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,cAAc,CACf,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAErB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,EAClB,cAAc,CACf,CAAC;QAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
|
|
@@ -34,6 +34,12 @@ function updateServeTarget(tree, schema) {
|
|
|
34
34
|
else {
|
|
35
35
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
36
36
|
const projectConfig = projects.get(schema.project);
|
|
37
|
+
if (!projectConfig) {
|
|
38
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
39
|
+
}
|
|
40
|
+
if (!projectConfig.targets) {
|
|
41
|
+
throw new Error(`Project "${schema.project}" has no targets.`);
|
|
42
|
+
}
|
|
37
43
|
projectConfig.targets.serve = {
|
|
38
44
|
executor: '@analogjs/platform:vite-dev-server',
|
|
39
45
|
continuous: true,
|
|
@@ -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,8CA+DC;AAxED,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,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;QACjE,CAAC;QAED,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,UAAU,EAAE,IAAI;YAChB,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"}
|
|
@@ -21,6 +21,12 @@ function updateTestTarget(tree, schema) {
|
|
|
21
21
|
else {
|
|
22
22
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
23
23
|
const projectConfig = projects.get(schema.project);
|
|
24
|
+
if (!projectConfig) {
|
|
25
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
26
|
+
}
|
|
27
|
+
if (!projectConfig.targets) {
|
|
28
|
+
throw new Error(`Project "${schema.project}" has no targets.`);
|
|
29
|
+
}
|
|
24
30
|
projectConfig.targets.test = {
|
|
25
31
|
executor: '@analogjs/vitest-angular:test',
|
|
26
32
|
...commonConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-test-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-test-target.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"update-test-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-test-target.ts"],"names":[],"mappings":";;AASA,4CA6CC;AAtDD,uCAKoB;AAIpB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IACxC,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE;YACP,MAAM,EAAE,gBAAgB;SACzB;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,SAAS,CAAC,IAAI,GAAG;gBAC7C,OAAO,EAAE,+BAA+B;gBACxC,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,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;QACjE,CAAC;QAED,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;YAC3B,QAAQ,EAAE,+BAA+B;YACzC,GAAG,YAAY;SAChB,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
|
|
@@ -5,6 +5,9 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function updateTestTsConfig(tree, schema) {
|
|
6
6
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
7
7
|
const projectConfig = projects.get(schema.project);
|
|
8
|
+
if (!projectConfig) {
|
|
9
|
+
throw new Error(`Project "${schema.project}" not found.`);
|
|
10
|
+
}
|
|
8
11
|
const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json');
|
|
9
12
|
if (tree.exists(tsconfigPath)) {
|
|
10
13
|
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|