@angular-devkit/architect 0.1800.0-rc.0 → 0.1800.0-rc.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.
|
@@ -33,7 +33,7 @@ export declare class WorkspaceNodeModulesArchitectHost implements ArchitectHost<
|
|
|
33
33
|
* @param builderStr The name of the builder to be used.
|
|
34
34
|
* @returns All the info needed for the builder itself.
|
|
35
35
|
*/
|
|
36
|
-
resolveBuilder(builderStr: string, seenBuilders?: Set<string>): Promise<NodeModulesBuilderInfo>;
|
|
36
|
+
resolveBuilder(builderStr: string, basePath?: string, seenBuilders?: Set<string>): Promise<NodeModulesBuilderInfo>;
|
|
37
37
|
getCurrentDirectory(): Promise<string>;
|
|
38
38
|
getWorkspaceRoot(): Promise<string>;
|
|
39
39
|
getOptionsForTarget(target: Target): Promise<json.JsonObject | null>;
|
|
@@ -114,7 +114,7 @@ class WorkspaceNodeModulesArchitectHost {
|
|
|
114
114
|
* @param builderStr The name of the builder to be used.
|
|
115
115
|
* @returns All the info needed for the builder itself.
|
|
116
116
|
*/
|
|
117
|
-
resolveBuilder(builderStr, seenBuilders) {
|
|
117
|
+
resolveBuilder(builderStr, basePath = this._root, seenBuilders) {
|
|
118
118
|
if (seenBuilders?.has(builderStr)) {
|
|
119
119
|
throw new Error('Circular builder alias references detected: ' + [...seenBuilders, builderStr]);
|
|
120
120
|
}
|
|
@@ -124,7 +124,7 @@ class WorkspaceNodeModulesArchitectHost {
|
|
|
124
124
|
}
|
|
125
125
|
// Resolve and load the builders manifest from the package's `builders` field, if present
|
|
126
126
|
const packageJsonPath = localRequire.resolve(packageName + '/package.json', {
|
|
127
|
-
paths: [
|
|
127
|
+
paths: [basePath],
|
|
128
128
|
});
|
|
129
129
|
const packageJson = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf-8'));
|
|
130
130
|
const buildersManifestRawPath = packageJson['builders'];
|
|
@@ -145,7 +145,7 @@ class WorkspaceNodeModulesArchitectHost {
|
|
|
145
145
|
}
|
|
146
146
|
// Resolve alias reference if entry is a string
|
|
147
147
|
if (typeof builder === 'string') {
|
|
148
|
-
return this.resolveBuilder(builder, (seenBuilders ?? new Set()).add(builderStr));
|
|
148
|
+
return this.resolveBuilder(builder, path.dirname(packageJsonPath), (seenBuilders ?? new Set()).add(builderStr));
|
|
149
149
|
}
|
|
150
150
|
// Determine builder implementation path (relative within package only)
|
|
151
151
|
const implementationPath = builder.implementation && path.normalize(builder.implementation);
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular-devkit/architect",
|
|
3
|
-
"version": "0.1800.0-rc.
|
|
3
|
+
"version": "0.1800.0-rc.2",
|
|
4
4
|
"description": "Angular Build Facade",
|
|
5
5
|
"experimental": true,
|
|
6
6
|
"main": "src/index.js",
|
|
7
7
|
"typings": "src/index.d.ts",
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@angular-devkit/core": "18.0.0-rc.
|
|
9
|
+
"@angular-devkit/core": "18.0.0-rc.2",
|
|
10
10
|
"rxjs": "7.8.1"
|
|
11
11
|
},
|
|
12
12
|
"builders": "./builders/builders.json",
|