From c678c345b672f7f49870965109113043caf9bff7 Mon Sep 17 00:00:00 2001 From: Siddhartha Bhattacharjee Date: Tue, 26 May 2020 23:59:52 -0700 Subject: [PATCH 1/3] Set theme jekyll-theme-leap-day --- README.md | 39 +++++++++++++++++++++++++++++++++++++-- _config.yml | 1 + 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 _config.yml diff --git a/README.md b/README.md index 88ce8d6..1c0861a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,37 @@ -# angular-word-merger -Angular App to merge words +## Welcome to GitHub Pages + +You can use the [editor on GitHub](https://github.com/bootng/angular-word-merger/edit/master/README.md) to maintain and preview the content for your website in Markdown files. + +Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files. + +### Markdown + +Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for + +```markdown +Syntax highlighted code block + +# Header 1 +## Header 2 +### Header 3 + +- Bulleted +- List + +1. Numbered +2. List + +**Bold** and _Italic_ and `Code` text + +[Link](url) and ![Image](src) +``` + +For more details see [GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/). + +### Jekyll Themes + +Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/bootng/angular-word-merger/settings). The name of this theme is saved in the Jekyll `_config.yml` configuration file. + +### Support or Contact + +Having trouble with Pages? Check out our [documentation](https://help.github.com/categories/github-pages-basics/) or [contact support](https://github.com/contact) and we’ll help you sort it out. diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..b849713 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-leap-day \ No newline at end of file From bab1bd83ad777b7201dccb082a5de2e3c5176dc3 Mon Sep 17 00:00:00 2001 From: Siddhartha Bhattacharjee Date: Thu, 10 Nov 2022 19:41:26 -0800 Subject: [PATCH 2/3] update to Angular 13.3 --- angular.json | 139 +++++++++--------- karma.conf.js | 29 +++- ngsw-config.json | 30 ++++ package.json | 84 +++++------ src/app/app-routing.module.ts | 2 - src/app/app.component.ts | 4 +- src/app/app.module.ts | 13 +- .../common/services/commonhttp.interceptor.ts | 30 ++-- .../services/commonhttp.interceptor2.ts | 75 ++++++++++ src/app/common/services/commonhttp.service.ts | 4 +- src/app/common/services/http.factory.ts | 6 - src/app/word-merger.component.ts | 17 ++- src/polyfills.ts | 3 +- src/styles.css | 10 ++ tsconfig.app.json | 15 ++ tsconfig.json | 38 +++-- tsconfig.spec.json | 18 +++ 17 files changed, 338 insertions(+), 179 deletions(-) create mode 100644 ngsw-config.json create mode 100644 src/app/common/services/commonhttp.interceptor2.ts delete mode 100644 src/app/common/services/http.factory.ts create mode 100644 src/styles.css create mode 100644 tsconfig.app.json create mode 100644 tsconfig.spec.json diff --git a/angular.json b/angular.json index ae1c691..6813fbb 100644 --- a/angular.json +++ b/angular.json @@ -3,126 +3,121 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "wordcombinerapp": { + "agartalafyi": { + "projectType": "application", + "schematics": { + "@schematics/angular:application": { + "strict": true + } + }, "root": "", "sourceRoot": "src", - "projectType": "application", + "prefix": "app", "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist", + "outputPath": "dist/agartalafyi", "index": "src/index.html", "main": "src/main.ts", - "tsConfig": "src/tsconfig.app.json", "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", "assets": [ + "src/favicon.ico", "src/assets", - "src/favicon.ico" + "src/manifest.webmanifest" ], "styles": [ - "node_modules/bootstrap/dist/css/bootstrap.min.css" - ] + "src/styles.css" + ], + "scripts": [], + "serviceWorker": true, + "ngswConfigPath": "ngsw-config.json" }, "configurations": { "production": { - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "aot": true, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "1500kb", + "maximumError": "11mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "12kb", + "maximumError": "41kb" + } + ], "fileReplacements": [ { "replace": "src/environments/environment.ts", "with": "src/environments/environment.prod.ts" } - ] + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true } - } + }, + "defaultConfiguration": "production" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "wordcombinerapp:build" - }, "configurations": { "production": { - "browserTarget": "wordcombinerapp:build:production" + "browserTarget": "agartalafyi:build:production" + }, + "development": { + "browserTarget": "agartalafyi:build:development" } - } + }, + "defaultConfiguration": "development" }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "wordcombinerapp:build" + "browserTarget": "agartalafyi:build" } }, "test": { "builder": "@angular-devkit/build-angular:karma", "options": { "main": "src/test.ts", - "karmaConfig": "./karma.conf.js", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "scripts": [], - "styles": [ - "node_modules/bootstrap/dist/css/bootstrap.min.css", - "node_modules/font-awesome/css/font-awesome.min.css" - ], + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", "assets": [ + "src/favicon.ico", "src/assets", - "src/favicon.ico" - ] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" + "src/manifest.webmanifest" ], - "exclude": [] - } - } - } - }, - "wordcombinerapp-e2e": { - "root": "e2e", - "sourceRoot": "e2e", - "projectType": "application", - "architect": { - "e2e": { - "builder": "@angular-devkit/build-angular:protractor", - "options": { - "protractorConfig": "./protractor.conf.js", - "devServerTarget": "wordcombiner:serve" + "styles": [ + "node_modules/bootstrap/dist/css/bootstrap.min.css", + "node_modules/@angular/material/prebuilt-themes/purple-green.css", + "src/styles.css", + "src/structure.css" + ], + "scripts": [] } }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "deploy": { + "builder": "@angular/fire:deploy", "options": { - "tsConfig": [ - "e2e/tsconfig.e2e.json" - ], - "exclude": [] + "prerender": false, + "ssr": false, + "browserTarget": "agartalafyi:build:production", + "firebaseProject": "agtfyi", + "firebaseHostingSite": "agtfyi" } } } } }, - "defaultProject": "wordcombinerapp", - "schematics": { - "@schematics/angular:component": { - "prefix": "app", - "styleext": "css" - }, - "@schematics/angular:directive": { - "prefix": "app" - } - } + "defaultProject": "agartalafyi" } \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 063e678..63af0b6 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,5 +1,5 @@ // Karma configuration file, see link for more information -// https://karma-runner.github.io/0.13/config/configuration-file.html +// https://karma-runner.github.io/1.0/config/configuration-file.html module.exports = function (config) { config.set({ @@ -9,23 +9,36 @@ module.exports = function (config) { require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), + require('karma-coverage'), require('@angular-devkit/build-angular/plugins/karma') ], - client:{ + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, clearContext: false // leave Jasmine Spec Runner output visible in browser }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], - fixWebpackSourcePaths: true + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, './coverage/agartalafyi'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] }, - reporters: ['progress', 'kjhtml'], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, browsers: ['Chrome'], - singleRun: false + singleRun: false, + restartOnFileChange: true }); }; diff --git a/ngsw-config.json b/ngsw-config.json new file mode 100644 index 0000000..f8bf210 --- /dev/null +++ b/ngsw-config.json @@ -0,0 +1,30 @@ +{ + "$schema": "./node_modules/@angular/service-worker/config/schema.json", + "index": "/index.html", + "assetGroups": [ + { + "name": "app", + "installMode": "prefetch", + "resources": { + "files": [ + "/favicon.ico", + "/index.html", + "/manifest.webmanifest", + "/*.css", + "/*.js" + ] + } + }, + { + "name": "assets", + "installMode": "lazy", + "updateMode": "prefetch", + "resources": { + "files": [ + "/assets/**", + "/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)" + ] + } + } + ] +} diff --git a/package.json b/package.json index 51826bf..daf5d49 100644 --- a/package.json +++ b/package.json @@ -1,60 +1,48 @@ { - "name": "webcombinerapp", + "name": "jsonfriend", "version": "0.0.0", - "license": "MIT", "scripts": { "ng": "ng", - "buildk": "webpack", + "start": "ng serve", "build": "ng build", - "start": "webpack-dev-server --port=4200", - "test": "karma start ./karma.conf.js", - "pree2e": "webdriver-manager update --standalone false --gecko false --quiet", - "e2e": "protractor ./protractor.conf.js" + "watch": "ng build --watch --configuration development", + "test": "ng test" }, "private": true, "dependencies": { - "@angular/animations": "^6.1.0", - "@angular/common": "^6.1.0", - "@angular/compiler": "^6.1.0", - "@angular/core": "^6.1.0", - "@angular/forms": "^6.1.0", - "@angular/http": "^6.1.0", - "@angular/platform-browser": "^6.1.0", - "@angular/platform-browser-dynamic": "^6.1.0", - "@angular/router": "^6.1.0", - "angular-cli-ghpages": "^0.6.2", - "bootstrap": "^4.0.0", - "core-js": "^2.5.3", - "portfinder": "^1.0.13", - "rxjs": "^6.2.2", - "rxjs-compat": "^6.0.0-rc.0", - "webpack-cli": "^3.1.0", - "zone.js": "^0.8.20" + "@angular/animations": "~13.3.0", + "@angular/cdk": "^13.3.9", + "@angular/common": "~13.3.0", + "@angular/compiler": "~13.3.0", + "@angular/core": "~13.3.0", + "@angular/fire": "^7.4.1", + "@angular/flex-layout": "^13.0.0-beta.36", + "@angular/forms": "~13.3.0", + "@angular/material": "^13.3.9", + "@angular/platform-browser": "~13.3.0", + "@angular/platform-browser-dynamic": "~13.3.0", + "@angular/router": "~13.3.0", + "@angular/service-worker": "~13.3.0", + "bootstrap": "^5.2.0", + "bootstrap-slider": "^11.0.2", + "font-awesome": "^4.7.0", + "registry.npmjs.org": "^1.0.1", + "rxjs": "~7.5.0", + "tslib": "^2.3.0", + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.7.0", - "@angular/cli": "~6.1.1", - "@angular/compiler-cli": "^6.1.0", - "@angular/language-service": "^6.1.0", - "@types/jasmine": "~2.8.6", - "@types/jasminewd2": "~2.0.3", - "@types/node": "~10.5.3", - "codelyzer": "~4.4.2", - "install": "^0.12.2", - "jasmine-core": "~3.1.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "~2.0.5", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.0", - "karma-jasmine": "~1.1.1", - "karma-jasmine-html-reporter": "^1.2.0", - "ng-snotify": "^4.3.1", - "npm": "^6.4.1", - "protractor": "~5.4.0", - "ts-node": "~7.0.0", - "tslint": "~5.11.0", - "typescript": "~2.9.2", - "webpack": "~4.16.2", - "webpack-dev-server": "^3.1.5" + "@angular-devkit/build-angular": "~13.3.7", + "@angular/cli": "~13.3.7", + "@angular/compiler-cli": "~13.3.0", + "@types/jasmine": "~3.10.0", + "@types/node": "^12.11.1", + "jasmine-core": "~4.0.0", + "karma": "~6.3.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage": "~2.1.0", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "~1.7.0", + "typescript": "~4.6.2" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5311afc..65cac66 100755 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - -import { httpFactory } from "./common/services/http.factory"; import { AboutComponent, WordMergerComponent } from './index' const routes: Routes = [ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c520152..2f94ff6 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; +//import { Subscription } from 'rxjs/Subscription'; import { Router, CanActivate } from '@angular/router'; @Component({ moduleId: "module.id", @@ -10,7 +10,7 @@ export class AppComponent implements OnInit { public showSideBar = true; activeClassBool = false; - compCommunicateSubscription: Subscription; + //compCommunicateSubscription: Subscription; constructor( router: Router ) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8a8d79b..de935a1 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,8 +4,9 @@ import { NgModule, } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AppComponent } from './app.component'; -import { HttpModule, Http, XHRBackend, RequestOptions } from '@angular/http'; +import { HttpClientModule, HttpClient } from '@angular/common/http'; import { AboutComponent, WordMergerComponent } from './index' +import { ApplicationHttpClient, applicationHttpClientCreator } from './common/services/commonhttp.interceptor2'; @NgModule({ declarations: [ @@ -17,12 +18,18 @@ import { AboutComponent, WordMergerComponent } from './index' BrowserModule, FormsModule, ReactiveFormsModule, - HttpModule, + HttpClientModule, AppRoutingModule, BrowserAnimationsModule, BrowserModule, ], - providers: [ + providers: [ + //Provide the extended HttpClient + { + provide: ApplicationHttpClient, + useFactory: applicationHttpClientCreator, + deps: [HttpClient] + }, ], bootstrap: [AppComponent] }) diff --git a/src/app/common/services/commonhttp.interceptor.ts b/src/app/common/services/commonhttp.interceptor.ts index 45ca2bd..33b9f18 100644 --- a/src/app/common/services/commonhttp.interceptor.ts +++ b/src/app/common/services/commonhttp.interceptor.ts @@ -1,17 +1,26 @@ import { Injectable } from "@angular/core"; -import { ConnectionBackend, RequestOptions, Request, RequestOptionsArgs, Response, Http, Headers } from "@angular/http"; -import { Observable } from "rxjs/Rx"; +import { HttpRequest, HttpResponse, HttpClient, HttpHeaders, HttpContext, HttpParams } from "@angular/common/http"; +//import { Observable } from "rxjs/Rx"; import { environment } from "../../../environments/environment"; @Injectable() -export class InterceptedHttp extends Http { - constructor(backend: ConnectionBackend, defaultOptions: RequestOptions) { - super(backend, defaultOptions); - } - - request(url: string | Request, options?: RequestOptionsArgs): Observable { - return super.request(url, options); - } +export class InterceptedHttp extends HttpClient { + + /* + request(method: string, url: string, options: { + body?: any; + headers?: HttpHeaders | { + [header: string]: string | string[]; + }; + context?: HttpContext; + observe?: 'body'; + params?: HttpParams | { + [param: string]: string | number | boolean | ReadonlyArray; + }; + reportProgress?: boolean; + responseType: 'arraybuffer'; + withCredentials?: boolean; + }): Observable; get(url: string, options?: RequestOptionsArgs): Observable { @@ -50,4 +59,5 @@ export class InterceptedHttp extends Http { return options; } + */ } \ No newline at end of file diff --git a/src/app/common/services/commonhttp.interceptor2.ts b/src/app/common/services/commonhttp.interceptor2.ts new file mode 100644 index 0000000..a0a4972 --- /dev/null +++ b/src/app/common/services/commonhttp.interceptor2.ts @@ -0,0 +1,75 @@ +import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; + +// Angular CLI configuration thing. +export interface IRequestOptions { + headers?: HttpHeaders; + observe?: 'body'; + params?: HttpParams; + reportProgress?: boolean; + responseType?: 'json'; + withCredentials?: boolean; + body?: any; +} + +export function applicationHttpClientCreator(http: HttpClient) { + return new ApplicationHttpClient(http); +} + +@Injectable() +export class ApplicationHttpClient { + + private api = 'https://example.com'; + + public getAPI() { + return this.api; + } + + // Extending the HttpClient through the Angular DI. + public constructor(public http: HttpClient) { + } + + /** + * GET request + * @param {string} endPoint it doesn't need / in front of the end point + * @param {IRequestOptions} options options of the request like headers, body, etc. + * @param {string} api use if there is needed to send request to different back-end than the default one. + * @returns {Observable} + */ + public Get(endPoint: string, options?: IRequestOptions): Observable { + return this.http.get(this.api + endPoint, options); + } + + /** + * POST request + * @param {string} endPoint end point of the api + * @param {Object} params body of the request. + * @param {IRequestOptions} options options of the request like headers, body, etc. + * @returns {Observable} + */ + public Post(endPoint: string, params: Object, options?: IRequestOptions): Observable { + return this.http.post(this.api + endPoint, params, options); + } + + /** + * PUT request + * @param {string} endPoint end point of the api + * @param {Object} params body of the request. + * @param {IRequestOptions} options options of the request like headers, body, etc. + * @returns {Observable} + */ + public Put(endPoint: string, params: Object, options?: IRequestOptions): Observable { + return this.http.put(this.api + endPoint, params, options); + } + + /** + * DELETE request + * @param {string} endPoint end point of the api + * @param {IRequestOptions} options options of the request like headers, body, etc. + * @returns {Observable} + */ + public Delete(endPoint: string, options?: IRequestOptions): Observable { + return this.http.delete(this.api + endPoint, options); + } +} \ No newline at end of file diff --git a/src/app/common/services/commonhttp.service.ts b/src/app/common/services/commonhttp.service.ts index 1818a6a..1b7e6bd 100755 --- a/src/app/common/services/commonhttp.service.ts +++ b/src/app/common/services/commonhttp.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; +import { HttpClient } from '@angular/common/http'; import 'rxjs/add/operator/toPromise'; import { environment } from '../../../environments/environment'; @@ -8,7 +8,7 @@ export class CommonHttpService { public baseURL = environment.apiBaseURL; // BASE URL to web api private isServerAvailable = false; - constructor(private http: Http) { + constructor(private http: HttpClient) { } diff --git a/src/app/common/services/http.factory.ts b/src/app/common/services/http.factory.ts deleted file mode 100644 index c4db269..0000000 --- a/src/app/common/services/http.factory.ts +++ /dev/null @@ -1,6 +0,0 @@ -import {XHRBackend, Http, RequestOptions} from "@angular/http"; -import {InterceptedHttp} from "./commonhttp.interceptor"; - -export function httpFactory(xhrBackend: XHRBackend, requestOptions: RequestOptions): Http { - return new InterceptedHttp(xhrBackend, requestOptions); -} \ No newline at end of file diff --git a/src/app/word-merger.component.ts b/src/app/word-merger.component.ts index ba2a805..1a0fd02 100644 --- a/src/app/word-merger.component.ts +++ b/src/app/word-merger.component.ts @@ -5,10 +5,10 @@ import { Component, OnInit } from '@angular/core'; templateUrl: './word-merger.component.html' }) export class WordMergerComponent implements OnInit { - word1: string; - word2: string; - word3: string; - word4: string; + word1: string =""; + word2: string =""; + word3: string =""; + word4: string =""; isFormError: boolean = false; allowedStringLn: number = 25; listOfGeneratedWords = Array(); @@ -37,7 +37,7 @@ export class WordMergerComponent implements OnInit { this.listOfGeneratedWords.push(this.word3); this.listOfGeneratedWords.push(this.word4); resultArray = this.tryCombine(this.word1, this.word2); - let removeDuplicates = (names) => names.filter((v, i) => names.indexOf(v) === i) + let removeDuplicates = (names: any[]) => names.filter((v, i) => names.indexOf(v) === i) removeDuplicates(resultArray); //use word3 @@ -124,10 +124,11 @@ export class WordMergerComponent implements OnInit { } private removeDuplicates(data: Array) { - let unique = {}; + let unique = new Map(); + ; data.forEach(function (i) { - if (!unique[i]) { - unique[i] = true; + if (!unique.has(i)) { + unique.set(i, true) ; } }); diff --git a/src/polyfills.ts b/src/polyfills.ts index 7831e97..3ddf635 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -38,8 +38,7 @@ // import 'classlist.js'; // Run `npm install --save classlist.js`. /** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; +import 'core-js/es/reflect'; /** diff --git a/src/styles.css b/src/styles.css new file mode 100644 index 0000000..bd4bb13 --- /dev/null +++ b/src/styles.css @@ -0,0 +1,10 @@ +/* Sidd You can add global styles to this file, and also import other style files */ +@import "~bootstrap/dist/css/bootstrap.min.css"; +@import "~bootstrap-slider/dist/css/bootstrap-slider.min.css"; + +@import "~@angular/material/prebuilt-themes/indigo-pink.css"; + + +@import "https://fonts.googleapis.com/css2?family=Spartan:wght@100;200;300;400;500;600;700;800;900&display=swap";html { + scroll-behavior: smooth +} diff --git a/tsconfig.app.json b/tsconfig.app.json new file mode 100644 index 0000000..82d91dc --- /dev/null +++ b/tsconfig.app.json @@ -0,0 +1,15 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": [ + "src/main.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" + ] +} diff --git a/tsconfig.json b/tsconfig.json index 2fb943e..f531992 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,26 +1,32 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ { "compileOnSave": false, "compilerOptions": { + "baseUrl": "./", "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, "sourceMap": true, "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, + "downlevelIteration": true, "experimentalDecorators": true, - "target": "es5", - "typeRoots": [ - "node_modules/@types" - ], + "moduleResolution": "node", + "importHelpers": true, + "target": "es2017", + "module": "es2020", "lib": [ - "es2016", + "es2020", "dom" - ], - "module": "es2015", - "baseUrl": "./" + ] }, - "exclude": [ - "node_modules", - "dist", - "typings" - ] -} \ No newline at end of file + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + } +} diff --git a/tsconfig.spec.json b/tsconfig.spec.json new file mode 100644 index 0000000..092345b --- /dev/null +++ b/tsconfig.spec.json @@ -0,0 +1,18 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": [ + "jasmine" + ] + }, + "files": [ + "src/test.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} From dbc3de5783aa84f5608098960934ad2a7e71d53b Mon Sep 17 00:00:00 2001 From: Sidd Bhattacharjee Date: Thu, 10 Nov 2022 22:57:17 -0800 Subject: [PATCH 3/3] udpated project name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index daf5d49..0fdf005 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "jsonfriend", + "name": "webcombinerapp", "version": "0.0.0", "scripts": { "ng": "ng",