Skip to content

Commit

Permalink
Merge pull request #20 from KB-iGOT/angular-9-to-12
Browse files Browse the repository at this point in the history 
Angular 9 to 12
  • Loading branch information
@vishnubansaltarento
vishnubansaltarento authored Sep 18, 2024
2 parents fb4835e + 2498d35 commit 2592c04
Show file tree
Hide file tree
Showing 313 changed files with 145,559 additions and 62,322 deletions.
0 browserslist → .browserslistrc
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM node:12
FROM node:20

WORKDIR /app
COPY . .

#RUN npm i yarn
#RUN yarn global add @angular/cli@latest

RUN yarn && yarn add moment && yarn add vis-util && npm run build --prod --build-optimizer
#RUN ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --verbose=true
RUN npm run compress:brotli
Expand Down
77 changes: 50 additions & 27 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,56 +30,57 @@
"styles": [
{
"input": "src/styles/libraries.scss",
"bundleName": "libraries"
"bundleName": "libraries",
"inject": true
},
"node_modules/material-icons/iconfont/material-icons.scss",
"src/styles/mat-typography.scss",
"src/styles/styles.scss",
"node_modules/shepherd.js/dist/css/shepherd.css",
{
"inject": true,
"input": "src/themes/theme-deep-purple.scss",
"bundleName": "theme-deep-purple",
"lazy": true
"bundleName": "theme-deep-purple"
},
{
"inject": true,
"input": "src/themes/theme-grey.scss",
"bundleName": "theme-grey",
"lazy": true
"bundleName": "theme-grey"
},
{
"inject": true,
"input": "src/themes/theme-indigo.scss",
"bundleName": "theme-indigo",
"lazy": true
"bundleName": "theme-indigo"
},
{
"inject": true,
"input": "src/themes/theme-lite-blue.scss",
"bundleName": "theme-lite-blue",
"lazy": true
"bundleName": "theme-lite-blue"
},
{
"inject": true,
"input": "src/themes/theme-orange.scss",
"bundleName": "theme-orange",
"lazy": true
"bundleName": "theme-orange"
},
{
"inject": true,
"input": "src/themes/theme-teal.scss",
"bundleName": "theme-teal",
"lazy": true
"bundleName": "theme-teal"
},
{
"inject": true,
"input": "src/themes/theme-blue.scss",
"bundleName": "theme-blue",
"lazy": true
"bundleName": "theme-blue"
},
{
"inject": true,
"input": "src/themes/theme-deep-blue.scss",
"bundleName": "theme-deep-blue",
"lazy": true
"bundleName": "theme-deep-blue"
},
{
"inject": true,
"input": "src/themes/theme-igot.scss",
"bundleName": "theme-igot",
"lazy": true
"bundleName": "theme-igot"
},
"node_modules/pdfjs-dist/web/pdf_viewer.css",
"src/spv-assets/fonts/lato/stylesheet.css",
Expand All @@ -90,7 +91,14 @@
"node_modules/shepherd.js/dist/js/shepherd.min.js",
"node_modules/@project-sunbird/telemetry-sdk/index.js",
"node_modules/leader-line/leader-line.min.js"
]
],
"aot": false,
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -103,7 +111,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -114,6 +121,10 @@
"type": "initial",
"maximumWarning": "4mb",
"maximumError": "15mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"serviceWorker": false,
Expand All @@ -129,7 +140,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -140,6 +150,10 @@
"type": "initial",
"maximumWarning": "4mb",
"maximumError": "15mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"serviceWorker": false,
Expand All @@ -155,7 +169,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -166,12 +179,17 @@
"type": "initial",
"maximumWarning": "4mb",
"maximumError": "15mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"serviceWorker": false,
"ngswConfigPath": "ngsw-config.json"
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -244,12 +262,17 @@
"prefix": "ws-app",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "project/ws/app/tsconfig.lib.json",
"project": "project/ws/app/ng-package.json"
}
},
, "configurations": {
"production": {
"tsConfig": "project/ws/app/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -276,7 +299,7 @@
"defaultProject": "spv",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
},
"cli": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
93 changes: 46 additions & 47 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,52 @@
"start": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy/localhost.proxy.json -o",
"dev": "npm run start:spv-dev",
"prebuild": "npm run lint:fix",
"build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
"build-preprod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=preprod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
"build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
"build-dev": "export NODE_OPTIONS=--openssl-legacy-provider && node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --configuration=dev --outputPath=dist/www/en --baseHref=/ --subresource-integrity",
"build-preprod": "export NODE_OPTIONS=--openssl-legacy-provider && node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --configuration=preprod --outputPath=dist/www/en --baseHref=/ --subresource-integrity",
"build": "export NODE_OPTIONS=--openssl-legacy-provider && node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --outputPath=dist/www/en --baseHref=/ --subresource-integrity",
"postbuild": "npm run compress:gzip && npm run compress:brotli",
"compress:brotli": "gzipper --brotli --gzip-level=9 --verbose ./dist/www",
"compress:gzip": "gzipper --verbose --gzip-level=9 ./dist/www",
"build:local": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod",
"build:local": "export NODE_OPTIONS=--openssl-legacy-provider && node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production",
"build:stats": "ng build --stats-json",
"start:spv-dev": "node --max_old_space_size=12288 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy/spv-dev-ip.proxy.json -o",
"analyse": "webpack-bundle-analyzer ./dist/www/ng serve --proxy-config proxy/localhost.proxy.json -o/stats-es5.json",
"test": "ng test",
"lint": "ng lint",
"lint:fix": "ng lint --fix",
"e2e": "ng e2e",
"i18n": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng xi18n --output-path locale",
"i18n": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng x--output-path locale",
"tailwind": "./node_modules/.bin/tailwind build ./src/tailwind-build.scss -o ./src/styles.scss",
"prestart": "npm run tailwind"
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.1",
"@angular/cdk": "~8.1.2",
"@angular/common": "~8.2.1",
"@angular/compiler": "~8.2.1",
"@angular/core": "~8.2.1",
"@angular/forms": "^8.2.14",
"@angular/material": "~8.1.2",
"@angular/material-moment-adapter": "^9.2.4",
"@angular/platform-browser": "~8.2.1",
"@angular/platform-browser-dynamic": "~8.2.1",
"@angular/pwa": "^0.803.14",
"@angular/router": "~8.2.1",
"@angular/service-worker": "~8.2.1",
"@angular/animations": "~12.2.17",
"@angular/cdk": "~12.2.13",
"@angular/common": "~12.2.17",
"@angular/compiler": "~12.2.17",
"@angular/core": "~12.2.17",
"@angular/forms": "^12.2.17",
"@angular/localize": "^18.2.4",
"@angular/material": "~12.2.13",
"@angular/material-moment-adapter": "^12.2.13",
"@angular/platform-browser": "~12.2.17",
"@angular/platform-browser-dynamic": "~12.2.17",
"@angular/router": "~12.2.17",
"@angular/service-worker": "~12.2.17",
"@project-sunbird/telemetry-sdk": "0.0.26",
"@sunbird-cb/collection": "^1.0.46",
"@sunbird-cb/taxonomy-editor": "0.0.36",
"@sunbird-cb/rain-dashboards": "^0.3.9",
"@sunbird-cb/resolver": "^1.0.0",
"@sunbird-cb/utils": "^1.0.17",
"@sunbird-cb/collection": "1.0.46-ang-9-12",
"@sunbird-cb/taxonomy-editor": "0.0.34-ang-9-12",
"@sunbird-cb/rain-dashboards": "0.4.15-ang-9-12",
"@sunbird-cb/resolver": "1.0.0-ang-9-12",
"@sunbird-cb/utils": "1.0.18-ang-9-12",
"@types/file-saver": "^2.0.1",
"@types/lodash": "4.14.172",
"@types/video.js": "7.2.12",
"brace": "^0.11.1",
"chart.js": "^2.8.0",
"d3": "^5.9.7",
"d3-funnel": "^2.1.1",
"dom-to-image": "^2.6.0",
"file-saver": "^2.0.2",
"hammerjs": "^2.0.8",
Expand All @@ -75,10 +76,10 @@
"quill": "^1.3.7",
"rxjs": "~6.5.2",
"shepherd.js": "^7.1.0",
"tailwindcss": "^1.1.4",
"tailwindcss": "^2.2.19",
"three": "^0.113.2",
"topojson-client": "^3.1.0",
"tslib": "^1.10.0",
"tslib": "^2.0.0",
"typeface-roboto": "0.0.75",
"video.js": "7.6.0",
"videojs-contrib-quality-levels": "^2.0.9",
Expand All @@ -88,45 +89,43 @@
"vis-network": "^5.2.4",
"vis-util": "^5.0.2",
"xlsx": "^0.16.1",
"zone.js": "~0.10.1"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.23",
"@angular-devkit/build-ng-packagr": "~0.802.1",
"@angular/cli": "^8.3.26",
"@angular/compiler-cli": "~8.2.1",
"@angular/language-service": "~8.2.1",
"@angular-devkit/build-angular": "~12.2.18",
"@angular/cli": "^12.2.18",
"@angular/compiler-cli": "~12.2.17",
"@angular/language-service": "~12.2.17",
"@types/chart.js": "^2.7.56",
"@types/d3": "^5.7.2",
"@types/jasmine": "~3.4.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.6",
"@types/mustache": "^0.8.32",
"@types/node": "^10.17.60",
"@types/node": "^12.11.1",
"@types/pdfjs-dist": "^2.1.3",
"@types/quill": "^2.0.2",
"@types/uuid": "^8.3.1",
"@types/video.js": "7.2.12",
"@types/vis": "^4.21.19",
"@types/zip.js": "2.0.28",
"angular-cli-alias": "^1.0.9",
"codelyzer": "^5.1.0",
"codelyzer": "^6.0.0",
"gzipper": "^2.8.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.2.0",
"karma-chrome-launcher": "~3.0.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"ng-packagr": "^5.4.3",
"protractor": "~5.4.2",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^12.2.7",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tsickle": "^0.36.0",
"tslint": "~5.18.0",
"tslint": "~6.1.0",
"tslint-angular": "^3.0.2",
"tslint-config-airbnb": "^5.11.1",
"typescript": "~3.5.3",
"typescript": "~4.3.5",
"typescript-tslint-plugin": "^0.5.4",
"webpack-bundle-analyzer": "^3.4.1"
}
}
}
23 changes: 13 additions & 10 deletions project/ws/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
"name": "@ws/app",
"version": "0.0.1",
"main": "./src/public-api.ts",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/animations": "~8.2.1",
"@angular/cdk": "~8.1.2",
"@angular/common": "~8.2.1",
"@angular/compiler": "~8.2.1",
"@angular/core": "~8.2.1",
"@angular/forms": "~8.2.1",
"@angular/material": "^8.1.2",
"@angular/platform-browser": "~8.2.1",
"@angular/platform-browser-dynamic": "~8.2.1",
"@angular/router": "~8.2.1"
"@angular/animations": "~12.2.17",
"@angular/cdk": "~12.2.13",
"@angular/common": "~12.2.17",
"@angular/compiler": "~12.2.17",
"@angular/core": "~12.2.17",
"@angular/forms": "~12.2.17",
"@angular/material": "~12.2.13",
"@angular/platform-browser": "~12.2.17",
"@angular/platform-browser-dynamic": "~12.2.17",
"@angular/router": "~12.2.17"
}
}
Loading

0 comments on commit 2592c04

Please sign in to comment.