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

feat(core): switch over to angular 10 (#3056)

Browse Source 
* feat(core): switch over to devkit 10-rc.0

* feat(core): implement solution tsconfigs wip

* feat(angular): add angular migrations

* fix(angular): modify angularjs tests
This commit is contained in:
Jason Jean 2020-07-07 17:02:06 -04:00 committed by GitHub
parent 9b418b05cf
commit a7b7af2dfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
132 changed files with 1965 additions and 1625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -114,7 +114,7 @@ jobs:
- setup
- run:
name: Tests Part 3
command: yarn e2e-ci 3
command: NX_VERBOSE_LOGGING=true yarn e2e-ci 3
no_output_timeout: 30m
e2e-4:
executor: default

1
.prettierignore
View File

@ -5,6 +5,7 @@ node_modules
/package.json
packages/workspace/src/schematics/**/files/**/*.json
packages/workspace/src/core/dep-graph/vendor.js
packages/angular/src/schematics/**/files/**/*.json
packages/web/src/schematics/**/files/**/*.json
packages/node/src/schematics/**/files/**/*.json
packages/express/src/schematics/**/files/**/*.json

2
docs/angular/api-nest/schematics/library.md
View File

@ -106,7 +106,7 @@ Default: `false`
Type: `boolean`
Do not update tsconfig.json for development experience.
Do not update tsconfig.base.json for development experience.
### tags

2
docs/angular/api-node/schematics/library.md
View File

@ -82,7 +82,7 @@ Default: `false`
Type: `boolean`
Do not update tsconfig.json for development experience.
Do not update tsconfig.base.json for development experience.
### tags

2
docs/react/api-nest/schematics/library.md
View File

@ -106,7 +106,7 @@ Default: `false`
Type: `boolean`
Do not update tsconfig.json for development experience.
Do not update tsconfig.base.json for development experience.
### tags

2
docs/react/api-node/schematics/library.md
View File

@ -82,7 +82,7 @@ Default: `false`
Type: `boolean`
Do not update tsconfig.json for development experience.
Do not update tsconfig.base.json for development experience.
### tags

8
e2e/angular/src/angular-package.test.ts
View File

@ -71,7 +71,7 @@ forEachCli('angular', (cli) => {
`export * from './public_api';`
);
updateFile(`tsconfig.json`, (s) => {
updateFile(`tsconfig.base.json`, (s) => {
return s.replace(
`"@proj/${childLib}": ["libs/${childLib}/src/index.ts"],`,
`"@proj/${childLib}": ["libs/${childLib}/src/index.ts"],
@ -139,13 +139,13 @@ forEachCli('angular', (cli) => {
const jsonFile = readJson(`dist/libs/${parentLib}/package.json`);
expect(jsonFile.dependencies).toEqual({
tslib: '^1.10.0',
tslib: '^2.0.0',
[`@proj/${childLib}`]: '0.0.1',
[`@proj/${childLib2}`]: '0.0.1',
});
expect(jsonFile.peerDependencies).toEqual({
'@angular/common': '^9.1.0',
'@angular/core': '^9.1.0',
'@angular/common': '^10.0.2',
'@angular/core': '^10.0.2',
});
});
});

13
e2e/angular/src/angular.test.ts
View File

@ -50,27 +50,18 @@ forEachCli(() => {
);
runCLI(`build my-dir-${myapp} --prod --output-hashing none`);
checkFilesExist(
`dist/apps/my-dir/${myapp}/main-es2015.js`,
`dist/apps/my-dir/${myapp}/main-es5.js`
);
checkFilesExist(`dist/apps/my-dir/${myapp}/main.js`);
// This is a loose requirement because there are a lot of
// influences external from this project that affect this.
const es2015BundleSize = getSize(
tmpProjPath(`dist/apps/my-dir/${myapp}/main-es2015.js`)
tmpProjPath(`dist/apps/my-dir/${myapp}/main.js`)
);
console.log(
`The current es2015 bundle size is ${es2015BundleSize / 1000} KB`
);
expect(es2015BundleSize).toBeLessThanOrEqual(125000);
const es5BundleSize = getSize(
tmpProjPath(`dist/apps/my-dir/${myapp}/main-es5.js`)
);
console.log(`The current es5 bundle size is ${es5BundleSize / 1000} KB`);
expect(es5BundleSize).toBeLessThanOrEqual(150000);
// running tests for the app
expectTestsPass(await runCLIAsync(`test my-dir-${myapp} --no-watch`));

83
e2e/angular/src/angularjs.test.ts Normal file
View File

@ -0,0 +1,83 @@
import {
ensureProject,
runCLI,
uniq,
updateFile,
forEachCli,
patchKarmaToWorkOnWSL,
runCommand,
} from '@nrwl/e2e/utils';
forEachCli('angular', () => {
// TODO: This test is super flaky, investigate and re-enable.
describe('AngularJS Schematics', () => {
beforeEach(() => {
ensureProject();
});
describe('DowngradeModule', () => {
it('should generate a downgradeModule setup', async () => {
const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --unit-test-runner=karma`);
patchKarmaToWorkOnWSL();
updateFile(
`apps/${myapp}/src/legacy.js`,
`window.angular.module('legacy', []);`
);
runCLI(
`generate @nrwl/angular:downgrade-module legacy --angularJsImport=./legacy --project=${myapp}`
);
runCommand('yarn postinstall');
runCLI(`build ${myapp}`);
expect(runCLI(`test ${myapp} --no-watch`)).toContain('3 SUCCESS');
}, 1000000);
});
describe('UpgradeModule', () => {
it('should generate an UpgradeModule setup', async () => {
const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --unit-test-runner=karma`);
patchKarmaToWorkOnWSL();
updateFile(
`apps/${myapp}/src/legacy.js`,
`
const angular = window.angular.module('legacy', []);
angular.component('proj-root-legacy', {
template: 'Expected Value'
});
`
);
updateFile(
`apps/${myapp}/src/app/app.component.html`,
`
EXPECTED [<proj-root-legacy></proj-root-legacy>]
`
);
updateFile(`apps/${myapp}/src/app/app.component.spec.ts`, ``);
runCLI(
'generate @nrwl/angular:upgrade-module legacy --angularJsImport=./legacy ' +
`--angularJsCmpSelector=proj-root-legacy --project=${myapp}`
);
runCommand('yarn postinstall');
runCLI(`build ${myapp}`);
expect(runCLI(`test ${myapp} --no-watch`)).toContain('1 SUCCESS');
}, 1000000);
});
});
});
forEachCli('nx', () => {
describe('DowngradeModule', () => {
it('not supported', async () => {}, 1000000);
});
});

39
e2e/angular/src/downgrade-module.test.ts
View File

@ -1,39 +0,0 @@
import {
ensureProject,
runCLI,
uniq,
updateFile,
forEachCli,
supportUi,
patchKarmaToWorkOnWSL,
} from '@nrwl/e2e/utils';
forEachCli('angular', () => {
describe('DowngradeModule', () => {
it('should generate a downgradeModule setup', async () => {
ensureProject();
const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --unit-test-runner=karma`);
patchKarmaToWorkOnWSL();
updateFile(
`apps/${myapp}/src/legacy.js`,
`window.angular.module('legacy', []);`
);
runCLI(
`generate @nrwl/angular:downgrade-module legacy --angularJsImport=./legacy --project=${myapp}`
);
runCLI(`build ${myapp}`);
expect(runCLI(`test ${myapp} --no-watch`)).toContain('3 SUCCESS');
}, 1000000);
});
});
forEachCli('nx', () => {
describe('DowngradeModule', () => {
it('not supported', async () => {}, 1000000);
});
});

21
e2e/angular/src/karma.test.ts
View File

@ -8,7 +8,8 @@ import {
} from '@nrwl/e2e/utils';
forEachCli(() => {
describe('Karma', () => {
// TODO: This test is super flaky, investigate and re-enable.
xdescribe('Karma', () => {
it('should be able to generate a testable library using karma', async (done) => {
ensureProject();
@ -32,24 +33,14 @@ forEachCli(() => {
const karmaResult = await runCLIAsync(`test ${mylib}`);
expect(karmaResult.stdout).toContain('3 SUCCESS');
done();
}, 45000);
it('should be able to generate a testable application using karma', async (done) => {
ensureProject();
const myapp = uniq('myapp');
runCLI(
`generate @nrwl/angular:app ${myapp} --unit-test-runner karma --no-interactive`
);
patchKarmaToWorkOnWSL();
await Promise.all([
runCLIAsync(`generate @nrwl/angular:service test --project ${myapp}`),
runCLIAsync(`generate @nrwl/angular:component test --project ${myapp}`),
]);
const karmaResult = await runCLIAsync(`test ${myapp}`);
expect(karmaResult.stdout).toContain('5 SUCCESS');
const karmaResult2 = await runCLIAsync(`test ${myapp}`);
expect(karmaResult2.stdout).toContain('5 SUCCESS');
done();
}, 30000);
}, 60000);
});
});

4
e2e/angular/src/ng-add.test.ts
View File

@ -28,7 +28,7 @@ forEachCli('angular', () => {
).not.toBeDefined();
// update tsconfig.json
const tsconfigJson = readJson('tsconfig.json');
const tsconfigJson = readJson('tsconfig.base.json');
tsconfigJson.compilerOptions.paths = { a: ['b'] };
updateFile('tsconfig.json', JSON.stringify(tsconfigJson, null, 2));
@ -103,7 +103,7 @@ forEachCli('angular', () => {
'angular.json': '*',
'package.json': '*',
'tslint.json': '*',
'tsconfig.json': '*',
'tsconfig.base.json': '*',
'nx.json': '*',
},
projects: {

14
e2e/angular/src/ngrx.test.ts
View File

@ -33,12 +33,7 @@ forEachCli(() => {
`generate @nrwl/angular:ngrx flights --module=libs/${mylib}/src/lib/${mylib}.module.ts --facade --syntax=classes`
);
expect(runCLI(`build ${myapp}`)).toContain(
'chunk {main} main-es2015.js,'
);
expect(runCLI(`build ${myapp}`)).toContain(
'ES5 bundle generation complete'
);
expect(runCLI(`build ${myapp}`)).toContain('chunk {main} main.js,');
expectTestsPass(await runCLIAsync(`test ${myapp} --no-watch`));
expectTestsPass(await runCLIAsync(`test ${mylib} --no-watch`));
}, 1000000);
@ -70,12 +65,7 @@ forEachCli(() => {
`generate @nrwl/angular:ngrx flights --module=libs/${mylib}/src/lib/${mylib}.module.ts ${flags}`
);
expect(runCLI(`build ${myapp}`)).toContain(
'chunk {main} main-es2015.js,'
);
expect(runCLI(`build ${myapp}`)).toContain(
'ES5 bundle generation complete'
);
expect(runCLI(`build ${myapp}`)).toContain('chunk {main} main.js,');
expectTestsPass(await runCLIAsync(`test ${myapp} --no-watch`));
expectTestsPass(await runCLIAsync(`test ${mylib} --no-watch`));
}, 1000000);

53
e2e/angular/src/upgrade-module.test.ts
View File

@ -1,53 +0,0 @@
import {
ensureProject,
runCLI,
uniq,
updateFile,
forEachCli,
supportUi,
patchKarmaToWorkOnWSL,
} from '@nrwl/e2e/utils';
forEachCli('angular', () => {
describe('Upgrade', () => {
it('should generate an UpgradeModule setup', async () => {
ensureProject();
const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --unit-test-runner=karma`);
patchKarmaToWorkOnWSL();
updateFile(
`apps/${myapp}/src/legacy.js`,
`
const angular = window.angular.module('legacy', []);
angular.component('proj-root-legacy', {
template: 'Expected Value'
});
`
);
updateFile(
`apps/${myapp}/src/app/app.component.html`,
`
EXPECTED [<proj-root-legacy></proj-root-legacy>]
`
);
updateFile(`apps/${myapp}/src/app/app.component.spec.ts`, ``);
runCLI(
'generate @nrwl/angular:upgrade-module legacy --angularJsImport=./legacy ' +
`--angularJsCmpSelector=proj-root-legacy --project=${myapp}`
);
runCLI(`build ${myapp}`);
expect(runCLI(`test ${myapp} --no-watch`)).toContain('1 SUCCESS');
}, 1000000);
});
});
forEachCli('nx', () => {
describe('Upgrade', () => {
it('not supported', async () => {}, 1000000);
});
});

2
e2e/node/src/node.test.ts
View File

@ -455,7 +455,7 @@ forEachCli((currentCLIName) => {
);
// we are setting paths to {} to make sure built libs are read from dist
updateFile('tsconfig.json', (c) => {
updateFile('tsconfig.base.json', (c) => {
const json = JSON.parse(c);
json.compilerOptions.paths = {};
return JSON.stringify(json, null, 2);

2
e2e/react/src/react-package.test.ts
View File

@ -67,7 +67,7 @@ forEachCli('nx', (cli) => {
);
// we are setting paths to {} to make sure built libs are read from dist
updateFile('tsconfig.json', (c) => {
updateFile('tsconfig.base.json', (c) => {
const json = JSON.parse(c);
json.compilerOptions.paths = {};
return JSON.stringify(json, null, 2);

4
e2e/utils/index.ts
View File

@ -93,10 +93,10 @@ export function runCreateWorkspace(
) {
let command = `npx create-nx-workspace@${process.env.PUBLISHED_VERSION} ${name} --cli=${cli} --preset=${preset} --no-nxCloud --no-interactive`;
if (appName) {
command += ` --appName ${appName}`;
command += ` --appName=${appName}`;
}
if (style) {
command += ` --style ${style}`;
command += ` --style=${style}`;
}
if (base) {

16
e2e/workspace/src/workspace-aux-commands.test.ts
View File

@ -43,7 +43,7 @@ forEachCli((cli) => {
];
updateFile('tslint.json', JSON.stringify(tslint, null, 2));
const tsConfig = readJson('tsconfig.json');
const tsConfig = readJson('tsconfig.base.json');
/**
* apps do not add themselves to the tsconfig file.
@ -57,7 +57,7 @@ forEachCli((cli) => {
tsConfig.compilerOptions.paths[`@secondScope/${lazylib}`] =
tsConfig.compilerOptions.paths[`@proj/${lazylib}`];
delete tsConfig.compilerOptions.paths[`@proj/${lazylib}`];
updateFile('tsconfig.json', JSON.stringify(tsConfig, null, 2));
updateFile('tsconfig.base.json', JSON.stringify(tsConfig, null, 2));
updateFile(
`apps/${myapp}/src/main.ts`,
@ -103,7 +103,7 @@ forEachCli((cli) => {
expect(stdout).toContain(
'The following file(s) do not belong to any projects:'
);
expect(stdout).toContain(`- apps/${appAfter}/browserslist`);
expect(stdout).toContain(`- apps/${appAfter}/jest.config.js`);
expect(stdout).toContain(
`- apps/${appAfter}/src/app/app.component.css`
);
@ -225,7 +225,7 @@ forEachCli((cli) => {
expect(exists(`libs/dir/${workspace}/src/index.ts`)).toEqual(false);
expect(dryRunOutput).toContain(`UPDATE ${workspaceConfigName()}`);
expect(dryRunOutput).toContain('UPDATE nx.json');
expect(dryRunOutput).not.toContain('UPDATE tsconfig.json');
expect(dryRunOutput).not.toContain('UPDATE tsconfig.base.json');
const output = runCommand(
`npm run workspace-schematic ${custom} ${workspace} -- --no-interactive --directory=dir`
@ -407,7 +407,7 @@ forEachCli((cli) => {
// just check the output
expect(moveOutput).toContain(`DELETE apps/${app1}`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/browserslist`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/.browserslistrc`);
expect(moveOutput).toContain(`CREATE apps/${newPath}/jest.config.js`);
expect(moveOutput).toContain(
`CREATE apps/${newPath}/tsconfig.app.json`
@ -599,8 +599,6 @@ forEachCli((cli) => {
const tsConfigPath = `${newPath}/tsconfig.json`;
expect(moveOutput).toContain(`CREATE ${tsConfigPath}`);
checkFilesExist(tsConfigPath);
const tsConfig = readJson(tsConfigPath);
expect(tsConfig.extends).toEqual('../../../../tsconfig.json');
const tsConfigLibPath = `${newPath}/tsconfig.lib.json`;
expect(moveOutput).toContain(`CREATE ${tsConfigLibPath}`);
@ -636,8 +634,8 @@ forEachCli((cli) => {
`shared-${lib1}-data-access`,
]);
expect(moveOutput).toContain('UPDATE tsconfig.json');
const rootTsConfig = readJson('tsconfig.json');
expect(moveOutput).toContain('UPDATE tsconfig.base.json');
const rootTsConfig = readJson('tsconfig.base.json');
expect(
rootTsConfig.compilerOptions.paths[`@proj/${lib1}/data-access`]
).toBeUndefined();

2
e2e/workspace/src/workspace.test.ts
View File

@ -244,7 +244,7 @@ forEachCli((cliName) => {
expect(affectedApps).not.toContain(`${myapp}-e2e`);
const implicitlyAffectedApps = runCommand(
'npm run affected:apps -- --files="tsconfig.json"'
'npm run affected:apps -- --files="tsconfig.base.json"'
);
expect(implicitlyAffectedApps).toContain(myapp);
expect(implicitlyAffectedApps).toContain(myapp2);

44
package.json
View File

@ -22,24 +22,24 @@
"submit-plugin": "node ./scripts/submit-plugin.js"
},
"devDependencies": {
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/build-angular": "~0.901.0",
"@angular-devkit/build-ng-packagr": "~0.901.0",
"@angular-devkit/build-optimizer": "~0.901.0",
"@angular-devkit/build-webpack": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0",
"@angular/cli": "9.1.0",
"@angular/common": "^9.1.0",
"@angular/compiler": "^9.1.0",
"@angular/compiler-cli": "^9.1.0",
"@angular/core": "^9.1.0",
"@angular/forms": "^9.1.0",
"@angular/platform-browser": "^9.1.0",
"@angular/platform-browser-dynamic": "^9.1.0",
"@angular/router": "^9.1.0",
"@angular/service-worker": "^9.1.0",
"@angular/upgrade": "^9.1.0",
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/build-angular": "~0.1000.0",
"@angular-devkit/build-ng-packagr": "~0.1000.0",
"@angular-devkit/build-optimizer": "~0.1000.0",
"@angular-devkit/build-webpack": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"@angular/cli": "~10.0.0",
"@angular/common": "^10.0.0",
"@angular/compiler": "^10.0.0",
"@angular/compiler-cli": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/forms": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"@angular/platform-browser-dynamic": "^10.0.0",
"@angular/router": "^10.0.0",
"@angular/service-worker": "^10.0.0",
"@angular/upgrade": "^10.0.0",
"@babel/core": "7.9.6",
"@babel/plugin-proposal-class-properties": "7.8.3",
"@babel/plugin-proposal-decorators": "7.8.3",
@ -61,7 +61,7 @@
"@ngrx/schematics": "9.1.0",
"@ngrx/store": "9.1.0",
"@ngrx/store-devtools": "9.1.0",
"@ngtools/webpack": "~9.1.0",
"@ngtools/webpack": "~10.0.0",
"@nrwl/eslint-plugin-nx": "9.4.4",
"@nrwl/jest": "9.4.4",
"@nrwl/node": "9.4.4",
@ -71,7 +71,7 @@
"@rollup/plugin-commonjs": "11.0.2",
"@rollup/plugin-image": "2.0.4",
"@rollup/plugin-node-resolve": "7.1.1",
"@schematics/angular": "~9.1.0",
"@schematics/angular": "~10.0.0",
"@storybook/addon-knobs": "5.3.9",
"@storybook/angular": "5.3.9",
"@storybook/core": "5.3.9",
@ -198,7 +198,7 @@
"rollup-plugin-peer-deps-external": "2.2.2",
"rollup-plugin-postcss": "2.1.1",
"rollup-plugin-typescript2": "0.26.0",
"rxjs": "6.5.4",
"rxjs": "6.5.5",
"sass": "1.26.3",
"sass-loader": "8.0.2",
"semver": "6.3.0",
@ -224,7 +224,7 @@
"tsickle": "^0.38.1",
"tslib": "^1.9.3",
"tslint": "6.0.0",
"typescript": "~3.8.3",
"typescript": "~3.9.3",
"url-loader": "^3.0.0",
"verdaccio": "^4.4.2",
"webpack": "4.42.0",

16
packages/angular/migrations.json
View File

@ -25,6 +25,22 @@
"version": "9.0.0-beta.1",
"description": "Upgrades Angular and Angular CLI to 9.0.0",
"factory": "./src/migrations/update-9-0-0/update-9-0-0"
},
"update-10-0-0": {
"version": "10.0.0-beta.1",
"description": "Upgrades Angular and Angular CLI to 10.0.0",
"factory": "./src/migrations/update-10-0-0/update-10-0-0"
}
},
"packageJsonUpdates": {
"10.0.0": {
"version": "10.0.0-beta.0",
"packages": {
"rxjs": {
"version": "~6.5.5",
"alwaysAddToPackageJson": false
}
}
}
}
}

4
packages/angular/package.json
View File

@ -38,8 +38,8 @@
"dependencies": {
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "~9.1.0",
"@schematics/angular": "~9.1.0",
"@angular-devkit/schematics": "~10.0.0",
"@schematics/angular": "~10.0.0",
"jasmine-marbles": "~0.6.0"
}
}

19
packages/angular/src/migrations/update-10-0-0/update-10-0-0.ts Normal file
View File

@ -0,0 +1,19 @@
import { chain } from '@angular-devkit/schematics';
import {
addUpdateTask,
formatFiles,
updatePackagesInPackageJson,
} from '@nrwl/workspace';
import { join } from 'path';
export default function () {
return chain([
addUpdateTask('@angular/core', '10.0.0'),
addUpdateTask('@angular/cli', '10.0.0'),
updatePackagesInPackageJson(
join(__dirname, '../../../migrations.json'),
'10.0.0'
),
formatFiles(),
]);
}

23
packages/angular/src/schematics/application/application.spec.ts
View File

@ -65,8 +65,12 @@ describe('app', () => {
).toContain('class AppModule');
const tsconfig = readJsonInTree(tree, 'apps/my-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.json');
expect(tsconfig.compilerOptions.types).toContain('jest');
expect(tsconfig.references).toContainEqual({
path: './tsconfig.app.json',
});
expect(tsconfig.references).toContainEqual({
path: './tsconfig.spec.json',
});
const tsconfigApp = JSON.parse(
stripJsonComments(getFileContent(tree, 'apps/my-app/tsconfig.app.json'))
@ -229,26 +233,11 @@ describe('app', () => {
// Make sure these have properties
[
{
path: 'apps/my-dir/my-app/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-app/tsconfig.app.json',
lookupFn: (json) => json.compilerOptions.outDir,
expectedValue: '../../../dist/out-tsc',
},
{
path: 'apps/my-dir/my-app-e2e/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
// {
// path: 'apps/my-dir/my-app-e2e/tsconfig.e2e.json',
// lookupFn: json => json.compilerOptions.outDir,
// expectedValue: '../../../dist/out-tsc/apps/my-dir/my-app-e2e'
// },
{
path: 'apps/my-dir/my-app/tslint.json',
lookupFn: (json) => json.extends,

10
packages/angular/src/schematics/application/application.ts
View File

@ -696,6 +696,12 @@ export default function (schema: Schema): Rule {
addLintFiles(options.appProjectRoot, options.linter, {
onlyGlobal: true,
}),
// TODO: Remove this after Angular 10.1.0
updateJsonInTree('tsconfig.json', () => ({
files: [],
include: [],
references: [],
})),
externalSchematic('@schematics/angular', 'application', {
name: options.name,
inlineStyle: options.inlineStyle,
@ -709,6 +715,10 @@ export default function (schema: Schema): Rule {
skipInstall: true,
skipPackageJson: false,
}),
// TODO: Remove this after Angular 10.1.0
(host) => {
host.delete('tsconfig.json');
},
addSchematicFiles(appProjectRoot, options),
options.e2eTestRunner === 'protractor'
? move(e2eProjectRoot, options.e2eProjectRoot)

10
packages/angular/src/schematics/application/files/tsconfig.json
View File

@ -1,6 +1,10 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": []
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
}
]
}

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

@ -76,8 +76,9 @@ module.exports = function(config) {
appTree
);
const tsConfig = readJsonInTree(resultTree, 'libs/lib1/tsconfig.json');
expect(tsConfig.compilerOptions.types).toContain('jasmine');
expect(tsConfig.compilerOptions.types).not.toContain('node');
expect(tsConfig.references).toContainEqual({
path: './tsconfig.spec.json',
});
});
describe('library', () => {

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

@ -51,12 +51,12 @@ function updateTsConfig(options: KarmaProjectSchema): Rule {
(json) => {
return {
...json,
compilerOptions: {
...json.compilerOptions,
types: Array.from(
new Set([...(json.compilerOptions.types || []), 'jasmine'])
),
references: [
...(json.references || []),
{
path: './tsconfig.spec.json',
},
],
};
}
);

17
packages/angular/src/schematics/library/files/lib/tsconfig.json
View File

@ -1,7 +1,14 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": []
},
"include": ["**/*.ts"]
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
}<% if (publishable) { %>,
{
"path": "./tsconfig.lib.prod.json"
}
<% } %>
]
}

2
packages/angular/src/schematics/library/lib/update-tsconfig.ts
View File

@ -12,7 +12,7 @@ export function updateTsConfig(options: NormalizedSchema): Rule {
return chain([
(host: Tree, context: SchematicContext) => {
const nxJson = readJsonInTree<NxJson>(host, 'nx.json');
return updateJsonInTree('tsconfig.json', (json) => {
return updateJsonInTree('tsconfig.base.json', (json) => {
const c = json.compilerOptions;
c.paths = c.paths || {};
delete c.paths[options.name];

41
packages/angular/src/schematics/library/library.spec.ts
View File

@ -143,7 +143,7 @@ describe('lib', () => {
it('should update root tsconfig.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts',
]);
@ -153,11 +153,17 @@ describe('lib', () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, 'libs/my-lib/tsconfig.json');
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
extends: '../../tsconfig.base.json',
files: [],
include: [],
references: [
{
path: './tsconfig.lib.json',
},
include: ['**/*.ts'],
{
path: './tsconfig.spec.json',
},
],
});
});
@ -461,7 +467,7 @@ describe('lib', () => {
{ name: 'myLib', directory: 'myDir' },
appTree
);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(
tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']
).toEqual(['libs/my-dir/my-lib/src/index.ts']);
@ -471,17 +477,20 @@ describe('lib', () => {
});
it('should update tsconfig.json (no existing path mappings)', async () => {
const updatedTree: any = updateJsonInTree('tsconfig.json', (json) => {
const updatedTree: any = updateJsonInTree(
'tsconfig.base.json',
(json) => {
json.compilerOptions.paths = undefined;
return json;
})(appTree, null);
}
)(appTree, null);
const tree = await runSchematic(
'lib',
{ name: 'myLib', directory: 'myDir' },
updatedTree
);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(
tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']
).toEqual(['libs/my-dir/my-lib/src/index.ts']);
@ -502,11 +511,17 @@ describe('lib', () => {
'libs/my-dir/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
extends: '../../../tsconfig.base.json',
files: [],
include: [],
references: [
{
path: './tsconfig.lib.json',
},
include: ['**/*.ts'],
{
path: './tsconfig.spec.json',
},
],
});
});
});

17
packages/angular/src/schematics/library/library.ts
View File

@ -7,7 +7,12 @@ import {
schematic,
Tree,
} from '@angular-devkit/schematics';
import { addLintFiles, formatFiles, Linter } from '@nrwl/workspace';
import {
addLintFiles,
formatFiles,
Linter,
updateJsonInTree,
} from '@nrwl/workspace';
import { addUnitTestRunner } from '../init/init';
import { addModule } from './lib/add-module';
import { normalizeOptions } from './lib/normalize-options';
@ -26,6 +31,12 @@ export default function (schema: Schema): Rule {
return chain([
addLintFiles(options.projectRoot, Linter.TsLint, { onlyGlobal: true }),
addUnitTestRunner(options),
// TODO: Remove this after Angular 10.1.0
updateJsonInTree('tsconfig.json', () => ({
files: [],
include: [],
references: [],
})),
externalSchematic('@schematics/angular', 'library', {
name: options.name,
prefix: options.prefix,
@ -34,6 +45,10 @@ export default function (schema: Schema): Rule {
skipPackageJson: !options.publishable,
skipTsConfig: true,
}),
// TODO: Remove this after Angular 10.1.0
(host) => {
host.delete('tsconfig.json');
},
move(options.name, options.projectRoot),
updateProject(options),

6
packages/angular/src/utils/versions.ts
View File

@ -1,7 +1,7 @@
export const nxVersion = '*';
export const angularVersion = '^9.1.0';
export const angularDevkitVersion = '0.901.0';
export const angularVersion = '^10.0.0';
export const angularDevkitVersion = '~0.1000.0';
export const angularJsVersion = '1.7.9';
export const ngrxVersion = '9.1.0';
export const rxjsVersion = '~6.5.4';
export const rxjsVersion = '~6.5.5';
export const jestPresetAngularVersion = '8.1.2';

4
packages/bazel/package.json
View File

@ -44,8 +44,8 @@
]
},
"dependencies": {
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"@nrwl/cli": "*"
},
"peerDependencies": {

2
packages/bazel/src/schematics/sync/sync.spec.ts
View File

@ -87,7 +87,7 @@ describe('@nrwl/bazel:sync', () => {
"workspace.json",
"package.json",
"nx.json",
"tsconfig.json",
"tsconfig.base.json",
"tslint.json",
],

4
packages/cypress/package.json
View File

@ -36,8 +36,8 @@
"cypress": ">= 3 < 5"
},
"dependencies": {
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@cypress/webpack-preprocessor": "~4.1.2",
"tree-kill": "1.2.2",
"ts-loader": "^5.3.1",

157
packages/cypress/src/builders/cypress/cypress.impl.spec.ts
View File

@ -1,8 +1,10 @@
import * as devkitArchitect from '@angular-devkit/architect';
jest.mock('@angular-devkit/architect');
let devkitArchitect = require('@angular-devkit/architect');
import { Architect } from '@angular-devkit/architect';
import { TestingArchitectHost } from '@angular-devkit/architect/testing';
import { schema } from '@angular-devkit/core';
import * as fsUtility from '@nrwl/workspace';
jest.mock('@nrwl/workspace');
let fsUtility = require('@nrwl/workspace');
import { MockBuilderContext } from '@nrwl/workspace/testing';
import * as child_process from 'child_process';
import { EventEmitter } from 'events';
@ -81,12 +83,9 @@ describe('Cypress builder', () => {
});
it('should call `Cypress.run` if headless mode is `true`', async (done) => {
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(cypressBuilderOptions, mockedBuilderContext)
.toPromise()
.then(() => {
expect(cypressRun).toHaveBeenCalledWith(
jasmine.objectContaining({
config: { baseUrl: 'http://localhost:4200' },
@ -100,13 +99,16 @@ describe('Cypress builder', () => {
});
it('should call `Cypress.open` if headless mode is `false`', async (done) => {
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
cypressBuilderRunner(
{
...cypressBuilderOptions,
headless: false,
watch: true,
});
run.result.then(async () => {
await run.stop();
},
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(cypressOpen).toHaveBeenCalledWith(
jasmine.objectContaining({
config: { baseUrl: 'http://localhost:4200' },
@ -120,13 +122,16 @@ describe('Cypress builder', () => {
});
it('should call `Cypress.run` with provided baseUrl', async (done) => {
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
cypressBuilderRunner(
{
...cypressBuilderOptions,
devServerTarget: undefined,
baseUrl: 'http://my-distant-host.com',
});
run.result.then(async () => {
await run.stop();
},
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(cypressRun).toHaveBeenCalledWith(
jasmine.objectContaining({
config: {
@ -143,12 +148,15 @@ describe('Cypress builder', () => {
});
it('should call `Cypress.run` with provided browser', async (done) => {
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
cypressBuilderRunner(
{
...cypressBuilderOptions,
browser: 'chrome',
});
run.result.then(async () => {
await run.stop();
},
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(cypressRun).toHaveBeenCalledWith(
jasmine.objectContaining({
browser: 'chrome',
@ -163,7 +171,8 @@ describe('Cypress builder', () => {
});
it('should call `Cypress.run` without baseUrl nor dev server target value', async (done) => {
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
cypressBuilderRunner(
{
cypressConfig: 'apps/my-app-e2e/cypress.json',
tsConfig: 'apps/my-app-e2e/tsconfig.json',
devServerTarget: undefined,
@ -173,9 +182,11 @@ describe('Cypress builder', () => {
record: false,
baseUrl: undefined,
watch: false,
});
run.result.then(async () => {
await run.stop();
},
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(cypressRun).toHaveBeenCalledWith(
jasmine.objectContaining({
project: path.dirname(cypressBuilderOptions.cypressConfig),
@ -196,12 +207,9 @@ describe('Cypress builder', () => {
success: false,
})
);
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
run.result.then(async (res) => {
await run.stop();
cypressBuilderRunner(cypressBuilderOptions, mockedBuilderContext)
.toPromise()
.then((res) => {
expect(res.success).toBe(false);
done();
});
@ -213,9 +221,9 @@ describe('Cypress builder', () => {
cypressConfig: 'some/project/my-cypress.json',
};
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', cfg);
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(cfg, mockedBuilderContext)
.toPromise()
.then(() => {
expect(cypressRun).toHaveBeenCalledWith(
jasmine.objectContaining({
project: path.dirname(cfg.cypressConfig),
@ -269,13 +277,10 @@ describe('Cypress builder', () => {
});
it('should call `fork.child_process` with the tsc command', async () => {
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
fakeEventEmitter.emit('exit', 0);
await run.result;
await run.stop();
cypressBuilderRunner(
cypressBuilderOptions,
mockedBuilderContext
).subscribe();
expect(fork).toHaveBeenCalledWith(
'/root/node_modules/typescript/bin/tsc',
['-p', '/root/apps/my-app-e2e/tsconfig.json'],
@ -284,12 +289,9 @@ describe('Cypress builder', () => {
});
it('should copy fixtures folder to out-dir', async (done) => {
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(cypressBuilderOptions, mockedBuilderContext)
.toPromise()
.then(() => {
expect(
fsExtras.copySync
).toHaveBeenCalledWith(
@ -305,12 +307,9 @@ describe('Cypress builder', () => {
it('should not copy fixtures folder if they are not defined in the cypress config', async (done) => {
delete cypressConfig.fixturesFolder;
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(cypressBuilderOptions, mockedBuilderContext)
.toPromise()
.then(() => {
expect(fsExtras.copySync).not.toHaveBeenCalled();
done();
});
@ -321,12 +320,12 @@ describe('Cypress builder', () => {
it('should copy regex files to out-dir', async (done) => {
const regex: string = '^.+\\.feature$';
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
...cypressBuilderOptions,
copyFiles: regex,
});
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(
{ ...cypressBuilderOptions, copyFiles: regex },
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(
fsExtras.copySync
).toHaveBeenCalledWith(
@ -343,12 +342,12 @@ describe('Cypress builder', () => {
it('should not copy regex files if the regex is not defined', async (done) => {
const regex: string = undefined;
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
...cypressBuilderOptions,
copyFiles: regex,
});
run.result.then(async () => {
await run.stop();
cypressBuilderRunner(
{ ...cypressBuilderOptions, copyFiles: regex },
mockedBuilderContext
)
.toPromise()
.then(() => {
expect(
fsExtras.copySync
).not.toHaveBeenCalledWith(
@ -367,30 +366,26 @@ describe('Cypress builder', () => {
const regex: string = '^.+\\.feature$';
const run = await architect.scheduleBuilder('@nrwl/cypress:cypress', {
...cypressBuilderOptions,
copyFiles: regex,
});
run.result
.then(async () => {
await run.stop();
try {
cypressBuilderRunner(
{ ...cypressBuilderOptions, copyFiles: regex },
mockedBuilderContext
)
.toPromise()
.then(() => {
fail();
})
.catch(async () => {
await run.stop();
done();
});
} catch (e) {
done();
}
fakeEventEmitter.emit('exit', 0); // Passing tsc command
});
it('should fail early if integration files fail to compile', async (done) => {
const run = await architect.scheduleBuilder(
'@nrwl/cypress:cypress',
cypressBuilderOptions
);
run.result.then(async (res) => {
await run.stop();
cypressBuilderRunner(cypressBuilderOptions, mockedBuilderContext)
.toPromise()
.then((res) => {
expect(res.success).toBe(false);
done();
});

3
packages/cypress/src/schematics/cypress-project/files/tsconfig.e2e.json
View File

@ -3,7 +3,8 @@
"compilerOptions": {
"sourceMap": false,
"outDir": "<%= offsetFromRoot %>dist/out-tsc",
"allowJs": true
"allowJs": true,
"types": ["cypress", "node"]
},
"include": ["src/**/*.ts", "src/**/*.js"]
}

13
packages/cypress/src/schematics/cypress-project/files/tsconfig.json
View File

@ -1,7 +1,10 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": ["cypress", "node"]
},
"include": ["**/*.ts", "**/*.js"]
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
}

2
packages/eslint-plugin-nx/tests/rules/enforce-module-boundaries.spec.ts
View File

@ -68,7 +68,7 @@ const fileSys = {
'./libs/domain2/src/index.ts': '',
'./libs/buildableLib/src/main.ts': '',
'./libs/nonBuildableLib/src/main.ts': '',
'./tsconfig.json': JSON.stringify(tsconfig),
'./tsconfig.base.json': JSON.stringify(tsconfig),
};
describe('Enforce Module Boundaries', () => {

2
packages/express/package.json
View File

@ -34,6 +34,6 @@
"dependencies": {
"@nrwl/node": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "~9.1.0"
"@angular-devkit/schematics": "~10.0.0"
}
}

14
packages/express/src/schematics/application/application.spec.ts
View File

@ -18,10 +18,20 @@ describe('app', () => {
);
});
it('should add types to the tsconfig.app.json', async () => {
const tree = await runSchematic('app', { name: 'myNodeApp' }, appTree);
const tsconfig = readJsonInTree(tree, 'apps/my-node-app/tsconfig.app.json');
expect(tsconfig.compilerOptions.types).toContain('express');
});
it('should update tsconfig', async () => {
const tree = await runSchematic('app', { name: 'myNodeApp' }, appTree);
const tsconfig = readJsonInTree(tree, 'apps/my-node-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.json');
expect(tsconfig.compilerOptions.types).toContain('express');
expect(tsconfig.references).toContainEqual({
path: './tsconfig.app.json',
});
expect(tsconfig.references).toContainEqual({
path: './tsconfig.spec.json',
});
});
});

2
packages/express/src/schematics/application/application.ts
View File

@ -17,7 +17,7 @@ interface NormalizedSchema extends Schema {
}
function addTypes(options: NormalizedSchema): Rule {
const tsConfigPath = join(options.appProjectRoot, 'tsconfig.json');
const tsConfigPath = join(options.appProjectRoot, 'tsconfig.app.json');
return updateJsonInTree(tsConfigPath, (json) => {
json.compilerOptions.types = [...json.compilerOptions.types, 'express'];
return json;

5
packages/express/src/utils/testing.ts
View File

@ -7,6 +7,11 @@ const testRunner = new SchematicTestRunner(
join(__dirname, '../../collection.json')
);
testRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../jest/collection.json')
);
testRunner.registerCollection(
'@nrwl/node',
join(__dirname, '../../../node/collection.json')

6
packages/jest/package.json
View File

@ -35,8 +35,8 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0"
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0"
}
}

13
packages/jest/src/schematics/jest-project/jest-project.spec.ts
View File

@ -29,9 +29,9 @@ describe('jestProject', () => {
appTree = await callRule(
updateJsonInTree('libs/lib1/tsconfig.json', (json) => {
return {
compilerOptions: {
types: [],
},
files: [],
include: [],
references: [],
};
}),
appTree
@ -98,7 +98,7 @@ describe('jestProject', () => {
`);
});
it('should update the local tsconfig.json', async () => {
it('should add a reference to solution tsconfig.json', async () => {
const resultTree = await runSchematic(
'jest-project',
{
@ -107,8 +107,9 @@ describe('jestProject', () => {
appTree
);
const tsConfig = readJsonInTree(resultTree, 'libs/lib1/tsconfig.json');
expect(tsConfig.compilerOptions.types).toContain('jest');
expect(tsConfig.compilerOptions.types).toContain('node');
expect(tsConfig.references).toContainEqual({
path: './tsconfig.spec.json',
});
});
it('should create a tsconfig.spec.json', async () => {

15
packages/jest/src/schematics/jest-project/lib/update-tsconfig.ts
View File

@ -17,15 +17,12 @@ export function updateTsConfig(options: JestProjectSchema): Rule {
return updateJsonInTree(
join(projectConfig.root, 'tsconfig.json'),
(json) => {
return {
...json,
compilerOptions: {
...json.compilerOptions,
types: Array.from(
new Set([...(json.compilerOptions.types || []), 'node', 'jest'])
),
},
};
if (json.references) {
json.references.push({
path: './tsconfig.spec.json',
});
}
return json;
}
);
};

2
packages/linter/package.json
View File

@ -27,6 +27,6 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "~0.901.0"
"@angular-devkit/architect": "~0.1000.0"
}
}

2
packages/nest/migrations.json
View File

@ -65,7 +65,7 @@
"alwaysAddToPackageJson": false
},
"rxjs": {
"version": "^6.5.4",
"version": "~6.5.5",
"alwaysAddToPackageJson": true
}
}

2
packages/nest/package.json
View File

@ -34,7 +34,7 @@
"dependencies": {
"@nrwl/node": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/schematics": "~10.0.0",
"@nestjs/schematics": "^6.3.0"
}
}

2
packages/nest/src/schematics/application/application.spec.ts
View File

@ -21,7 +21,7 @@ describe('app', () => {
it('should have es2015 as the tsconfig target', async () => {
const tree = await runSchematic('app', { name: 'myNodeApp' }, appTree);
const tsconfig = readJsonInTree(tree, 'apps/my-node-app/tsconfig.json');
const tsconfig = readJsonInTree(tree, 'apps/my-node-app/tsconfig.app.json');
expect(tsconfig.compilerOptions.target).toBe('es2015');
});
});

2
packages/nest/src/schematics/application/application.ts
View File

@ -75,7 +75,7 @@ export default function (schema: Schema): Rule {
addMainFile(options),
addAppFiles(options),
updateJsonInTree(
join(options.appProjectRoot, 'tsconfig.json'),
join(options.appProjectRoot, 'tsconfig.app.json'),
(json) => {
json.compilerOptions.emitDecoratorMetadata = true;
json.compilerOptions.target = 'es2015';

72
packages/nest/src/schematics/library/library.spec.ts
View File

@ -158,7 +158,7 @@ describe('lib', () => {
it('should update root tsconfig.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts',
]);
@ -167,14 +167,21 @@ describe('lib', () => {
it('should create a local tsconfig.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, 'libs/my-lib/tsconfig.json');
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
target: 'es6',
expect(tsconfigJson).toMatchInlineSnapshot(`
Object {
"extends": "../../tsconfig.base.json",
"files": Array [],
"include": Array [],
"references": Array [
Object {
"path": "./tsconfig.lib.json",
},
include: ['**/*.ts'],
});
Object {
"path": "./tsconfig.spec.json",
},
],
}
`);
});
it('should extend the local tsconfig.json with tsconfig.spec.json', async () => {
@ -283,7 +290,7 @@ describe('lib', () => {
{ name: 'myLib', directory: 'myDir' },
appTree
);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(
tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']
).toEqual(['libs/my-dir/my-lib/src/index.ts']);
@ -303,14 +310,21 @@ describe('lib', () => {
tree,
'libs/my-dir/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
target: 'es6',
expect(tsconfigJson).toMatchInlineSnapshot(`
Object {
"extends": "../../../tsconfig.base.json",
"files": Array [],
"include": Array [],
"references": Array [
Object {
"path": "./tsconfig.lib.json",
},
include: ['**/*.ts'],
});
Object {
"path": "./tsconfig.spec.json",
},
],
}
`);
});
});
@ -330,14 +344,18 @@ describe('lib', () => {
resultTree,
'libs/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
types: ['node'],
target: 'es6',
expect(tsconfigJson).toMatchInlineSnapshot(`
Object {
"extends": "../../tsconfig.base.json",
"files": Array [],
"include": Array [],
"references": Array [
Object {
"path": "./tsconfig.lib.json",
},
include: ['**/*.ts'],
});
],
}
`);
expect(
workspaceJson.projects['my-lib'].architect.lint.options.tsConfig
).toEqual(['libs/my-lib/tsconfig.lib.json']);
@ -362,7 +380,7 @@ describe('lib', () => {
});
describe('compiler options target', () => {
it('should set target to es6 in tsconfig.json by default', async () => {
it('should set target to es6 in tsconfig.lib.json by default', async () => {
const tree = await runSchematic(
'lib',
{ name: 'myLib', directory: 'myDir' },
@ -371,12 +389,12 @@ describe('lib', () => {
const tsconfigJson = readJsonInTree(
tree,
'libs/my-dir/my-lib/tsconfig.json'
'libs/my-dir/my-lib/tsconfig.lib.json'
);
expect(tsconfigJson.compilerOptions.target).toEqual('es6');
});
it('should set target to es2020 in tsconfig.json', async () => {
it('should set target to es2020 in tsconfig.lib.json', async () => {
const tree = await runSchematic(
'lib',
{ name: 'myLib', directory: 'myDir', target: 'es2020' },
@ -385,7 +403,7 @@ describe('lib', () => {
const tsconfigJson = readJsonInTree(
tree,
'libs/my-dir/my-lib/tsconfig.json'
'libs/my-dir/my-lib/tsconfig.lib.json'
);
expect(tsconfigJson.compilerOptions.target).toEqual('es2020');
});

7
packages/nest/src/schematics/library/library.ts
View File

@ -164,10 +164,13 @@ function createFiles(options: NormalizedSchema): Rule {
function updateTsConfig(options: NormalizedSchema): Rule {
return (host: Tree, context: SchematicContext) => {
const projectConfig = getProjectConfig(host, options.name);
return updateJsonInTree(`${projectConfig.root}/tsconfig.json`, (json) => {
return updateJsonInTree(
`${projectConfig.root}/tsconfig.lib.json`,
(json) => {
json.compilerOptions.target = options.target;
return json;
});
}
);
};
}

2
packages/nest/src/schematics/library/schema.json
View File

@ -49,7 +49,7 @@
"skipTsConfig": {
"type": "boolean",
"default": false,
"description": "Do not update tsconfig.json for development experience."
"description": "Do not update tsconfig.base.json for development experience."
},
"publishable": {
"type": "boolean",

5
packages/nest/src/utils/testing.ts
View File

@ -7,6 +7,11 @@ const testRunner = new SchematicTestRunner(
join(__dirname, '../../collection.json')
);
testRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../jest/collection.json')
);
testRunner.registerCollection(
'@nrwl/node',
join(__dirname, '../../../node/collection.json')

2
packages/nest/src/utils/versions.ts
View File

@ -3,6 +3,6 @@ export const nxVersion = '*';
export const nestJsVersion = '^7.0.0';
export const nestJsSchematicsVersion = '^7.0.0';
export const rxjsVersion = '^6.5.4';
export const rxjsVersion = '~6.5.5';
export const reflectMetadataVersion = '^0.1.13';

2
packages/next/package.json
View File

@ -35,7 +35,7 @@
"dependencies": {
"@nrwl/react": "*",
"@nrwl/web": "*",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/schematics": "~10.0.0",
"@svgr/webpack": "^4.3.3",
"url-loader": "^2.2.0"
}

2
packages/next/src/schematics/application/files/tsconfig.json__tmpl__
View File

@ -1,5 +1,5 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"compilerOptions": {
"jsx": "preserve",
"allowJs": true,

8
packages/node/package.json
View File

@ -34,10 +34,10 @@
"dependencies": {
"@nrwl/jest": "*",
"@nrwl/linter": "*",
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/build-webpack": "~0.901.0",
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"@angular-devkit/build-webpack": "~0.1000.0",
"circular-dependency-plugin": "5.2.0",
"copy-webpack-plugin": "5.1.1",
"fork-ts-checker-webpack-plugin": "^3.1.1",

118
packages/node/src/builders/execute/execute.impl.spec.ts
View File

@ -4,7 +4,6 @@ import {
nodeExecuteBuilderHandler,
} from './execute.impl';
import { of, from } from 'rxjs';
import * as devkitArchitect from '@angular-devkit/architect';
import { MockBuilderContext } from '@nrwl/workspace/testing';
@ -18,7 +17,6 @@ let treeKill = require('tree-kill');
describe('NodeExecuteBuilder', () => {
let testOptions: NodeExecuteBuilderOptions;
let context: MockBuilderContext;
let scheduleTargetAndForget: jasmine.Spy;
beforeEach(async () => {
fork.mockReturnValue({
@ -45,24 +43,27 @@ describe('NodeExecuteBuilder', () => {
host: 'localhost',
watch: true,
};
scheduleTargetAndForget = spyOn(
devkitArchitect,
'scheduleTargetAndForget'
).and.returnValue(of({ success: true, outfile: 'outfile.js' }));
});
it('should build the application and start the built file', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(testOptions, context).toPromise();
expect(scheduleTargetAndForget).toHaveBeenCalledWith(
context,
expect(context.scheduleTarget).toHaveBeenCalledWith(
{
project: 'nodeapp',
target: 'build',
},
{
watch: true,
}
},
undefined
);
expect(fork).toHaveBeenCalledWith('outfile.js', [], {
execArgv: [
@ -78,6 +79,13 @@ describe('NodeExecuteBuilder', () => {
describe('--inspect', () => {
describe('inspect', () => {
it('should inspect the process', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -97,6 +105,13 @@ describe('NodeExecuteBuilder', () => {
describe('inspect-brk', () => {
it('should inspect and break at beginning of execution', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -118,6 +133,13 @@ describe('NodeExecuteBuilder', () => {
describe('--host', () => {
describe('0.0.0.0', () => {
it('should inspect the process on host 0.0.0.0', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -139,6 +161,13 @@ describe('NodeExecuteBuilder', () => {
describe('--port', () => {
describe('1234', () => {
it('should inspect the process on port 1234', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -159,6 +188,13 @@ describe('NodeExecuteBuilder', () => {
describe('--runtimeArgs', () => {
it('should add runtime args to the node process', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -183,11 +219,14 @@ describe('NodeExecuteBuilder', () => {
callback(new Error('Error Message'));
});
const loggerError = spyOn(context.logger, 'error');
scheduleTargetAndForget = scheduleTargetAndForget.and.returnValue(
from([
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: from([
{ success: true, outfile: 'outfile.js' },
{ success: true, outfile: 'outfile.js' },
])
]),
stop: () => Promise.resolve(),
})
);
nodeExecuteBuilderHandler(testOptions, context).subscribe({
complete: () => {
@ -202,17 +241,27 @@ describe('NodeExecuteBuilder', () => {
callback([new Error('error'), '', 'Error Message']);
});
const loggerError = spyOn(context.logger, 'error');
scheduleTargetAndForget = scheduleTargetAndForget.and.returnValue(
from([
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: from([
{ success: true, outfile: 'outfile.js' },
{ success: true, outfile: 'outfile.js' },
])
]),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(testOptions, context).toPromise();
expect(loggerError.calls.argsFor(1)).toEqual(['Error Message']);
});
it('should build the application and start the built file with options', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
...testOptions,
@ -227,6 +276,13 @@ describe('NodeExecuteBuilder', () => {
});
it('should warn users who try to use it in production', async () => {
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true, outfile: 'outfile.js' }),
stop: () => Promise.resolve(),
})
);
spyOn(context, 'validateOptions').and.returnValue(
Promise.resolve({
optimization: true,
@ -239,8 +295,11 @@ describe('NodeExecuteBuilder', () => {
describe('waitUntilTasks', () => {
it('should run the tasks before starting the build', async () => {
scheduleTargetAndForget = scheduleTargetAndForget.and.returnValue(
of({ success: true })
spyOn(context, 'scheduleTarget').and.returnValue(
of({
output: of({ success: true }),
stop: () => Promise.resolve(),
})
);
await nodeExecuteBuilderHandler(
{
@ -250,20 +309,31 @@ describe('NodeExecuteBuilder', () => {
context
).toPromise();
expect(scheduleTargetAndForget).toHaveBeenCalledTimes(3);
expect(scheduleTargetAndForget).toHaveBeenCalledWith(context, {
expect(context.scheduleTarget).toHaveBeenCalledTimes(3);
expect(context.scheduleTarget).toHaveBeenCalledWith(
{
project: 'project1',
target: 'target1',
});
expect(scheduleTargetAndForget).toHaveBeenCalledWith(context, {
},
undefined,
undefined
);
expect(context.scheduleTarget).toHaveBeenCalledWith(
{
project: 'project2',
target: 'target2',
});
},
undefined,
undefined
);
});
it('should not run the build if any of the tasks fail', async () => {
scheduleTargetAndForget = scheduleTargetAndForget.and.callFake((target) =>
of({ success: target.target === 'project1' })
spyOn(context, 'scheduleTarget').and.callFake((target) =>
of({
output: of({ success: target.target === 'project1' }),
stop: () => Promise.resolve(),
})
);
const loggerError = spyOn(context.logger, 'error');

9
packages/node/src/builders/package/package.impl.spec.ts
View File

@ -2,7 +2,8 @@ import { EventEmitter } from 'events';
import { join } from 'path';
import { getMockContext } from '../../utils/testing';
import { MockBuilderContext } from '@nrwl/workspace/testing';
import * as projectGraphUtils from '@nrwl/workspace/src/core/project-graph';
jest.mock('@nrwl/workspace/src/core/project-graph');
let projectGraph = require('@nrwl/workspace/src/core/project-graph');
import {
ProjectGraph,
ProjectType,
@ -25,7 +26,7 @@ let { fork } = require('child_process');
jest.mock('tree-kill');
let treeKill = require('tree-kill');
describe('NodeCompileBuilder', () => {
describe('NodePackageBuilder', () => {
let testOptions: NodePackageBuilderOptions;
let context: MockBuilderContext;
let fakeEventEmitter: EventEmitter;
@ -75,7 +76,7 @@ describe('NodeCompileBuilder', () => {
describe('Without library dependencies', () => {
beforeEach(() => {
// mock createProjectGraph without deps
spyOn(projectGraphUtils, 'createProjectGraph').and.callFake(() => {
spyOn(projectGraph, 'createProjectGraph').and.callFake(() => {
return {
nodes: {},
dependencies: {},
@ -223,7 +224,7 @@ describe('NodeCompileBuilder', () => {
describe('building with dependencies', () => {
beforeEach(() => {
spyOn(projectGraphUtils, 'createProjectGraph').and.callFake(() => {
spyOn(projectGraph, 'createProjectGraph').and.callFake(() => {
return {
nodes: {
nodelib: {

26
packages/node/src/schematics/application/application.spec.ts
View File

@ -85,10 +85,23 @@ describe('app', () => {
expect(tree.exists(`apps/my-node-app/jest.config.js`)).toBeTruthy();
expect(tree.exists('apps/my-node-app/src/main.ts')).toBeTruthy();
const tsconfig = readJsonInTree(tree, 'apps/my-node-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.json');
expect(tsconfig.compilerOptions.types).toContain('node');
expect(tsconfig.compilerOptions.types).toContain('jest');
expect(tree.readContent('apps/my-node-app/tsconfig.json'))
.toMatchInlineSnapshot(`
"{
\\"extends\\": \\"../../tsconfig.base.json\\",
\\"files\\": [],
\\"include\\": [],
\\"references\\": [
{
\\"path\\": \\"./tsconfig.app.json\\"
},
{
\\"path\\": \\"./tsconfig.spec.json\\"
}
]
}
"
`);
const tsconfigApp = JSON.parse(
stripJsonComments(
@ -172,11 +185,6 @@ describe('app', () => {
// Make sure these have properties
[
{
path: 'apps/my-dir/my-node-app/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-node-app/tsconfig.app.json',
lookupFn: (json) => json.compilerOptions.outDir,

13
packages/node/src/schematics/application/files/app/tsconfig.json
View File

@ -1,7 +1,10 @@
{
"extends": "<%= offset %>tsconfig.json",
"compilerOptions": {
"types": ["node"]
},
"include": ["**/*.ts"]
"extends": "<%= offset %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
}
]
}

9
packages/node/src/schematics/library/files/lib/tsconfig.json
View File

@ -1,9 +0,0 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": [
"node"
]
},
"include": ["**/*.ts"]
}

4
packages/node/src/schematics/library/files/lib/tsconfig.lib.json
View File

@ -5,9 +5,7 @@
"outDir": "<%= offsetFromRoot %>dist/out-tsc",
"declaration": true,
"rootDir": "./src",
"types": [
"node"
]
"types": ["node"]
},
"exclude": ["**/*.spec.ts"],
"include": ["**/*.ts"]

47
packages/node/src/schematics/library/library.spec.ts
View File

@ -2,7 +2,6 @@ import { Tree } from '@angular-devkit/schematics';
import { NxJson, readJsonInTree } from '@nrwl/workspace';
import { createEmptyWorkspace } from '@nrwl/workspace/testing';
import { runSchematic } from '../../utils/testing';
import { expectTestsPass } from 'e2e/utils';
describe('lib', () => {
let appTree: Tree;
@ -52,9 +51,9 @@ describe('lib', () => {
});
});
it('should update root tsconfig.json', async () => {
it('should update root tsconfig.base.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts',
]);
@ -63,13 +62,15 @@ describe('lib', () => {
it('should create a local tsconfig.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, 'libs/my-lib/tsconfig.json');
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
expect(tsconfigJson.extends).toEqual('../../tsconfig.base.json');
expect(tsconfigJson.references).toEqual([
{
path: './tsconfig.lib.json',
},
include: ['**/*.ts'],
});
{
path: './tsconfig.spec.json',
},
]);
});
it('should extend the local tsconfig.json with tsconfig.spec.json', async () => {
@ -87,6 +88,7 @@ describe('lib', () => {
tree,
'libs/my-lib/tsconfig.lib.json'
);
expect(tsconfigJson.compilerOptions.types).toContain('node');
expect(tsconfigJson.extends).toEqual('./tsconfig.json');
});
@ -174,7 +176,7 @@ describe('lib', () => {
{ name: 'myLib', directory: 'myDir' },
appTree
);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(
tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']
).toEqual(['libs/my-dir/my-lib/src/index.ts']);
@ -194,13 +196,15 @@ describe('lib', () => {
tree,
'libs/my-dir/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../../tsconfig.json',
compilerOptions: {
types: ['node', 'jest'],
expect(tsconfigJson.extends).toEqual('../../../tsconfig.base.json');
expect(tsconfigJson.references).toEqual([
{
path: './tsconfig.lib.json',
},
include: ['**/*.ts'],
});
{
path: './tsconfig.spec.json',
},
]);
});
});
@ -220,13 +224,12 @@ describe('lib', () => {
resultTree,
'libs/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
types: ['node'],
expect(tsconfigJson.extends).toEqual('../../tsconfig.base.json');
expect(tsconfigJson.references).toEqual([
{
path: './tsconfig.lib.json',
},
include: ['**/*.ts'],
});
]);
expect(
workspaceJson.projects['my-lib'].architect.lint.options.tsConfig
).toEqual(['libs/my-lib/tsconfig.lib.json']);

17
packages/node/src/schematics/library/library.ts
View File

@ -16,11 +16,9 @@ import {
} from '@angular-devkit/schematics';
import {
formatFiles,
getProjectConfig,
names,
offsetFromRoot,
toFileName,
updateJsonInTree,
updateWorkspaceInTree,
getNpmScope,
} from '@nrwl/workspace';
@ -43,7 +41,6 @@ export default function (schema: NormalizedSchema): Rule {
return chain([
externalSchematic('@nrwl/workspace', 'lib', schema),
createFiles(options),
updateTsConfig(options),
addProject(options),
formatFiles(options),
]);
@ -99,20 +96,6 @@ function createFiles(options: NormalizedSchema): Rule {
);
}
function updateTsConfig(options: NormalizedSchema): Rule {
if (options.unitTestRunner === 'none') {
return noop();
}
return (host: Tree, context: SchematicContext) => {
const projectConfig = getProjectConfig(host, options.name);
return updateJsonInTree(`${projectConfig.root}/tsconfig.json`, (json) => {
json.compilerOptions.types.push('jest');
return json;
});
};
}
function addProject(options: NormalizedSchema): Rule {
if (!options.publishable) {
return noop();

2
packages/node/src/schematics/library/schema.json
View File

@ -49,7 +49,7 @@
"skipTsConfig": {
"type": "boolean",
"default": false,
"description": "Do not update tsconfig.json for development experience."
"description": "Do not update tsconfig.base.json for development experience."
},
"publishable": {
"type": "boolean",

8
packages/node/src/utils/testing.ts
View File

@ -14,13 +14,13 @@ const testRunner = new SchematicTestRunner(
);
testRunner.registerCollection(
'@nrwl/workspace',
join(__dirname, '../../../workspace/collection.json')
'@nrwl/jest',
join(__dirname, '../../../jest/collection.json')
);
testRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../jest/collection.json')
'@nrwl/workspace',
join(__dirname, '../../../workspace/collection.json')
);
export function runSchematic(schematicName: string, options: any, tree: Tree) {

6
packages/nx-plugin/package.json
View File

@ -31,9 +31,9 @@
"dependencies": {
"@nrwl/node": "*",
"@nrwl/linter": "*",
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"fs-extra": "7.0.1",
"tmp": "0.0.33",
"yargs-parser": "10.0.0",

63
packages/nx-plugin/src/builders/e2e/e2e.impl.spec.ts
View File

@ -1,63 +0,0 @@
import { NxPluginE2EBuilderOptions, runNxPluginE2EBuilder } from './e2e.impl';
import { MockBuilderContext } from '@nrwl/workspace/testing';
import { getMockContext } from '../../utils/testing';
import * as devkitArchitect from '@angular-devkit/architect';
import { of } from 'rxjs';
describe('NxPluginE2EBuilder', () => {
let testOptions: NxPluginE2EBuilderOptions;
let context: MockBuilderContext;
let scheduleTargetAndForgetSpy: jest.SpyInstance;
let contextBuilderSpy: jest.SpyInstance;
beforeEach(async () => {
context = await getMockContext();
context.addTarget(
{ project: 'plugin-e2e', target: 'build' },
'@nrwl/nx-plugin:e2e'
);
testOptions = {
jestConfig: 'apps/plugin-e2e/jest.config.js',
tsSpecConfig: 'apps/plugin-e2e/tsconfig.spec.js',
target: 'plugin:build',
};
scheduleTargetAndForgetSpy = jest
.spyOn(devkitArchitect, 'scheduleTargetAndForget')
.mockImplementation((context, options) => {
debugger;
return of({ success: true });
});
contextBuilderSpy = jest
.spyOn(context, 'scheduleBuilder')
.mockImplementation((name, overrides) => {
return new Promise((res, rej) => {
res({
result: of({ success: true }).toPromise(),
id: 1,
info: {
builderName: 'builder',
description: '',
optionSchema: {},
},
output: of({ success: true }),
progress: of({} as any),
stop: jest.fn(),
});
});
});
});
it('should build the plugin and run the test', async () => {
await runNxPluginE2EBuilder(testOptions, context).toPromise();
expect(scheduleTargetAndForgetSpy).toHaveBeenCalledWith(context, {
project: 'plugin',
target: 'build',
});
expect(contextBuilderSpy).toHaveBeenCalledWith('@nrwl/jest:jest', {
tsConfig: testOptions.tsSpecConfig,
jestConfig: testOptions.jestConfig,
watch: false,
});
});
});

15
packages/nx-plugin/src/schematics/e2e-project/files/tsconfig.json__tmpl__
View File

@ -1,9 +1,10 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": [
"node"
]
},
"include": ["**/*.ts"]
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
}

61
packages/nx-plugin/src/schematics/plugin/plugin.spec.ts
View File

@ -113,76 +113,15 @@ describe('NxPlugin plugin', () => {
).toBeTruthy();
});
it('should call the @nrwl/node:lib schematic', async () => {
const externalSchematicSpy = jest.spyOn(ngSchematics, 'externalSchematic');
await runSchematic('plugin', { name: 'myPlugin' }, appTree);
expect(externalSchematicSpy).toBeCalledWith(
'@nrwl/node',
'lib',
expect.objectContaining({
publishable: true,
})
);
});
it('should call the @nrwl/nx-plugin:e2e schematic', async () => {
const schematicSpy = jest.spyOn(ngSchematics, 'schematic');
const tree = await runSchematic('plugin', { name: 'myPlugin' }, appTree);
expect(schematicSpy).toBeCalledWith(
'e2e-project',
expect.objectContaining({
pluginName: 'my-plugin',
pluginOutputPath: `dist/libs/my-plugin`,
npmPackageName: '@proj/my-plugin',
})
);
});
it('should call the @nrwl/nx-plugin:schematic schematic', async () => {
const schematicSpy = jest.spyOn(ngSchematics, 'schematic');
const tree = await runSchematic('plugin', { name: 'myPlugin' }, appTree);
expect(schematicSpy).toBeCalledWith(
'schematic',
expect.objectContaining({
project: 'my-plugin',
name: `my-plugin`,
})
);
});
it('should call the @nrwl/nx-plugin:builder schematic', async () => {
const schematicSpy = jest.spyOn(ngSchematics, 'schematic');
const tree = await runSchematic('plugin', { name: 'myPlugin' }, appTree);
expect(schematicSpy).toBeCalledWith(
'builder',
expect.objectContaining({
project: 'my-plugin',
name: `build`,
})
);
});
describe('--unitTestRunner', () => {
describe('none', () => {
it('should not generate test files', async () => {
const externalSchematicSpy = jest.spyOn(
ngSchematics,
'externalSchematic'
);
const tree = await runSchematic(
'plugin',
{ name: 'myPlugin', unitTestRunner: 'none' },
appTree
);
expect(externalSchematicSpy).toBeCalledWith(
'@nrwl/node',
'lib',
expect.objectContaining({
unitTestRunner: 'none',
})
);
expect(
tree.exists('libs/my-plugin/src/schematics/my-plugin/schematic.ts')
).toBeTruthy();

2
packages/react/package.json
View File

@ -36,7 +36,7 @@
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@nrwl/web": "*",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/schematics": "~10.0.0",
"@svgr/webpack": "^5.2.0",
"confusing-browser-globals": "^1.0.9",
"eslint-plugin-import": "^2.20.1",

16
packages/react/src/migrations/update-8-10-0/update-8-10-0.spec.ts
View File

@ -1,9 +1,10 @@
import { Tree } from '@angular-devkit/schematics';
import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
import { readJsonInTree } from '@nrwl/workspace';
import { readJsonInTree, updateJsonInTree } from '@nrwl/workspace';
import * as path from 'path';
import { createEmptyWorkspace } from '@nrwl/workspace/testing';
import { join } from 'path';
import { callRule } from '../../../src/utils/testing';
describe('Update 8-10-0', () => {
let tree: Tree;
@ -59,6 +60,11 @@ describe('Update 8-10-0', () => {
path.join(__dirname, '../../../collection.json')
);
reactRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../../jest/collection.json')
);
reactRunner.registerCollection(
'@nrwl/cypress',
join(__dirname, '../../../../cypress/collection.json')
@ -74,6 +80,14 @@ describe('Update 8-10-0', () => {
)
.toPromise();
tree = await callRule(
updateJsonInTree(`nested/nested-app/tsconfig.json`, (json) => {
json.files = [];
return json;
}),
tree
);
tree = await schematicRunner
.runSchematicAsync('update-8.10.0', {}, tree)
.toPromise();

5
packages/react/src/migrations/update-8-10-1/fix-react-tsconfig-8-10-1.spec.ts
View File

@ -28,6 +28,11 @@ describe('Update 8-10-0', () => {
path.join(__dirname, '../../../collection.json')
);
reactRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../../jest/collection.json')
);
reactRunner.registerCollection(
'@nrwl/cypress',
join(__dirname, '../../../../cypress/collection.json')

20
packages/react/src/schematics/application/application.spec.ts
View File

@ -55,8 +55,14 @@ describe('app', () => {
expect(jestConfig).toContain('@nrwl/react/plugins/jest');
const tsconfig = readJsonInTree(tree, 'apps/my-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.json');
expect(tsconfig.compilerOptions.types).toContain('jest');
expect(tsconfig.references).toEqual([
{
path: './tsconfig.app.json',
},
{
path: './tsconfig.spec.json',
},
]);
const tsconfigApp = JSON.parse(
stripJsonComments(tree.readContent('apps/my-app/tsconfig.app.json'))
@ -138,21 +144,11 @@ describe('app', () => {
// Make sure these have properties
[
{
path: 'apps/my-dir/my-app/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-app/tsconfig.app.json',
lookupFn: (json) => json.compilerOptions.outDir,
expectedValue: '../../../dist/out-tsc',
},
{
path: 'apps/my-dir/my-app-e2e/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-app-e2e/tsconfig.e2e.json',
lookupFn: (json) => json.compilerOptions.outDir,

5
packages/react/src/schematics/application/files/app/tsconfig.app.json
View File

@ -4,6 +4,11 @@
"outDir": "<%= offsetFromRoot %>dist/out-tsc",
"types": ["node"]
},
"files": [
<% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}

18
packages/react/src/schematics/application/files/app/tsconfig.json__tmpl__
View File

@ -1,16 +1,16 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"compilerOptions": {
"jsx": "react",
"allowJs": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"types": []
"allowSyntheticDefaultImports": true
},
"files": [
<% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
}
]
}

25
packages/react/src/schematics/application/lib/update-jest-config.ts
View File

@ -1,14 +1,33 @@
import { noop, Rule } from '@angular-devkit/schematics';
import { chain, noop, Rule } from '@angular-devkit/schematics';
import { updateJestConfigContent } from '@nrwl/react/src/utils/jest-utils';
import { NormalizedSchema } from '../schema';
import { offsetFromRoot, updateJsonInTree } from '@nrwl/workspace';
export function updateJestConfig(options: NormalizedSchema): Rule {
return options.unitTestRunner === 'none'
? noop()
: (host) => {
: chain([
updateJsonInTree(
`${options.appProjectRoot}/tsconfig.spec.json`,
(json) => {
const offset = offsetFromRoot(options.appProjectRoot);
json.files = [
`${offset}node_modules/@nrwl/react/typings/cssmodule.d.ts`,
`${offset}node_modules/@nrwl/react/typings/image.d.ts`,
];
if (options.style === 'styled-jsx') {
json.files.unshift(
`${offset}node_modules/@nrwl/react/typings/styled-jsx.d.ts`
);
}
return json;
}
),
(host) => {
const configPath = `${options.appProjectRoot}/jest.config.js`;
const originalContent = host.read(configPath).toString();
const content = updateJestConfigContent(originalContent);
host.overwrite(configPath, content);
};
},
]);
}

18
packages/react/src/schematics/library/files/lib/tsconfig.json__tmpl__
View File

@ -1,16 +1,16 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"compilerOptions": {
"jsx": "react",
"allowJs": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"types": []
"allowSyntheticDefaultImports": true
},
"files": [
<% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
}
]
}

5
packages/react/src/schematics/library/files/lib/tsconfig.lib.json
View File

@ -4,6 +4,11 @@
"outDir": "<%= offsetFromRoot %>dist/out-tsc",
"types": ["node"]
},
"files": [<% if (style === 'styled-jsx') { %>
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
}

61
packages/react/src/schematics/library/library.spec.ts
View File

@ -56,22 +56,25 @@ describe('lib', () => {
});
});
it('should update root tsconfig.json', async () => {
it('should update tsconfig.base.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts',
]);
});
it('should update root tsconfig.json (no existing path mappings)', async () => {
const updatedTree: any = updateJsonInTree('tsconfig.json', (json) => {
it('should update root tsconfig.base.json (no existing path mappings)', async () => {
const updatedTree: any = updateJsonInTree(
'tsconfig.base.json',
(json) => {
json.compilerOptions.paths = undefined;
return json;
})(appTree, null);
}
)(appTree, null);
const tree = await runSchematic('lib', { name: 'myLib' }, updatedTree);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
'libs/my-lib/src/index.ts',
]);
@ -80,21 +83,14 @@ describe('lib', () => {
it('should create a local tsconfig.json', async () => {
const tree = await runSchematic('lib', { name: 'myLib' }, appTree);
const tsconfigJson = readJsonInTree(tree, 'libs/my-lib/tsconfig.json');
expect(tsconfigJson).toEqual({
extends: '../../tsconfig.json',
compilerOptions: {
allowJs: true,
jsx: 'react',
allowSyntheticDefaultImports: true,
esModuleInterop: true,
types: ['node', 'jest'],
expect(tsconfigJson.references).toEqual([
{
path: './tsconfig.lib.json',
},
files: [
'../../node_modules/@nrwl/react/typings/cssmodule.d.ts',
'../../node_modules/@nrwl/react/typings/image.d.ts',
],
include: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
});
{
path: './tsconfig.spec.json',
},
]);
});
it('should extend the local tsconfig.json with tsconfig.spec.json', async () => {
@ -206,13 +202,13 @@ describe('lib', () => {
});
});
it('should update tsconfig.json', async () => {
it('should update tsconfig.base.json', async () => {
const tree = await runSchematic(
'lib',
{ name: 'myLib', directory: 'myDir' },
appTree
);
const tsconfigJson = readJsonInTree(tree, '/tsconfig.json');
const tsconfigJson = readJsonInTree(tree, '/tsconfig.base.json');
expect(
tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']
).toEqual(['libs/my-dir/my-lib/src/index.ts']);
@ -232,21 +228,14 @@ describe('lib', () => {
tree,
'libs/my-dir/my-lib/tsconfig.json'
);
expect(tsconfigJson).toEqual({
extends: '../../../tsconfig.json',
compilerOptions: {
allowJs: true,
jsx: 'react',
allowSyntheticDefaultImports: true,
esModuleInterop: true,
types: ['node', 'jest'],
expect(tsconfigJson.references).toEqual([
{
path: './tsconfig.lib.json',
},
files: [
'../../../node_modules/@nrwl/react/typings/cssmodule.d.ts',
'../../../node_modules/@nrwl/react/typings/image.d.ts',
],
include: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
});
{
path: './tsconfig.spec.json',
},
]);
});
});

2
packages/react/src/schematics/library/library.ts
View File

@ -175,7 +175,7 @@ function updateTsConfig(options: NormalizedSchema): Rule {
return chain([
(host: Tree, context: SchematicContext) => {
const nxJson = readJsonInTree<NxJson>(host, 'nx.json');
return updateJsonInTree('tsconfig.json', (json) => {
return updateJsonInTree('tsconfig.base.json', (json) => {
const c = json.compilerOptions;
c.paths = c.paths || {};
delete c.paths[options.name];

2
packages/react/src/schematics/redux/redux.ts
View File

@ -168,7 +168,7 @@ async function normalizeOptions(
const workspace = await getWorkspace(host);
const projectType = workspace.projects.get(options.project).extensions
.projectType as string;
const tsConfigJson = readJsonInTree(host, 'tsconfig.json');
const tsConfigJson = readJsonInTree(host, 'tsconfig.base.json');
const tsPaths: { [module: string]: string[] } = tsConfigJson.compilerOptions
? tsConfigJson.compilerOptions.paths || {}
: {};

2
packages/storybook/src/schematics/configuration/lib-files/.storybook/tsconfig.json
View File

@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "<%= offsetFromRoot %>../tsconfig.base.json",
"compilerOptions": {
"emitDecoratorMetadata": true
},

2
packages/storybook/src/schematics/configuration/root-files/.storybook/tsconfig.json
View File

@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"exclude": ["../**/test.ts", "../**/*.spec.ts"],
"include": ["../**/*"]
}

1
packages/storybook/src/schematics/init/init.spec.ts
View File

@ -55,7 +55,6 @@ describe('init', () => {
});
it('should add react related dependencies when using React as uiFramework', async () => {
console.log('test');
const existing = 'existing';
const existingVersion = '1.0.0';
await callRule(

5
packages/storybook/src/utils/testing.ts
View File

@ -23,6 +23,11 @@ testRunner.registerCollection(
join(__dirname, '../../../angular/collection.json')
);
testRunner.registerCollection(
'@nrwl/jest',
join(__dirname, '../../../jest/collection.json')
);
testRunner.registerCollection(
'@nrwl/cypress',
join(__dirname, '../../../cypress/collection.json')

6
packages/tao/package.json
View File

@ -29,9 +29,9 @@
},
"homepage": "https://nx.dev",
"dependencies": {
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/schematics": "~10.0.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/architect": "~0.1000.0",
"inquirer": "^6.3.1",
"minimist": "^1.2.0",
"strip-json-comments": "2.0.1",

2
packages/tao/src/commands/migrate.ts
View File

@ -3,7 +3,7 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
import { TaskExecutor } from '@angular-devkit/schematics';
import { BaseWorkflow } from '@angular-devkit/schematics/src/workflow';
import { BuiltinTaskExecutor } from '@angular-devkit/schematics/tasks/node';
import { NodePackageName } from '@angular-devkit/schematics/tasks/node-package/options';
import { NodePackageName } from '@angular-devkit/schematics/tasks/package-manager/options';
import { NodeModulesEngineHost } from '@angular-devkit/schematics/tools';
import { execSync } from 'child_process';
import { readFileSync, writeFileSync } from 'fs';

12
packages/web/package.json
View File

@ -34,11 +34,11 @@
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@nrwl/linter": "*",
"@angular-devkit/architect": "~0.901.0",
"@angular-devkit/build-optimizer": "~0.901.0",
"@angular-devkit/build-webpack": "~0.901.0",
"@angular-devkit/core": "~9.1.0",
"@angular-devkit/schematics": "~9.1.0",
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/build-optimizer": "~0.1000.0",
"@angular-devkit/build-webpack": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"@babel/core": "7.9.6",
"@babel/preset-env": "7.9.6",
"@babel/plugin-proposal-class-properties": "7.8.3",
@ -111,7 +111,7 @@
"webpack-dev-middleware": "3.7.0",
"webpack-merge": "4.2.1",
"webpack-sources": "1.4.3",
"webpack-subresource-integrity": "1.1.0-rc.6",
"webpack-subresource-integrity": "1.1.0-rc.5",
"worker-plugin": "3.2.0",
"webpack-dev-server": "3.9.0",
"webpack-node-externals": "1.7.2"

2
packages/web/src/builders/build/build.impl.ts
View File

@ -83,7 +83,7 @@ export function run(options: WebBuildBuilderOptions, context: BuilderContext) {
);
}
return from(getSourceRoot(context, host))
return from(getSourceRoot(context))
.pipe(
map((sourceRoot) => {
options = normalizeWebBuildOptions(

4
packages/web/src/builders/dev-server/dev-server.impl.ts
View File

@ -20,7 +20,6 @@ import {
runWebpackDevServer,
DevServerBuildOutput,
} from '@angular-devkit/build-webpack';
import { NodeJsSyncHost } from '@angular-devkit/core/node';
export interface WebDevServerOptions extends JsonObject {
host: string;
@ -45,10 +44,9 @@ function run(
serveOptions: WebDevServerOptions,
context: BuilderContext
): Observable<DevServerBuildOutput> {
const host = new NodeJsSyncHost();
return forkJoin(
getBuildOptions(serveOptions, context),
from(getSourceRoot(context, host))
from(getSourceRoot(context))
).pipe(
map(([buildOptions, sourceRoot]) => {
buildOptions = normalizeWebBuildOptions(

92
packages/web/src/builders/package/package.impl.spec.ts
View File

@ -12,6 +12,8 @@ import { getMockContext } from '../../utils/testing';
import { PackageBuilderOptions } from '../../utils/types';
import * as projectGraphUtils from '@nrwl/workspace/src/core/project-graph';
import { ProjectGraph } from '@nrwl/workspace/src/core/project-graph';
import { createRollupOptions } from './package.impl';
import { normalizePackageOptions } from '@nrwl/web/src/utils/normalize';
jest.mock('tsconfig-paths-webpack-plugin');
@ -31,75 +33,31 @@ describe('WebPackagebuilder', () => {
tsConfig: 'libs/ui/tsconfig.json',
watch: false,
};
spyOn(workspaces, 'readWorkspace').and.returnValue({
workspace: {
projects: {
get: () => ({
sourceRoot: join(__dirname, '../../..'),
}),
});
describe('createRollupOptions', () => {
it('should', () => {
const result: any = createRollupOptions(
normalizePackageOptions(testOptions, '/root', '/root/src'),
[],
context,
{ name: 'example' },
'/root/src'
);
expect(result.output).toEqual([
{
file: '/root/dist/ui/example.umd.js',
format: 'umd',
globals: {},
name: 'Example',
},
{
file: '/root/dist/ui/example.esm.js',
format: 'esm',
globals: {},
name: 'Example',
},
});
spyOn(f, 'readJsonFile').and.returnValue({
name: 'example',
});
writeJsonFile = spyOn(f, 'writeJsonFile');
spyOn(projectGraphUtils, 'createProjectGraph').and.callFake(() => {
return {
nodes: {},
dependencies: {},
} as ProjectGraph;
});
});
describe('run', () => {
it('should call runRollup with esm and umd', async () => {
runRollup = spyOn(rr, 'runRollup').and.callFake(() => {
return of({
success: true,
});
});
spyOn(context.logger, 'info');
const result = await impl.run(testOptions, context).toPromise();
expect(runRollup).toHaveBeenCalled();
expect(
runRollup.calls.allArgs()[0][0].output.map((o) => o.format)
).toEqual(expect.arrayContaining(['esm', 'umd']));
expect(result.success).toBe(true);
expect(context.logger.info).toHaveBeenCalledWith('Bundle complete.');
});
it('should return failure when rollup fails', async () => {
runRollup = spyOn(rr, 'runRollup').and.callFake(() => throwError('Oops'));
spyOn(context.logger, 'error');
const result = await impl.run(testOptions, context).toPromise();
expect(result.success).toBe(false);
expect(f.writeJsonFile).not.toHaveBeenCalled();
expect(context.logger.error).toHaveBeenCalledWith('Bundle failed.');
});
it('updates package.json', async () => {
runRollup = spyOn(rr, 'runRollup').and.callFake(() => {
return of({
success: true,
});
});
await impl.run(testOptions, context).toPromise();
expect(f.writeJsonFile).toHaveBeenCalled();
const content = writeJsonFile.calls.allArgs()[0][1];
expect(content).toMatchObject({
name: 'example',
main: './example.umd.js',
module: './example.esm.js',
typings: './index.d.ts',
});
]);
});
});
});

6
packages/web/src/builders/package/package.impl.ts
View File

@ -15,7 +15,6 @@ import * as postcss from 'rollup-plugin-postcss';
import * as filesize from 'rollup-plugin-filesize';
import * as localResolve from 'rollup-plugin-local-resolve';
import { toClassName } from '@nrwl/workspace/src/utils/name-utils';
import { NodeJsSyncHost } from '@angular-devkit/core/node';
import { BuildResult } from '@angular-devkit/build-webpack';
import {
readJsonFile,
@ -66,14 +65,13 @@ export function run(
rawOptions: PackageBuilderOptions,
context: BuilderContext
): Observable<BuilderOutput> {
const host = new NodeJsSyncHost();
const projGraph = createProjectGraph();
const { target, dependencies } = calculateProjectDependencies(
projGraph,
context
);
return from(getSourceRoot(context, host)).pipe(
return from(getSourceRoot(context)).pipe(
switchMap((sourceRoot) => {
if (!checkDependentProjectsHaveBeenBuilt(context, dependencies)) {
return of({ success: false });
@ -153,7 +151,7 @@ export function run(
// -----------------------------------------------------------------------------
function createRollupOptions(
export function createRollupOptions(
options: NormalizedBundleBuilderOptions,
dependencies: DependentBuildableProjectNode[],
context: BuilderContext,

20
packages/web/src/schematics/application/application.spec.ts
View File

@ -52,8 +52,14 @@ describe('app', () => {
expect(tree.exists('apps/my-app/src/app/app.element.css')).toBeTruthy();
const tsconfig = readJsonInTree(tree, 'apps/my-app/tsconfig.json');
expect(tsconfig.extends).toEqual('../../tsconfig.json');
expect(tsconfig.compilerOptions.types).toContain('jest');
expect(tsconfig.references).toEqual([
{
path: './tsconfig.app.json',
},
{
path: './tsconfig.spec.json',
},
]);
const tsconfigApp = JSON.parse(
stripJsonComments(tree.readContent('apps/my-app/tsconfig.app.json'))
@ -135,21 +141,11 @@ describe('app', () => {
// Make sure these have properties
[
{
path: 'apps/my-dir/my-app/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-app/tsconfig.app.json',
lookupFn: (json) => json.compilerOptions.outDir,
expectedValue: '../../../dist/out-tsc',
},
{
path: 'apps/my-dir/my-app-e2e/tsconfig.json',
lookupFn: (json) => json.extends,
expectedValue: '../../../tsconfig.json',
},
{
path: 'apps/my-dir/my-app-e2e/tsconfig.e2e.json',
lookupFn: (json) => json.compilerOptions.outDir,

13
packages/web/src/schematics/application/files/app/tsconfig.json
View File

@ -1,7 +1,10 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.json",
"compilerOptions": {
"types": []
},
"include": ["**/*.ts"]
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
}
]
}

14
packages/web/src/utils/source-root.ts
View File

@ -1,15 +1,9 @@
import { BuilderContext } from '@angular-devkit/architect';
import { workspaces } from '@angular-devkit/core';
import { Host } from '@angular-devkit/core/src/virtual-fs/host';
export async function getSourceRoot(context: BuilderContext, host: Host<{}>) {
const workspaceHost = workspaces.createWorkspaceHost(host);
const { workspace } = await workspaces.readWorkspace(
context.workspaceRoot,
workspaceHost
);
if (workspace.projects.get(context.target.project).sourceRoot) {
return workspace.projects.get(context.target.project).sourceRoot;
export async function getSourceRoot(context: BuilderContext): Promise<string> {
const projectMeta = await context.getProjectMetadata(context.target.project);
if (projectMeta.sourceRoot) {
return projectMeta.sourceRoot as string;
} else {
context.reportStatus('Error');
const message = `${context.target.project} does not have a sourceRoot. Please define one.`;

Some files were not shown because too many files have changed in this diff Show More