Skip to content

Commit

Permalink
update nx to version 16.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bbodine1 committed Jul 11, 2023
1 parent e903284 commit d2fb0c6
Show file tree
Hide file tree
Showing 160 changed files with 8,205 additions and 11,857 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
13 changes: 8 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] },
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
},
{
"sourceTag": "client:dchbx",
"onlyDependOnLibsWithTags": [
Expand Down Expand Up @@ -82,7 +85,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/typescript",
"plugin:@nx/typescript",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:unicorn/recommended"
Expand Down Expand Up @@ -192,7 +195,7 @@
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@ These capabilities include generating applications, libraries, etc as well as th
Below are our core plugins:

- [Angular](https://angular.io)
- `ng add @nrwl/angular`
- `ng add @nx/angular`
- [React](https://reactjs.org)
- `ng add @nrwl/react`
- Web (no framework frontends)
- `ng add @nrwl/web`
- `ng add @nx/web`
- [Nest](https://nestjs.com)
- `ng add @nrwl/nest`
- [Express](https://expressjs.com)
- `ng add @nrwl/express`
- [Node](https://nodejs.org)
- `ng add @nrwl/node`
- `ng add @nx/node`

There are also many [community plugins](https://nx.dev/community) you could add.

## Generate an application

Run `ng g @nrwl/angular:app my-app` to generate an application.
Run `ng g @nx/angular:app my-app` to generate an application.

> You can use any of the plugins above to generate applications as well.
When using Nx, you can create multiple applications and libraries in the same workspace.

## Generate a library

Run `ng g @nrwl/angular:lib my-lib` to generate a library.
Run `ng g @nx/angular:lib my-lib` to generate a library.

> You can also use any of the plugins above to generate libraries as well.
Expand Down
54 changes: 0 additions & 54 deletions angular.json

This file was deleted.

4 changes: 2 additions & 2 deletions apps/console-api-docs/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
}
},
"serve": {
"executor": "@nrwl/web:file-server",
"executor": "@nx/web:file-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "console-api-docs:build",
"staticFilePath": "apps/console-api-docs/dist/"
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/console-api-docs/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletion apps/console-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: {
Expand Down
4 changes: 2 additions & 2 deletions apps/console-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/console-e2e/cypress.config.ts",
"devServerTarget": "console:serve:development",
Expand All @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/console-e2e/**/*.{js,ts}"]
Expand Down
4 changes: 2 additions & 2 deletions apps/console/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"project": ["apps/console/tsconfig.*?.json"]
},
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
Expand All @@ -32,7 +32,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
15 changes: 8 additions & 7 deletions apps/console/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ export default {
displayName: 'console',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../coverage/apps/console',
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$)'],
snapshotSerializers: [
Expand Down
5 changes: 3 additions & 2 deletions apps/console/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "console",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/console/src",
"prefix": "enroll",
Expand Down Expand Up @@ -98,13 +99,13 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/console/**/*.ts", "apps/console/**/*.html"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/apps/console"],
"options": {
"jestConfig": "apps/console/jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion apps/enroll-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: {
Expand Down
4 changes: 2 additions & 2 deletions apps/enroll-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/enroll-e2e/cypress.config.ts",
"devServerTarget": "enroll:serve:development",
Expand All @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/enroll-e2e/**/*.{js,ts}"]
Expand Down
4 changes: 2 additions & 2 deletions apps/enroll/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"project": ["apps/enroll/tsconfig.*?.json"]
},
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
Expand All @@ -32,7 +32,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
15 changes: 8 additions & 7 deletions apps/enroll/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@ export default {
displayName: 'enroll',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$',
},
},
globals: {},
coverageDirectory: '../../coverage/apps/enroll',
snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment',
],
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$)'],
};
4 changes: 2 additions & 2 deletions apps/enroll/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/enroll/**/*.ts", "apps/enroll/**/*.html"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/apps/enroll"],
"options": {
"jestConfig": "apps/enroll/jest.config.ts",
Expand Down
46 changes: 46 additions & 0 deletions apps/enroll/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { ApplicationConfig } from '@angular/core';
import { importProvidersFrom, APP_INITIALIZER } from '@angular/core';
import { HttpClientModule } from '@angular/common/http';
import { RootStoreModule } from '@enroll/shared/state/root-store';
import { TenantTranslationModule } from '@enroll/shared/i18n';
import {
provideRouter,
withEnabledBlockingInitialNavigation,
} from '@angular/router';
import { TITLE_EXTENSION } from '@enroll/shared/page-title';
import {
configFactory,
TenantConfigService,
APPLICATION_NAME,
TENANT_CONFIG,
} from '@enroll/tenant-config';
import { routes } from './application.routes';
import { enrollTenantConfig } from './tenant-config';
export const appConfig: ApplicationConfig = {
providers: [
importProvidersFrom(
HttpClientModule,
RootStoreModule,
TenantTranslationModule
),
provideRouter(routes, withEnabledBlockingInitialNavigation()),
{
provide: APP_INITIALIZER,
useFactory: configFactory,
deps: [TenantConfigService],
multi: true,
},
{
provide: APPLICATION_NAME,
useValue: 'enroll',
},
{
provide: TENANT_CONFIG,
useValue: enrollTenantConfig,
},
{
provide: TITLE_EXTENSION,
useValue: 'Maine Cover ME',
},
],
};
Loading

0 comments on commit d2fb0c6

Please sign in to comment.