Skip to content

Commit

Permalink
refactor: merge apps and libs into projects folder
Browse files Browse the repository at this point in the history
This aligns with the current Angular conventions for multi-project workspaces.
  • Loading branch information
FERNman committed Sep 1, 2024
1 parent 42006b1 commit 7090549
Show file tree
Hide file tree
Showing 62 changed files with 279 additions and 126 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"editor.formatOnSave": true,
"[typescript]": {
"editor.codeActionsOnSave": {
"source.fixAll.tslint": true
"source.fixAll.tslint": "explicit"
}
},
"git.rebaseWhenSync": true
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MIT License

Copyright (c) 2018 Gabriel Sperrer
Copyright (c) 2024 Gabriel Sperrer

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
125 changes: 102 additions & 23 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,32 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"version": 1,
"newProjectRoot": "apps",
"newProjectRoot": "projects",
"projects": {
"angular-google-charts": {
"root": "libs/angular-google-charts",
"sourceRoot": "libs/angular-google-charts/src",
"root": "projects/angular-google-charts",
"sourceRoot": "projects/angular-google-charts/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "libs/angular-google-charts/tsconfig.lib.json",
"project": "libs/angular-google-charts/ng-package.json"
"tsConfig": "projects/angular-google-charts/tsconfig.lib.json",
"project": "projects/angular-google-charts/ng-package.json"
},
"configurations": {
"production": {
"project": "libs/angular-google-charts/ng-package.prod.json",
"tsConfig": "libs/angular-google-charts/tsconfig.lib.prod.json"
"project": "projects/angular-google-charts/ng-package.prod.json",
"tsConfig": "projects/angular-google-charts/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"configPath": "jest.config.js",
"projects": ["libs/angular-google-charts"],
"projects": ["projects/angular-google-charts"],
"coverageDirectory": "../../coverage"
}
}
Expand All @@ -40,29 +35,29 @@
"playground": {
"projectType": "application",
"schematics": {},
"root": "apps/playground",
"sourceRoot": "apps/playground/src",
"root": "projects/playground",
"sourceRoot": "projects/playground/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/playground",
"index": "apps/playground/src/index.html",
"main": "apps/playground/src/main.ts",
"polyfills": "apps/playground/src/polyfills.ts",
"tsConfig": "apps/playground/tsconfig.app.json",
"assets": ["apps/playground/src/favicon.ico", "apps/playground/src/assets"],
"styles": ["apps/playground/src/styles.scss"],
"index": "projects/playground/src/index.html",
"main": "projects/playground/src/main.ts",
"polyfills": "projects/playground/src/polyfills.ts",
"tsConfig": "projects/playground/tsconfig.app.json",
"assets": ["projects/playground/src/favicon.ico", "projects/playground/src/assets"],
"styles": ["projects/playground/src/styles.scss"],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "apps/playground/src/environments/environment.ts",
"with": "apps/playground/src/environments/environment.prod.ts"
"replace": "projects/playground/src/environments/environment.ts",
"with": "projects/playground/src/environments/environment.prod.ts"
}
],
"optimization": true,
Expand Down Expand Up @@ -99,6 +94,90 @@
}
}
}
},
"playground-test": {
"projectType": "application",
"schematics": {},
"root": "projects/playground-test",
"sourceRoot": "projects/playground-test/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/playground-test",
"index": "projects/playground-test/src/index.html",
"main": "projects/playground-test/src/main.ts",
"polyfills": "projects/playground-test/src/polyfills.ts",
"tsConfig": "projects/playground-test/tsconfig.app.json",
"assets": ["projects/playground-test/src/favicon.ico", "projects/playground-test/src/assets"],
"styles": ["projects/playground-test/src/styles.css"],
"scripts": []
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
],
"fileReplacements": [
{
"replace": "projects/playground-test/src/environments/environment.ts",
"with": "projects/playground-test/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",
"configurations": {
"production": {
"browserTarget": "playground-test:build:production"
},
"development": {
"browserTarget": "playground-test:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "playground-test:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/playground-test/src/test.ts",
"polyfills": "projects/playground-test/src/polyfills.ts",
"tsConfig": "projects/playground-test/tsconfig.spec.json",
"karmaConfig": "projects/playground-test/karma.conf.js",
"assets": ["projects/playground-test/src/favicon.ico", "projects/playground-test/src/assets"],
"styles": ["projects/playground-test/src/styles.css"],
"scripts": []
}
}
}
}
},
"cli": {
Expand Down
Loading

0 comments on commit 7090549

Please sign in to comment.