miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(angular): fix error when creating angular lib with eslint and karma (#4264)

Browse Source 
ISSUES CLOSED: #4256
This commit is contained in:
Mehrad Rafigh 2020-12-11 23:29:18 +01:00 committed by GitHub
parent f70fa2d78f
commit b4dd8c6ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/angular/src/schematics/karma-project/karma-project.spec.ts
View File

@ -1,7 +1,7 @@
import { Tree } from '@angular-devkit/schematics';
import { createEmptyWorkspace } from '@nrwl/workspace/testing';
import { runSchematic } from '../../utils/testing';
import { readJsonInTree } from '@nrwl/workspace';
import { Linter, readJsonInTree } from '@nrwl/workspace';
describe('karmaProject', () => {
let appTree: Tree;
@ -202,4 +202,40 @@ module.exports = function(config) {
expect(testTs).not.toContain("import 'zone.js/dist/zone';");
});
});
describe('linter', () => {
it('should work with eslint as linter', async () => {
const resultTree = await runSchematic(
'lib',
{
name: 'lib-with-eslint-and-karma',
unitTestRunner: 'karma',
linter: Linter.EsLint,
},
appTree
);
const workspaceJson = readJsonInTree(resultTree, 'workspace.json');
expect(
workspaceJson.projects['lib-with-eslint-and-karma'].architect.lint
.options.tsConfig
).toBeUndefined();
expect(
workspaceJson.projects['lib-with-eslint-and-karma'].architect.lint
.builder
).toBe('@nrwl/linter:eslint');
expect(
workspaceJson.projects['lib-with-eslint-and-karma'].architect.test
).toEqual({
builder: '@angular-devkit/build-angular:karma',
options: {
main: 'libs/lib-with-eslint-and-karma/src/test.ts',
tsConfig: 'libs/lib-with-eslint-and-karma/tsconfig.spec.json',
karmaConfig: 'libs/lib-with-eslint-and-karma/karma.conf.js',
},
});
});
});
});

7
packages/angular/src/schematics/karma-project/karma-project.ts
View File

@ -99,7 +99,12 @@ function updateworkspaceJson(options: KarmaProjectSchema): Rule {
assets: [],
};
}
if (projectConfig.architect.lint) {
if (
projectConfig.architect.lint &&
projectConfig.architect.lint.builder ===
'@angular-devkit/build-angular:tslint'
) {
projectConfig.architect.lint.options.tsConfig = [
...projectConfig.architect.lint.options.tsConfig,
join(normalize(projectConfig.root), 'tsconfig.spec.json'),