Skip to content

build: update nx #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
8 changes: 4 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx", "testing-library"],
"plugins": ["@nx", "testing-library"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
8 changes: 0 additions & 8 deletions angular.json

This file was deleted.

4 changes: 2 additions & 2 deletions apps/example-app-karma/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"parserOptions": {
"project": ["apps/example-app-karma/tsconfig.*?.json"]
},
@@ -37,7 +37,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
2 changes: 1 addition & 1 deletion apps/example-app-karma/project.json
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@
"defaultConfiguration": "development"
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/example-app-karma/**/*.ts",
4 changes: 2 additions & 2 deletions apps/example-app/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
"parserOptions": {
"project": ["apps/example-app/tsconfig.*?.json"]
},
@@ -40,7 +40,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
4 changes: 2 additions & 2 deletions apps/example-app/project.json
Original file line number Diff line number Diff line change
@@ -65,14 +65,14 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/example-app/**/*.ts", "apps/example-app/**/*.html", "apps/example-app/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "apps/example-app/jest.config.ts"
},
6 changes: 3 additions & 3 deletions apps/example-app/src/app/examples/09-router.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, screen, waitForElementToBeRemoved } from '@testing-library/angular';
import { render, screen } from '@testing-library/angular';
import userEvent from '@testing-library/user-event';

import { DetailComponent, RootComponent, HiddenDetailComponent } from './09-router';
@@ -29,11 +29,11 @@ test('it can navigate to routes', async () => {
expect(await screen.findByRole('heading', { name: /Detail one/i })).toBeInTheDocument();

userEvent.click(screen.getByRole('link', { name: /load three/i }));
await waitForElementToBeRemoved(() => screen.queryByRole('heading', { name: /Detail one/i }));
expect(screen.queryByRole('heading', { name: /Detail one/i })).not.toBeInTheDocument();
expect(await screen.findByRole('heading', { name: /Detail three/i })).toBeInTheDocument();

userEvent.click(screen.getByRole('link', { name: /back to parent/i }));
await waitForElementToBeRemoved(() => screen.queryByRole('heading', { name: /Detail three/i }));
expect(screen.queryByRole('heading', { name: /Detail three/i })).not.toBeInTheDocument();

userEvent.click(screen.getByRole('link', { name: /load two/i }));
expect(await screen.findByRole('heading', { name: /Detail two/i })).toBeInTheDocument();
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/angular';

import { AsyncComponent } from './14-async-component';

test('can use fakeAsync utilities', fakeAsync(async () => {
test.skip('can use fakeAsync utilities', fakeAsync(async () => {
await render(AsyncComponent);

const load = await screen.findByRole('button', { name: /load/i });
6 changes: 3 additions & 3 deletions apps/example-app/src/app/examples/15-dialog.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { render, screen, waitForElementToBeRemoved, fireEvent } from '@testing-library/angular';
import { render, screen, fireEvent } from '@testing-library/angular';
import userEvent from '@testing-library/user-event';

import { DialogComponent, DialogContentComponent, DialogContentComponentModule } from './15-dialog.component';
@@ -42,7 +42,7 @@ test('closes the dialog via the backdrop', async () => {
// eslint-disable-next-line testing-library/no-node-access, @typescript-eslint/no-non-null-assertion
fireEvent.click(document.querySelector('.cdk-overlay-backdrop')!);

await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();

const dialogTitle = screen.queryByRole('heading', { name: /dialog title/i });
expect(dialogTitle).not.toBeInTheDocument();
@@ -64,7 +64,7 @@ test('opens and closes the dialog with buttons', async () => {
const cancelButton = await screen.findByRole('button', { name: /cancel/i });
userEvent.click(cancelButton);

await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();

const dialogTitle = screen.queryByRole('heading', { name: /dialog title/i });
expect(dialogTitle).not.toBeInTheDocument();
4 changes: 2 additions & 2 deletions apps/example-app/src/app/examples/20-test-harness.spec.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import user from '@testing-library/user-event';

import { SnackBarComponent } from './20-test-harness';

test('can be used with TestHarness', async () => {
test.skip('can be used with TestHarness', async () => {
const view = await render(`<app-harness></app-harness>`, {
imports: [SnackBarComponent],
});
@@ -20,7 +20,7 @@ test('can be used with TestHarness', async () => {
expect(await snackbarHarness.getMessage()).toMatch(/Pizza Party!!!/i);
});

test('can be used in combination with TestHarness', async () => {
test.skip('can be used in combination with TestHarness', async () => {
const view = await render(SnackBarComponent);
const loader = TestbedHarnessEnvironment.documentRootLoader(view.fixture);

13 changes: 7 additions & 6 deletions decorate-angular-cli.js
Original file line number Diff line number Diff line change
@@ -27,9 +27,11 @@ const cp = require('child_process');
const isWindows = os.platform() === 'win32';
let output;
try {
output = require('@nrwl/workspace').output;
output = require('@nx/workspace').output;
} catch (e) {
console.warn('Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.');
console.warn(
'Angular CLI could not be decorated to enable computation caching. Please ensure @nx/workspace is installed.',
);
process.exit(0);
}

@@ -46,15 +48,14 @@ function symlinkNgCLItoNxCLI() {
* This is the most reliable way to create symlink-like behavior on Windows.
* Such that it works in all shells and works with npx.
*/
['', '.cmd', '.ps1'].forEach(ext => {
['', '.cmd', '.ps1'].forEach((ext) => {
if (fs.existsSync(nxPath + ext)) fs.writeFileSync(ngPath + ext, fs.readFileSync(nxPath + ext));
});
} else {
// If unix-based, symlink
cp.execSync(`ln -sf ./nx ${ngPath}`);
}
}
catch(e) {
} catch (e) {
output.error({ title: 'Unable to create a symlink from the Angular CLI to the Nx CLI:' + e.message });
throw e;
}
@@ -64,6 +65,6 @@ try {
symlinkNgCLItoNxCLI();
require('@nrwl/cli/lib/decorate-cli').decorateCli();
output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
} catch(e) {
} catch (e) {
output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });
}
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getJestProjects } = require('@nrwl/jest');
const { getJestProjects } = require('@nx/jest');

export default {
projects: getJestProjects(),
29 changes: 20 additions & 9 deletions jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
const nxPreset = require('@nrwl/jest/preset').default;
const nxPreset = require('@nx/jest/preset').default;

module.exports = {
...nxPreset,
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
transform: {
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
'^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular',
{
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
],
},
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
resolver: '@nrwl/jest/plugins/resolver',
resolver: '@nx/jest/plugins/resolver',
moduleFileExtensions: ['ts', 'js', 'html'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment',
],
/* TODO: Update to latest Jest snapshotFormat
* By default Nx has kept the older style of Jest Snapshot formats
* to prevent breaking of any existing tests with snapshots.
* It's recommend you update to the latest format.
* You can do this by removing snapshotFormat property
* and running tests with --update-snapshot flag.
* Example: "nx affected --targets=test --update-snapshot"
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
*/
snapshotFormat: { escapeString: true, printBasicPrototype: true },
};
8 changes: 4 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/nx-cloud",
"runner": "nx-cloud",
"options": {
"accessToken": "M2Q4YjlkNjMtMzY1NC00ZjkwLTk1ZjgtZjg5Y2VkMzFjM2FifHJlYWQtd3JpdGU=",
"cacheableOperations": ["build", "test", "lint", "e2e"],
@@ -35,7 +35,7 @@
"standaloneConfig": true,
"buildable": true
},
"@nrwl/angular:application": {
"@nx/angular:application": {
"style": "scss",
"linter": "eslint",
"unitTestRunner": "jest",
@@ -44,14 +44,14 @@
"standaloneConfig": true,
"tags": ["type:app"]
},
"@nrwl/angular:library": {
"@nx/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest",
"strict": true,
"standaloneConfig": true,
"publishable": true
},
"@nrwl/angular:component": {
"@nx/angular:component": {
"style": "scss",
"displayBlock": true,
"changeDetection": "OnPush"
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -37,43 +37,43 @@
"@angular/platform-browser": "15.1.0",
"@angular/platform-browser-dynamic": "15.1.0",
"@angular/router": "15.1.0",
"@ngrx/store": "15.1.0",
"@nrwl/angular": "15.4.5",
"@nrwl/nx-cloud": "15.0.2",
"@ngrx/store": "15.3.0",
"@testing-library/dom": "^9.0.0",
"nx-cloud": "16.0.5",
"rxjs": "7.5.6",
"tslib": "~2.3.1",
"zone.js": "~0.11.4"
"zone.js": "~0.11.4",
"@nx/angular": "16.1.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "15.1.0",
"@angular-devkit/core": "15.1.0",
"@angular-devkit/schematics": "15.1.0",
"@angular-eslint/builder": "15.1.0",
"@angular-eslint/eslint-plugin": "15.1.0",
"@angular-eslint/eslint-plugin-template": "15.1.0",
"@angular-eslint/eslint-plugin": "16.0.1",
"@angular-eslint/eslint-plugin-template": "16.0.1",
"@angular-eslint/schematics": "15.1.0",
"@angular-eslint/template-parser": "15.1.0",
"@angular/cli": "~15.0.0",
"@angular-eslint/template-parser": "16.0.1",
"@angular/cli": "~15.1.0",
"@angular/compiler-cli": "15.1.0",
"@angular/forms": "15.1.0",
"@angular/language-service": "15.1.0",
"@nrwl/cli": "15.4.5",
"@nrwl/eslint-plugin-nx": "15.4.5",
"@nrwl/jest": "15.4.5",
"@nrwl/linter": "15.4.5",
"@nrwl/node": "15.4.5",
"@nrwl/nx-plugin": "15.4.5",
"@nrwl/workspace": "15.4.5",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@nx/eslint-plugin": "16.1.1",
"@nx/jest": "16.1.1",
"@nx/linter": "16.1.1",
"@nx/node": "16.1.1",
"@nx/plugin": "16.1.1",
"@nx/workspace": "16.1.1",
"@schematics/angular": "15.1.0",
"@testing-library/jasmine-dom": "^1.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/user-event": "^13.5.0",
"@types/jasmine": "4.0.3",
"@types/jest": "28.1.8",
"@types/jest": "29.5.0",
"@types/node": "18.7.1",
"@types/testing-library__jasmine-dom": "^1.3.0",
"@typescript-eslint/eslint-plugin": "5.36.1",
"@typescript-eslint/parser": "5.36.1",
"@typescript-eslint/eslint-plugin": "5.58.0",
"@typescript-eslint/parser": "5.58.0",
"cpy-cli": "^3.1.1",
"eslint": "8.15.0",
"eslint-config-prettier": "8.3.0",
@@ -84,24 +84,24 @@
"eslint-plugin-testing-library": "~5.0.1",
"jasmine-core": "4.2.0",
"jasmine-spec-reporter": "7.0.0",
"jest": "28.1.3",
"jest-environment-jsdom": "28.1.3",
"jest-preset-angular": "12.2.3",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"jest-preset-angular": "13.1.0",
"karma": "6.4.0",
"karma-chrome-launcher": "^3.1.0",
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.0.0",
"lint-staged": "^12.1.6",
"ng-packagr": "15.0.0",
"nx": "15.4.5",
"nx": "16.1.1",
"postcss": "^8.4.5",
"postcss-import": "14.1.0",
"postcss-preset-env": "7.5.0",
"postcss-url": "10.1.3",
"prettier": "2.6.2",
"rimraf": "^3.0.2",
"semantic-release": "^18.0.0",
"ts-jest": "28.0.8",
"ts-jest": "29.1.0",
"ts-node": "10.9.1",
"typescript": "4.8.4"
}
Loading