Merge pull request #73 from shiftcode/#63-update-ng

#63 update ng and some housekeeping

Author: mumenthalers

.commitlintrc.yml

@@ -1,4 +1,4 @@
 extends:
-  - "@commitlint/config-angular"
+  - '@commitlint/config-angular'
 rules:
   'header-max-length': [2, 'always', 100]

.eslintrc.cjs

@@ -32,7 +32,7 @@ jobs:
         name: Check for execution
         uses: shiftcode/github-action-skip@v4.0.0
         with:
-          skipOnCommitMsg: "[skip_build]"
+          skipOnCommitMsg: '[skip_build]'
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   build:
     runs-on: ubuntu-latest
@@ -63,6 +63,9 @@ jobs:
       # install dependencies
       - name: Install
         run: HUSKY=0 npm ci  --include=optional
+      # check formatting
+      - name: Check Formatting
+        run: npm run format:ci
       # lint
       - name: Lint
         run: npm run lint:ci

.github/workflows/main.yml

@@ -1 +1 @@
-npx lint-staged && npx lerna exec --concurrency 1 --stream lint-staged
+npx lerna exec --concurrency 1 --stream lint-staged && npx lint-staged

.husky/pre-commit

@@ -1,4 +1,5 @@
-# !! no source on root !!
-# sort package.json keys
 ./package.json:
-  - sort-package-json
+  - npx sort-package-json
+
+'*':
+  - npm run format:staged

.lintstagedrc.yml

@@ -16,53 +16,59 @@ Public Angular libraries used in various shiftcode projects.
 > for previous versions.
 
 ## Angular to Lib Version Mapping
+
 Shows the mapping between the angular version and our lib versions.
 
 | Angular Version | Lib Version                   |
-|-----------------|-------------------------------|
+| --------------- | ----------------------------- |
 | `^21`           | `^13`                         |
 | `^20`           | `^11 \|\| ^12`                |
-| `^19`           | `^7 \|\| ^8 \|\| ^9 \|\| ^10` | 
-| `^18`           | `^6`                          | 
+| `^19`           | `^7 \|\| ^8 \|\| ^9 \|\| ^10` |
+| `^18`           | `^6`                          |
 | `^17`           | `^5`                          |
 | `^16`           | `^4`                          |
 | `^15`           | `^3`                          |
 | `^14`           | `^2`                          |
 | `^13`           | `^1`                          |
 
-
 ## Anatomy of this workspace
+
 Package manager client: `npm`
 
 Individual packages can depend on each other, the dependency is resolved using ts paths (see ./tsconfig.json) make sure to build the package you depend on. Or change the tsconfig.paths to reference the files under `src` directory.
 
 Lerna is used to publish the packages and to run commands in multiple packages.
 
-
 ## Dependencies
+
 All dependencies of a library are defined as peerDependencies (except tslib)
+
 ### root dependencies + libs peerDependencies
+
 When adding a peerDependency it must also be added to the root package.json as 'normal' dependency.
 
 ## Versioning
+
 When opening a PR lerna publishes a new prerelease version with the preId `-prXX.{COUNT}`.
 By creating this version lerna creates a commit with the updated versions in the package.json. It does not update the PeerDependencies versions.
 
 After merging the PR back to the master a new release is published with the graduated version (eg. `1.0.1-pr55.7` -> `1.0.1`).
 
 ### Hint
+
 If it happens that you already have another commit locally, before updating the branch with this `build(release):..` commit:
+
 > use `rebase` instead of `merge`
 
 ## Add new library
+
 1. run `ng generate library my-lib`
 2. change `libs/my-lib/package.json#name` to `@shiftcode/ngx-my-lib`
 3. alter `libs/my-lib/ng-package.json#dest` to `./dist`
 4. add `"assets": [ "LICENSE", "CHANGELOG.md" ],` to `libs/my-lib/ng-package.json`
 5. alter `tsconfig.json#compilerOptions.paths` `my-lib` entry to `@shifcode/ng-my-lib` and edit paths according to #3
 6. update tsconfig files like other libs
 7. change from karma config to jest:
-  1. remove `libs/my-lib/src/test.ts`
-  2. remove `libs/my-lib/karam-config.js`
-  3. in `angular.json` replace the libs test architect to `"test": { "builder": "@angular-builders/jest:run" }`
-
+8. remove `libs/my-lib/src/test.ts`
+9. remove `libs/my-lib/karam-config.js`
+10. in `angular.json` replace the libs test architect to `"test": { "builder": "@angular-builders/jest:run" }`

README.md

@@ -23,7 +23,7 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder":"@angular-devkit/build-angular:jest",
+          "builder": "@angular-devkit/build-angular:jest",
           "options": {
             "tsConfig": "tsconfig.spec.json",
             "polyfills": ["zone.js", "zone.js/testing"]
@@ -74,16 +74,9 @@
             "index": "apps/styleguide/src/index.html",
             "tsConfig": "apps/styleguide/tsconfig.app.json",
             "inlineStyleLanguage": "scss",
-            "polyfills": [
-              "zone.js"
-            ],
-            "assets": [
-              "apps/styleguide/src/favicon.ico",
-              "apps/styleguide/src/assets"
-            ],
-            "styles": [
-              "apps/styleguide/src/styles.scss"
-            ],
+            "polyfills": ["zone.js"],
+            "assets": ["apps/styleguide/src/favicon.ico", "apps/styleguide/src/assets"],
+            "styles": ["apps/styleguide/src/styles.scss"],
             "scripts": [],
             "browser": "apps/styleguide/src/main.ts"
           },

angular.json

@@ -1,8 +1,4 @@
-"*.{ts,html}":
-  - npm run prettier:staged
+'{src,test}/**/*.{ts,html}':
   - npm run lint:staged
-src/**/*.scss:
-  - npm run prettier:staged
-# sort package.json keys
 ./package.json:
   - sort-package-json

apps/styleguide/.eslintrc.cjs

@@ -0,0 +1,33 @@
+// eslint-disable-next-line import/no-internal-modules
+import { defineScAngularConfig } from '@shiftcode/eslint-config-recommended/angular'
+
+export default defineScAngularConfig(
+  {
+    languageOptions: {
+      parserOptions: {
+        project: ['./tsconfig.lint.json'],
+      },
+    },
+  },
+  {
+    files: ['**/*.ts'],
+    rules: {
+      'import/no-extraneous-dependencies': ['error', { packageDir: '../..' }],
+
+      '@angular-eslint/component-selector': ['error', { type: 'element', prefix: 'sg', style: 'kebab-case' }],
+      '@angular-eslint/directive-selector': ['error', { type: 'attribute', prefix: 'sg', style: 'camelCase' }],
+      '@angular-eslint/no-pipe-impure': 'error',
+      '@angular-eslint/prefer-inject': 'error',
+      '@angular-eslint/prefer-signals': 'error',
+      '@angular-eslint/prefer-output-emitter-ref': 'error',
+      '@angular-eslint/prefer-output-readonly': 'error',
+      '@angular-eslint/use-component-selector': 'error',
+    },
+  },
+  {
+    files: ['**/*.{js,mjs,cjs}'],
+    rules: {
+      'no-undef': 'off',
+    },
+  },
+)