From 67425855f2ad644387e0634204aee4006b10f2d4 Mon Sep 17 00:00:00 2001 From: Anthony Nahas Date: Tue, 5 Jul 2022 20:31:44 +0200 Subject: [PATCH] fix(demo): minor --- angular.json | 2 +- package-lock.json | 14 +++--- package.json | 2 +- .../password-strength/tsconfig.lib.json | 8 ++-- .../password-strength/tsconfig.lib.prod.json | 6 +-- src/app/app-routing.module.ts | 2 +- tsconfig.json | 45 ++++++++++--------- 7 files changed, 37 insertions(+), 42 deletions(-) diff --git a/angular.json b/angular.json index ed271664..45ea9f9a 100644 --- a/angular.json +++ b/angular.json @@ -32,7 +32,7 @@ "./node_modules/prismjs/themes/prism-okaidia.css" ], "scripts": [ - "./node_modules/marked/lib/marked.js", + "./node_modules/marked/marked.min.js", "./node_modules/prismjs/prism.js", "./node_modules/prismjs/components/prism-typescript.min.js", "./node_modules/prismjs/components/prism-css.min.js" diff --git a/package-lock.json b/package-lock.json index 939e426a..f2855d5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "express": "^4.18.1", "ngx-clipboard": "^15.1.0", "ngx-highlightjs": "^7.0.0", - "ngx-markdown": "^14.0.0", + "ngx-markdown": "^14.0.1", "rxjs": "^7.5.5", "tslib": "^2.3.1", "zone.js": "~0.11.4" @@ -14417,9 +14417,9 @@ } }, "node_modules/ngx-markdown": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-14.0.0.tgz", - "integrity": "sha512-gS/41oYTst0pppGk5vcfr+ZqmveGwu66gQo/UOv6TM+LICBCQMbYJwnlPwFtoWgOLMf8JAzCVDMcdu2I0GIG7A==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-14.0.1.tgz", + "integrity": "sha512-y5CY4e0QM0uR6+MvU1rnh1Ks+rku14309kVVojyXLcWl4zlrt8VAYCcf/+A+8z/IDOaz38yTrxNBnvYDJzNzYA==", "dependencies": { "@types/marked": "^4.0.3", "clipboard": "^2.0.11", @@ -32463,9 +32463,9 @@ } }, "ngx-markdown": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-14.0.0.tgz", - "integrity": "sha512-gS/41oYTst0pppGk5vcfr+ZqmveGwu66gQo/UOv6TM+LICBCQMbYJwnlPwFtoWgOLMf8JAzCVDMcdu2I0GIG7A==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-14.0.1.tgz", + "integrity": "sha512-y5CY4e0QM0uR6+MvU1rnh1Ks+rku14309kVVojyXLcWl4zlrt8VAYCcf/+A+8z/IDOaz38yTrxNBnvYDJzNzYA==", "requires": { "@types/marked": "^4.0.3", "clipboard": "^2.0.11", diff --git a/package.json b/package.json index ebbc7117..8a16987c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "express": "^4.18.1", "ngx-clipboard": "^15.1.0", "ngx-highlightjs": "^7.0.0", - "ngx-markdown": "^14.0.0", + "ngx-markdown": "^14.0.1", "rxjs": "^7.5.5", "tslib": "^2.3.1", "zone.js": "~0.11.4" diff --git a/projects/angular-material-extensions/password-strength/tsconfig.lib.json b/projects/angular-material-extensions/password-strength/tsconfig.lib.json index e4d82394..ee4fd5a2 100644 --- a/projects/angular-material-extensions/password-strength/tsconfig.lib.json +++ b/projects/angular-material-extensions/password-strength/tsconfig.lib.json @@ -1,10 +1,8 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "extends": "../../../tsconfig.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { - "outDir": "../../out-tsc/lib", - "declarationMap": true, - "target": "es2020", + "outDir": "../../../out-tsc/lib", + "target": "es2015", "declaration": true, "inlineSources": true, "types": [], diff --git a/projects/angular-material-extensions/password-strength/tsconfig.lib.prod.json b/projects/angular-material-extensions/password-strength/tsconfig.lib.prod.json index 06de549e..cbae7942 100644 --- a/projects/angular-material-extensions/password-strength/tsconfig.lib.prod.json +++ b/projects/angular-material-extensions/password-strength/tsconfig.lib.prod.json @@ -1,10 +1,6 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ { "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false - }, "angularCompilerOptions": { - "compilationMode": "partial" + "enableIvy": false } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 88bba2cf..5ea40942 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -17,7 +17,7 @@ const routes: Routes = [ @NgModule({ imports: [RouterModule.forRoot(routes, { - initialNavigation: 'enabled', + initialNavigation: 'enabledNonBlocking', relativeLinkResolution: 'legacy' })], exports: [RouterModule] diff --git a/tsconfig.json b/tsconfig.json index 418d9d9f..9b33f1ff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,25 +1,26 @@ +/* + This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience. + It is not intended to be used to perform a compilation. + + To learn more about this file see: https://angular.io/config/solution-tsconfig. +*/ { - "compileOnSave": false, - "compilerOptions": { - "baseUrl": "./", - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "downlevelIteration": true, - "experimentalDecorators": true, - "moduleResolution": "node", - "importHelpers": true, - "target": "es2020", - "module": "es2020", - "lib": [ - "es2018", - "dom" - ], - "paths": { - "@angular-material-extensions/password-strength": [ - "dist/angular-material-extensions/password-strength/angular-material-extensions-password-strength", - "dist/angular-material-extensions/password-strength" - ] + "files": [], + "references": [ + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.spec.json" + }, + { + "path": "./tsconfig.server.json" + }, + { + "path": "./projects/angular-material-extensions/password-strength/tsconfig.lib.json" + }, + { + "path": "./projects/angular-material-extensions/password-strength/tsconfig.spec.json" } - } + ] }