Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: account for module resolution differences

Browse Source 
In some cases due to module resolution '@ngtools' might already been under `@angular-devkit/build-angular`.
This commit is contained in:
Alan Agius 2022-08-26 09:25:22 +00:00 committed by Charles
parent 2925f067da
commit 7e35e2918b
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/legacy-cli/e2e/tests/misc/loaders-resolution.ts
View File

@ -1,18 +1,45 @@
import { createDir, moveFile } from '../../utils/fs';
import { ng } from '../../utils/process';
import { assertIsError } from '../../utils/utils';
export default async function () {
await createDir('node_modules/@angular-devkit/build-angular/node_modules');
await moveFile(
'node_modules/@ngtools',
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
);
let originalInRootNodeModules = true;
try {
await moveFile(
'node_modules/@ngtools',
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
);
} catch (e) {
assertIsError(e);
if (e.code !== 'ENOENT') {
throw e;
}
// In some cases due to module resolution '@ngtools' might already been under `@angular-devkit/build-angular`.
originalInRootNodeModules = false;
await moveFile(
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
'node_modules/@ngtools',
);
}
await ng('build', '--configuration=development');
// Move it back.
await moveFile(
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
'node_modules/@ngtools',
);
await moveBack(originalInRootNodeModules);
}
function moveBack(originalInRootNodeModules: Boolean): Promise<void> {
return originalInRootNodeModules
? moveFile(
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
'node_modules/@ngtools',
)
: moveFile(
'node_modules/@ngtools',
'node_modules/@angular-devkit/build-angular/node_modules/@ngtools',
);
}

9
tests/legacy-cli/e2e/utils/utils.ts
View File

@ -1,3 +1,4 @@
import assert from 'assert';
import { mkdtemp, realpath, rm } from 'fs/promises';
import { tmpdir } from 'os';
import path from 'path';
@ -41,3 +42,11 @@ export async function mockHome(cb: (home: string) => Promise<void>): Promise<voi
await rm(tempHome, { recursive: true, force: true });
}
}
export function assertIsError(value: unknown): asserts value is Error & { code?: string } {
const isError =
value instanceof Error ||
// The following is needing to identify errors coming from RxJs.
(typeof value === 'object' && value && 'name' in value && 'message' in value);
assert(isError, 'catch clause variable is not an Error instance');
}