Skip to content

Commit

Permalink
Remove separate admin-app and add localization files from packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@geertplaisier
geertplaisier committed Oct 12, 2023
1 parent bdf6ff0 commit 0df58da
Show file tree
Hide file tree
Showing 21 changed files with 66 additions and 430 deletions.
154 changes: 25 additions & 129 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
"root": "projects/app",
"sourceRoot": "projects/app/src",
"prefix": "app",
"i18n": {
"sourceLocale": "en",
"locales": {
"nl": {
"translation": [
"node_modules/@tailormap-viewer/core/assets/locale/messages.core.nl.xlf",
"node_modules/@tailormap-viewer/shared/assets/locale/messages.shared.nl.xlf",
"node_modules/@tailormap-admin/admin-core/assets/locale/messages.admin-core.nl.xlf"
]
}
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
Expand All @@ -39,6 +51,11 @@
"glob": "**/*",
"input": "node_modules/@tailormap-viewer/core/assets/icons",
"output": "icons"
},
{
"glob": "**/*",
"input": "node_modules/@tailormap-admin/admin-core/assets/icons",
"output": "icons"
}
],
"styles": [
Expand All @@ -58,10 +75,14 @@
"dompurify",
"rbush",
"cssesc",
"font-family-papandreou"
"font-family-papandreou",
"earcut"
]
},
"configurations": {
"nl": {
"localize": ["nl"]
},
"production": {
"budgets": [
{
Expand Down Expand Up @@ -108,6 +129,9 @@
},
"development": {
"browserTarget": "app:build:development"
},
"nl": {
"browserTarget": "app:build:development,nl"
}
},
"options": {
Expand All @@ -131,134 +155,6 @@
}
}
}
},
"admin-app": {
"projectType": "application",
"schematics": {
"@schematics/angular:application": {
"strict": true
}
},
"root": "projects/admin-app",
"sourceRoot": "projects/admin-app/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/app/admin",
"index": "projects/admin-app/src/index.html",
"main": "projects/admin-app/src/main.ts",
"polyfills": "projects/admin-app/src/polyfills.ts",
"tsConfig": "projects/admin-app/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "assets",
"output": "."
},
{
"glob": "**/*",
"input": "node_modules/@tailormap-viewer/core/assets/icons",
"output": "icons"
},
{
"glob": "**/*",
"input": "node_modules/@tailormap-admin/admin-core/assets/icons",
"output": "icons"
}
],
"styles": [
"node_modules/@tailormap-viewer/core/assets/custom-theme.scss",
"node_modules/@tailormap-viewer/core/assets/tailormap-styles.css",
"node_modules/@tailormap-admin/admin-core/assets/tailormap-admin-styles.css"
],
"scripts": [],
"allowedCommonJsDependencies": [
"xml-utils",
"pbf",
"html2canvas",
"core-js",
"raf",
"rgbcolor",
"lru-cache",
"web-worker",
"dompurify",
"rbush",
"cssesc",
"font-family-papandreou"
]
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "1.5mb",
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"fileReplacements": [
{
"replace": "projects/admin-app/src/environments/environment.ts",
"with": "projects/admin-app/src/environments/environment.prod.ts"
}
],
"outputHashing": "all",
"sourceMap": {
"styles": false,
"scripts": true,
"vendor": true,
"hidden": false
}
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "admin-app:build:production"
},
"development": {
"browserTarget": "admin-app:build:development"
}
},
"options": {
"proxyConfig": "proxy.config.js"
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "admin-app:build"
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"projects/admin-app/**/*.ts",
"projects/admin-app/**/*.html"
]
}
}
}
}
}
}
1 change: 0 additions & 1 deletion jest.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
projects: [
'<rootDir>/projects/app',
'<rootDir>/projects/admin-app'
]
};
66 changes: 33 additions & 33 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
"scripts": {
"ng": "ng",
"start": "ng serve app",
"start-nl": "ng serve app --configuration=nl",
"prebuild": "node bin/prebuild.js",
"build": "ng build app",
"build-localized": "ng build app --localize",
"watch": "ng build --watch --configuration development app",
"start-admin": "ng serve admin-app --port=4201",
"build-admin": "ng build admin-app",
"watch-admin": "ng build --watch --configuration development admin-app",
"test": "jest --max-workers=4",
"test:ci": "jest --ci --collect-coverage --reporters=default --reporters=jest-junit",
"lint": "ng lint"
Expand All @@ -32,12 +31,12 @@
"@ngrx/effects": "^16.2.0",
"@ngrx/store": "^16.2.0",
"@ngrx/store-devtools": "^16.2.0",
"@tailormap-admin/admin-api": "^11.1.0",
"@tailormap-admin/admin-core": "^11.1.0",
"@tailormap-viewer/api": "^11.1.0",
"@tailormap-viewer/core": "^11.1.0",
"@tailormap-viewer/map": "^11.1.0",
"@tailormap-viewer/shared": "^11.1.0",
"@tailormap-admin/admin-api": "^11.1.2",
"@tailormap-admin/admin-core": "^11.1.2",
"@tailormap-viewer/api": "^11.1.2",
"@tailormap-viewer/core": "^11.1.2",
"@tailormap-viewer/map": "^11.1.2",
"@tailormap-viewer/shared": "^11.1.2",
"@stardazed/zlib": "^1.0.1",
"@tinyhttp/content-disposition": "^2.1.0",
"html2canvas": "^1.4.1",
Expand Down
16 changes: 0 additions & 16 deletions projects/admin-app/.browserslistrc
View file

This file was deleted.

Loading

0 comments on commit 0df58da

Please sign in to comment.