Skip to content
Open
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: 3 additions & 0 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install Angular CLI globally
run: |
npm install -g @angular/cli
- name: Install npm dependencies
run: |
npm install
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
run: |
npm install

- name: Install Angular CLI globally
run: |
npm install -g @angular/cli

- name: Checkout repository
uses: actions/checkout@v2
with:
Expand All @@ -39,11 +43,11 @@ jobs:
- name: Run unit tests
run: npm run test:coverage

- name: Run Cypress tests
- name: Run Cypress tests //bug-https://github.com/cypress-io/cypress/issues/23026
run: npm run e2e:ci

- name: Convert test results
run: npx nyc report --reporter=lcov
run: npx nyc report --reporter=json

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.editorconfig

.version

.angular
# compiled output
/dist
/tmp
Expand Down
6 changes: 5 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"recommendations": [
"angular.ng-template",
"bradlc.vscode-tailwindcss", // tailwind auto suggestions
"esbenp.prettier-vscode", //pretifier
"mike-co.import-sorter", //sorts imports
"johnpapa.Angular2", //angular snippets
"formulahendry.auto-rename-tag", //auto renames tags
"dbaeumer.vscode-eslint",
"josefbiehler.cypress-fixture-intellisense",
"esbenp.prettier-vscode",
"ms-vscode.test-adapter-converter",
"ghaschel.vscode-angular-html",
"connorshea.vscode-test-explorer-status-bar"
Expand Down
9 changes: 4 additions & 5 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"inlineStyleLanguage": ["scss"],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
Expand All @@ -109,7 +108,7 @@
}
},
"cypress-run": {
"builder": "@briebug/cypress-schematic:cypress",
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "ng-new-app:serve"
},
Expand All @@ -120,7 +119,7 @@
}
},
"cypress-open": {
"builder": "@briebug/cypress-schematic:cypress",
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "ng-new-app:serve",
"watch": true,
Expand All @@ -133,7 +132,7 @@
}
},
"e2e": {
"builder": "@briebug/cypress-schematic:cypress",
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "ng-new-app:serve",
"watch": true,
Expand Down
4 changes: 3 additions & 1 deletion bin/generate-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const currentPath = process.cwd();
const projectPath = path.join(currentPath, projectName);
const git_repo = 'https://github.com/sardapv/angular-material-starter-template.git';
const features = [
'New Version Updatee: Now Supports, Angular, Tailwind, Jest, Cypress @ Latest',
'-------------------------------------------------------',
'Scalable Project Structure, annotations configured, Global style.scss configured',
'Angular Material Component, Icons, Typography & CDK integrated (just change _variables and colors)',
'Utility first Tailwind CSS, some of the custom configuration added',
Expand Down Expand Up @@ -99,7 +101,7 @@ async function main() {
console.log('\x1b[34m', ` 1. cd ${projectName}`);
console.log(` 2. search and replace 'ng-new-app' in all files with your app-name using editor ⚠️`);
console.log(` 3. Edit package.json and change starting details like author, description, git url, etc.`);
console.log(` 4. If API calls supported, configure baseurl inenvironment*.ts files (don't end with /)`);
console.log(` 4. If API calls supported, configure baseurl in environment*.ts files (don't end with /)`);
console.log(' 5. Run npm start', '\x1b[0m');
console.log();
console.log('step 4/4 ⏳');
Expand Down
7 changes: 7 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:4200',
},
});
9 changes: 0 additions & 9 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('jest-preset-angular/ngcc-jest-processor');
module.exports = {
moduleNameMapper: {
'@core/(.*)': '<rootDir>/src/app/core/$1',
Expand All @@ -8,7 +7,9 @@ module.exports = {
preset: 'jest-preset-angular',
setupFilesAfterEnv: ['./setup-jest.ts'],
collectCoverage: true,
coverageReporters: ['lcov'],
coverageReporters: ['text', 'lcov'],
coverageDirectory: './coverage/jest',
collectCoverageFrom: ['**/*.ts'],
globalSetup: 'jest-preset-angular/global-setup',
testPathIgnorePattern: ['src/environments'],
};
Binary file modified logoForThisRepo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading