Merge pull request #57 from sardapv/upgrades/angular-14

Upgrades/angular14-tailwind3-more

Author: sardapv

.github/workflows/build-deploy.yml

@@ -32,9 +32,9 @@ jobs:
       - name: Lint
         run: |
           npm run lint
-      - name: Cypress Test
-        run: |
-          npm run e2e:ci
+      # - name: Cypress Test // bug-doesn't return back to cli,
+      #   run: |
+      #     npm run e2e:ci
       - name: Test
         run: |
           npm run test

.github/workflows/coverage.yml

@@ -39,11 +39,11 @@ jobs:
       - name: Run unit tests
         run: npm run test:coverage
 
-      - name: Run Cypress tests
-        run: npm run e2e:ci
+      # - 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
+      # - name: Convert test results
+      #   run: npx nyc report --reporter=json
 
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+      # - name: Upload coverage to Codecov
+      #   uses: codecov/codecov-action@v1

.gitignore

@@ -2,7 +2,7 @@
 .editorconfig
 
 .version
-
+.angular
 # compiled output
 /dist
 /tmp

.vscode/extensions.json

@@ -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"

README.md

@@ -1,5 +1,9 @@
 # angular-material-starter-template (ng-new-app 🍄)
 
+## Package has been updated withe everything latest, if you find any issues, please report. PRs welcome
+
+_Note: Cypress RUN and Code Coverage is disabled from pipeline until officially fixed by Cypress Team_
+
 [![Lint-Prettier-Prettier:verify-Tests-CypressTests-Build-Purgecss-Deploy](https://github.com/sardapv/angular-material-starter-template/actions/workflows/build-deploy.yml/badge.svg)](https://github.com/sardapv/angular-material-starter-template/actions/workflows/build-deploy.yml) ![GitHub](https://img.shields.io/github/license/sardapv/ng-material-starter-template) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/sardapv/angular-material-starter-template)
 
 ![logo](logoForThisRepo.png?raw=true)

angular.json

@@ -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": []
@@ -109,18 +108,18 @@
           }
         },
         "cypress-run": {
-          "builder": "@briebug/cypress-schematic:cypress",
+          "builder": "@cypress/schematic:cypress",
           "options": {
             "devServerTarget": "ng-new-app:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "ng-new-app:serve:production"
+              "devServerTarget": "ng-new-app:production"
             }
           }
         },
         "cypress-open": {
-          "builder": "@briebug/cypress-schematic:cypress",
+          "builder": "@cypress/schematic:cypress",
           "options": {
             "devServerTarget": "ng-new-app:serve",
             "watch": true,
@@ -133,7 +132,7 @@
           }
         },
         "e2e": {
-          "builder": "@briebug/cypress-schematic:cypress",
+          "builder": "@cypress/schematic:cypress",
           "options": {
             "devServerTarget": "ng-new-app:serve",
             "watch": true,

bin/generate-app.js

@@ -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',
@@ -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 ⏳');

cypress.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  videosFolder: 'cypress/videos',
+  screenshotsFolder: 'cypress/screenshots',
+  fixturesFolder: 'cypress/fixtures',
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config);
+    },
+    baseUrl: 'http://localhost:4200',
+  },
+});