From d31ea29032a7e7a8e30fef63e8069bd480d51d8b Mon Sep 17 00:00:00 2001 From: ThomasL Date: Tue, 20 Jun 2023 09:58:13 +0200 Subject: [PATCH] fix(details): fix detail on routes --- .../feature/src/lib/admin-feature.module.ts | 29 ++++------- .../shell/src/lib/main-shell.routes.ts | 2 + .../user/feature/.eslintrc.json | 36 ------------- .../user/feature/README.md | 7 --- .../user/feature/jest.config.ts | 23 --------- .../user/feature/ng-package.json | 7 --- .../user/feature/package.json | 12 ----- .../user/feature/project.json | 50 ------------------- .../user/feature/src/index.ts | 4 -- .../user/feature/src/lib/lib.routes.ts | 3 -- ...odule-to-standalone-user-feature.module.ts | 13 ----- .../user/feature/src/test-setup.ts | 8 --- .../user/feature/tsconfig.json | 29 ----------- .../user/feature/tsconfig.lib.json | 17 ------- .../user/feature/tsconfig.lib.prod.json | 7 --- .../user/feature/tsconfig.spec.json | 16 ------ tsconfig.base.json | 3 -- 17 files changed, 13 insertions(+), 253 deletions(-) delete mode 100644 libs/module-to-standalone/user/feature/.eslintrc.json delete mode 100644 libs/module-to-standalone/user/feature/README.md delete mode 100644 libs/module-to-standalone/user/feature/jest.config.ts delete mode 100644 libs/module-to-standalone/user/feature/ng-package.json delete mode 100644 libs/module-to-standalone/user/feature/package.json delete mode 100644 libs/module-to-standalone/user/feature/project.json delete mode 100644 libs/module-to-standalone/user/feature/src/index.ts delete mode 100644 libs/module-to-standalone/user/feature/src/lib/lib.routes.ts delete mode 100644 libs/module-to-standalone/user/feature/src/lib/module-to-standalone-user-feature.module.ts delete mode 100644 libs/module-to-standalone/user/feature/src/test-setup.ts delete mode 100644 libs/module-to-standalone/user/feature/tsconfig.json delete mode 100644 libs/module-to-standalone/user/feature/tsconfig.lib.json delete mode 100644 libs/module-to-standalone/user/feature/tsconfig.lib.prod.json delete mode 100644 libs/module-to-standalone/user/feature/tsconfig.spec.json diff --git a/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts b/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts index 6bdda1d..8f88679 100644 --- a/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts +++ b/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts @@ -1,4 +1,3 @@ -import { IsAuthorizedGuard } from '@angular-challenges/module-to-standalone/admin/shared'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; @@ -10,23 +9,17 @@ import { RouterModule } from '@angular/router'; RouterModule.forChild([ { path: '', - canActivate: [IsAuthorizedGuard], - children: [ - { - path: '', - loadChildren: () => - import('./dashboard/dashboard.component').then( - (m) => m.DashboardModule - ), - }, - { - path: 'create-user', - loadChildren: () => - import('./create-user/create-user.component').then( - (m) => m.CreateUserModule - ), - }, - ], + loadChildren: () => + import('./dashboard/dashboard.component').then( + (m) => m.DashboardModule + ), + }, + { + path: 'create-user', + loadChildren: () => + import('./create-user/create-user.component').then( + (m) => m.CreateUserModule + ), }, ]), ], diff --git a/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts b/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts index 8578fe8..7014090 100644 --- a/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts +++ b/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts @@ -1,3 +1,4 @@ +import { IsAuthorizedGuard } from '@angular-challenges/module-to-standalone/admin/shared'; import { Route } from '@angular/router'; export const appRoutes: Route[] = [ @@ -11,6 +12,7 @@ export const appRoutes: Route[] = [ }, { path: 'admin', + canActivate: [IsAuthorizedGuard], loadChildren: () => import('@angular-challenges/module-to-standalone/admin/feature').then( (m) => m.AdminFeatureModule diff --git a/libs/module-to-standalone/user/feature/.eslintrc.json b/libs/module-to-standalone/user/feature/.eslintrc.json deleted file mode 100644 index b597630..0000000 --- a/libs/module-to-standalone/user/feature/.eslintrc.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "extends": ["../../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts"], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "lib", - "style": "camelCase" - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "lib", - "style": "kebab-case" - } - ] - }, - "extends": [ - "plugin:@nx/angular", - "plugin:@angular-eslint/template/process-inline-templates" - ] - }, - { - "files": ["*.html"], - "extends": ["plugin:@nx/angular-template"], - "rules": {} - } - ] -} diff --git a/libs/module-to-standalone/user/feature/README.md b/libs/module-to-standalone/user/feature/README.md deleted file mode 100644 index c4cb490..0000000 --- a/libs/module-to-standalone/user/feature/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# module-to-standalone-user-feature - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test module-to-standalone-user-feature` to execute the unit tests. diff --git a/libs/module-to-standalone/user/feature/jest.config.ts b/libs/module-to-standalone/user/feature/jest.config.ts deleted file mode 100644 index 1103896..0000000 --- a/libs/module-to-standalone/user/feature/jest.config.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -export default { - displayName: 'module-to-standalone-user-feature', - preset: '../../../../jest.preset.js', - setupFilesAfterEnv: ['/src/test-setup.ts'], - coverageDirectory: - '../../../../coverage/libs/module-to-standalone/user/feature', - transform: { - '^.+\\.(ts|mjs|js|html)$': [ - 'jest-preset-angular', - { - tsconfig: '/tsconfig.spec.json', - stringifyContentPathRegex: '\\.(html|svg)$', - }, - ], - }, - transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], - snapshotSerializers: [ - 'jest-preset-angular/build/serializers/no-ng-attributes', - 'jest-preset-angular/build/serializers/ng-snapshot', - 'jest-preset-angular/build/serializers/html-comment', - ], -}; diff --git a/libs/module-to-standalone/user/feature/ng-package.json b/libs/module-to-standalone/user/feature/ng-package.json deleted file mode 100644 index 6d7af66..0000000 --- a/libs/module-to-standalone/user/feature/ng-package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../../dist/libs/module-to-standalone/user/feature", - "lib": { - "entryFile": "src/index.ts" - } -} diff --git a/libs/module-to-standalone/user/feature/package.json b/libs/module-to-standalone/user/feature/package.json deleted file mode 100644 index 342ede2..0000000 --- a/libs/module-to-standalone/user/feature/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "@angular-challenges/module-to-standalone/user/feature", - "version": "0.0.1", - "peerDependencies": { - "@angular/common": "^16.0.0", - "@angular/core": "^16.0.0" - }, - "dependencies": { - "tslib": "^2.3.0" - }, - "sideEffects": false -} diff --git a/libs/module-to-standalone/user/feature/project.json b/libs/module-to-standalone/user/feature/project.json deleted file mode 100644 index 2f1f3f7..0000000 --- a/libs/module-to-standalone/user/feature/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "module-to-standalone-user-feature", - "$schema": "../../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/module-to-standalone/user/feature/src", - "prefix": "lib", - "tags": [], - "projectType": "library", - "targets": { - "build": { - "executor": "@nx/angular:ng-packagr-lite", - "outputs": ["{workspaceRoot}/dist/{projectRoot}"], - "options": { - "project": "libs/module-to-standalone/user/feature/ng-package.json" - }, - "configurations": { - "production": { - "tsConfig": "libs/module-to-standalone/user/feature/tsconfig.lib.prod.json" - }, - "development": { - "tsConfig": "libs/module-to-standalone/user/feature/tsconfig.lib.json" - } - }, - "defaultConfiguration": "production" - }, - "test": { - "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], - "options": { - "jestConfig": "libs/module-to-standalone/user/feature/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } - } - }, - "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/module-to-standalone/user/feature/**/*.ts", - "libs/module-to-standalone/user/feature/**/*.html" - ] - } - } - } -} diff --git a/libs/module-to-standalone/user/feature/src/index.ts b/libs/module-to-standalone/user/feature/src/index.ts deleted file mode 100644 index 9efe9ca..0000000 --- a/libs/module-to-standalone/user/feature/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './lib/module-to-standalone-user-feature.module'; -export * from './lib/lib.routes'; - -export * from './lib/lib.routes'; diff --git a/libs/module-to-standalone/user/feature/src/lib/lib.routes.ts b/libs/module-to-standalone/user/feature/src/lib/lib.routes.ts deleted file mode 100644 index 5652435..0000000 --- a/libs/module-to-standalone/user/feature/src/lib/lib.routes.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { Route } from '@angular/router'; - -export const moduleToStandaloneUserFeatureRoutes: Route[] = []; diff --git a/libs/module-to-standalone/user/feature/src/lib/module-to-standalone-user-feature.module.ts b/libs/module-to-standalone/user/feature/src/lib/module-to-standalone-user-feature.module.ts deleted file mode 100644 index 9dc3f4c..0000000 --- a/libs/module-to-standalone/user/feature/src/lib/module-to-standalone-user-feature.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule, RouterModule, Route } from '@angular/router'; -import { moduleToStandaloneUserFeatureRoutes } from './lib.routes'; - -@NgModule({ - imports: [ - CommonModule, - RouterModule.forChild(moduleToStandaloneUserFeatureRoutes), - RouterModule, - ], -}) -export class ModuleToStandaloneUserFeatureModule {} diff --git a/libs/module-to-standalone/user/feature/src/test-setup.ts b/libs/module-to-standalone/user/feature/src/test-setup.ts deleted file mode 100644 index ab1eeeb..0000000 --- a/libs/module-to-standalone/user/feature/src/test-setup.ts +++ /dev/null @@ -1,8 +0,0 @@ -// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment -globalThis.ngJest = { - testEnvironmentOptions: { - errorOnUnknownElements: true, - errorOnUnknownProperties: true, - }, -}; -import 'jest-preset-angular/setup-jest'; diff --git a/libs/module-to-standalone/user/feature/tsconfig.json b/libs/module-to-standalone/user/feature/tsconfig.json deleted file mode 100644 index b9e5be0..0000000 --- a/libs/module-to-standalone/user/feature/tsconfig.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "compilerOptions": { - "target": "es2022", - "useDefineForClassFields": false, - "forceConsistentCasingInFileNames": true, - "strict": true, - "noImplicitOverride": true, - "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true - }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - }, - { - "path": "./tsconfig.spec.json" - } - ], - "extends": "../../../../tsconfig.base.json", - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } -} diff --git a/libs/module-to-standalone/user/feature/tsconfig.lib.json b/libs/module-to-standalone/user/feature/tsconfig.lib.json deleted file mode 100644 index 9127387..0000000 --- a/libs/module-to-standalone/user/feature/tsconfig.lib.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../../dist/out-tsc", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [] - }, - "exclude": [ - "src/**/*.spec.ts", - "src/test-setup.ts", - "jest.config.ts", - "src/**/*.test.ts" - ], - "include": ["src/**/*.ts"] -} diff --git a/libs/module-to-standalone/user/feature/tsconfig.lib.prod.json b/libs/module-to-standalone/user/feature/tsconfig.lib.prod.json deleted file mode 100644 index 61b5237..0000000 --- a/libs/module-to-standalone/user/feature/tsconfig.lib.prod.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false - }, - "angularCompilerOptions": {} -} diff --git a/libs/module-to-standalone/user/feature/tsconfig.spec.json b/libs/module-to-standalone/user/feature/tsconfig.spec.json deleted file mode 100644 index 6e5925e..0000000 --- a/libs/module-to-standalone/user/feature/tsconfig.spec.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../../dist/out-tsc", - "module": "commonjs", - "target": "es2016", - "types": ["jest", "node"] - }, - "files": ["src/test-setup.ts"], - "include": [ - "jest.config.ts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.d.ts" - ] -} diff --git a/tsconfig.base.json b/tsconfig.base.json index 9f8a0aa..04550ab 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -41,9 +41,6 @@ "@angular-challenges/module-to-standalone/user/contact": [ "libs/module-to-standalone/user/contact/src/index.ts" ], - "@angular-challenges/module-to-standalone/user/feature": [ - "libs/module-to-standalone/user/feature/src/index.ts" - ], "@angular-challenges/module-to-standalone/user/home": [ "libs/module-to-standalone/user/home/src/index.ts" ],