Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: merge apps and libs into projects folder #311

Merged
merged 4 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ on:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
needs: install
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v2
with:
node-version: '14.15'
- run: npm ci
- run: npm install
- run: npm run build
- name: Publish to npm
env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ on:
branches: ['master']

jobs:
build:
test-and-build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '14.15'
cache: 'npm'
- run: npm ci
- run: npm install
- run: npm run build
- name: Run tests
run: npm run test -- --ci --coverage --reporters default --reporters jest-junit
Expand Down
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
41 changes: 18 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
28 changes: 0 additions & 28 deletions apps/playground/package.json

This file was deleted.

Loading
Loading