Merge branch 'development' into patch-1

valor-software · Jul 4, 2024 · dbb2bfe · dbb2bfe
2 parents 657d70c + b1b1f54
commit dbb2bfe
Show file tree

Hide file tree

Showing 89 changed files with 8,418 additions and 7,292 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,20 +1,12 @@
 {
   "root": true,
-  "ignorePatterns": [
-    "**/*"
-  ],
-  "plugins": [
-    "@nx"
-  ],
+  "ignorePatterns": ["**/*"],
+  "plugins": ["@nx"],
   "rules": {},
   "overrides": [
     {
-      "files": [
-        "*.ts",
-        "*.tsx",
-        "*.js",
-        "*.jsx"
-      ],
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "excludedFiles": ["*.spec.ts"],
       "rules": {
         "@nx/enforce-module-boundaries": [
           "error",
@@ -24,42 +16,33 @@
             "depConstraints": [
               {
                 "sourceTag": "*",
-                "onlyDependOnLibsWithTags": [
-                  "*"
-                ]
+                "onlyDependOnLibsWithTags": ["*"]
               }
             ]
           }
         ]
       }
     },
     {
-      "files": [
-        "*.ts",
-        "*.tsx"
-      ],
-      "extends": [
-        "plugin:@nx/typescript"
-      ],
+      "files": ["*.ts", "*.tsx"],
+      "extends": ["plugin:@nx/typescript"],
       "parserOptions": {
         "project": "./tsconfig.*?.json"
       },
       "rules": {
         "semi": "off",
-        "@typescript-eslint/semi": [
-          "error"
-        ]
+        "@typescript-eslint/semi": ["error"],
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {
-      "files": [
-        "*.js",
-        "*.jsx"
-      ],
-      "extends": [
-        "plugin:@nx/javascript"
-      ],
-      "rules": {}
+      "files": ["*.js", "*.jsx"],
+      "extends": ["plugin:@nx/javascript"],
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     }
   ]
 }
diff --git a/.github/workflows/on-gh-release.yml b/.github/workflows/on-gh-release.yml
@@ -0,0 +1,38 @@
+name: on-gh-release
+on:
+  release:
+    types: [released]
+    branches:
+      - development
+
+env:
+  NX_BRANCH: ${{ github.event.number }}
+  NX_RUN_GROUP: ${{ github.run_id }}
+  NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
+  MOZ_HEADLESS: 1
+  CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  # one run
+  one_run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ secrets.GITHUB_TOKEN }}
+
+  # update npm tags
+  npm_tag_update:
+    runs-on: ubuntu-latest
+    needs: one_run
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+      - name: get-npm-version
+        id: package-version
+        uses: martinbeentjes/[email protected]
+      - run: |
+          npm config set registry https://registry.npmjs.org/
+          npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
+          npm dist-tag add ngx-bootstrap@${{ steps.package-version.outputs.current-version}} latest
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 
 # dependencies
 /node_modules
+src/root/node_modules
 
 # IDEs and editors
 /.idea

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 
 
+## [18.0.0](https://github.com/valor-software/ngx-bootstrap/compare/v11.0.2...v18.0.0) (2024-07-1)
+* Migration to Angular 18
+* Synced major version of the lib with major version of Angular
+
+
 ## [11.0.2](https://github.com/valor-software/ngx-bootstrap/compare/v11.0.1...v11.0.2) (2023-07-13)
 
 
@@ -2513,4 +2518,4 @@
 
 * **build:** works good with [email protected] ([31c513b](https://github.com/valor-software/ngx-bootstrap/commit/31c513b4f4f084ae0eabe82b2d8bec028bb48572))
 * **ng 2.0.37:** ts errors fixed ([1e19f55](https://github.com/valor-software/ngx-bootstrap/commit/1e19f555da161f1f572ed6747eb6d72796060ed8))
-* **typeahead:** ts style fixes ([3eab1e4](https://github.com/valor-software/ngx-bootstrap/commit/3eab1e428ebe3ce2ddf1013d48693bc38e23c150))
+* **typeahead:** ts style fixes ([3eab1e4](https://github.com/valor-software/ngx-bootstrap/commit/3eab1e428ebe3ce2ddf1013d48693bc38e23c150))
diff --git a/README.md b/README.md
@@ -178,7 +178,8 @@ The only two dependencies are [Angular](https://angular.io) and [Bootstrap](http
 Here is the version compatibility list:
 
 | ngx-bootstrap | Angular         | Bootstrap CSS           |
-| ------------- | --------------- | ----------------------- |
+|---------------| --------------- | ----------------------- |
+| 18.x.x        | 18.x.x          | 5.x.x or 4.x.x          |
 | 12.x.x        | 17.x.x          | 5.x.x or 4.x.x          |
 | 11.x.x        | 16.x.x          | 5.x.x or 4.x.x          |
 | 10.x.x        | 15.x.x          | 5.x.x or 4.x.x          |

diff --git a/apps/ngx-bootstrap-docs-e2e/project.json b/apps/ngx-bootstrap-docs-e2e/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/ngx-bootstrap-docs-e2e/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["ngx-bootstrap-docs"],
   "targets": {
     "e2e": {
       "executor": "@nxkit/playwright:test",
@@ -44,12 +46,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "lintFilePatterns": ["apps/ngx-bootstrap-docs-e2e/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputPath}"]
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["ngx-bootstrap-docs"]
+  }
 }
diff --git a/apps/ngx-bootstrap-docs/.eslintrc.json b/apps/ngx-bootstrap-docs/.eslintrc.json
@@ -3,7 +3,8 @@
     "../../.eslintrc.json"
   ],
   "ignorePatterns": [
-    "!**/*"
+    "!**/*",
+    "**/assets/**"
   ],
   "overrides": [
     {

diff --git a/apps/ngx-bootstrap-docs/project.json b/apps/ngx-bootstrap-docs/project.json
@@ -4,6 +4,7 @@
   "projectType": "application",
   "sourceRoot": "apps/ngx-bootstrap-docs/src",
   "prefix": "ngx-bootstrap-base",
+  "implicitDependencies": ["ngx-bootstrap"],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
@@ -87,11 +88,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["apps/ngx-bootstrap-docs/src/**/*.ts", "apps/ngx-bootstrap-docs/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
-  },
-  "implicitDependencies": ["ngx-bootstrap"]
+  }
 }
diff --git a/apps/ngx-bootstrap-docs/src/app/app.module.ts b/apps/ngx-bootstrap-docs/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
@@ -10,22 +10,17 @@ import { AppComponent } from './app.component';
 import { DOCS_TOKENS, DocsModule, NgApiDoc, SIDEBAR_ROUTES, SidebarRoutesStructure } from '@ngx-bootstrap-doc/docs';
 import { routes } from './app.routing';
 
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserAnimationsModule,
-    DocsModule,
-    HttpClientModule,
-    RouterModule.forRoot(routes, { useHash: environment.useHash }),
-    BsDropdownModule.forRoot()
-  ],
-  providers: [
-    { provide: NgApiDoc, useValue: ngdoc },
-    { provide: DOCS_TOKENS, useValue: routes },
-    { provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure }],
-  bootstrap: [AppComponent]
-})
+@NgModule({ declarations: [
+        AppComponent
+    ],
+    bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
+        DocsModule,
+        RouterModule.forRoot(routes, { useHash: environment.useHash }),
+        BsDropdownModule.forRoot()], providers: [
+        { provide: NgApiDoc, useValue: ngdoc },
+        { provide: DOCS_TOKENS, useValue: routes },
+        { provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure },
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule {
 }
diff --git a/apps/ngx-bootstrap-docs/src/assets/json/current-version.json b/apps/ngx-bootstrap-docs/src/assets/json/current-version.json
@@ -1,3 +1,3 @@
 {
-  "version": "12.0.0"
+  "version": "18.0.0"
 }
diff --git a/libs/common-docs/project.json b/libs/common-docs/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/common-docs/src/**/*.ts", "libs/common-docs/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/common-docs/src/lib/common/add-nav/add-nav.component.ts b/libs/common-docs/src/lib/common/add-nav/add-nav.component.ts
@@ -32,7 +32,7 @@ export class AddNavComponent implements OnChanges, AfterViewChecked, AfterViewIn
   @HostListener('window:scroll')
   onScrollEvent() {
     this.initActiveMenuTab();
-  };
+  }
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   constructor(

diff --git a/libs/common-docs/src/lib/common/discover/discover.component.ts b/libs/common-docs/src/lib/common/discover/discover.component.ts
@@ -6,7 +6,7 @@ interface ICompany {
   description: string;
   link: string;
   scale?: boolean;
-};
+}
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector

diff --git a/libs/common-docs/src/lib/common/documentation/documentation.component.html b/libs/common-docs/src/lib/common/documentation/documentation.component.html
@@ -232,6 +232,16 @@ <h2 id="compatibility">
           </tr>
         </thead>
         <tbody>
+          <tr>
+            <th>13.x.x</th>
+            <th>18.x.x</th>
+            <th>5.x.x or 4.x.x</th>
+          </tr>
+          <tr>
+            <th>12.x.x</th>
+            <th>17.x.x</th>
+            <th>5.x.x or 4.x.x</th>
+          </tr>
           <tr>
             <th>11.x.x</th>
             <th>16.x.x</th>

diff --git a/libs/doc-pages/accordion/project.json b/libs/doc-pages/accordion/project.json
@@ -25,10 +25,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/accordion/src/**/*.ts", "libs/doc-pages/accordion/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/alerts/project.json b/libs/doc-pages/alerts/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/alerts/src/**/*.ts", "libs/doc-pages/alerts/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/buttons/project.json b/libs/doc-pages/buttons/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/buttons/src/**/*.ts", "libs/doc-pages/buttons/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/carousel/project.json b/libs/doc-pages/carousel/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/carousel/src/**/*.ts", "libs/doc-pages/carousel/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/collapse/project.json b/libs/doc-pages/collapse/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/collapse/src/**/*.ts", "libs/doc-pages/collapse/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/datepicker/project.json b/libs/doc-pages/datepicker/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/datepicker/src/**/*.ts", "libs/doc-pages/datepicker/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/dropdown/project.json b/libs/doc-pages/dropdown/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/dropdown/src/**/*.ts", "libs/doc-pages/dropdown/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/libs/doc-pages/modal/project.json b/libs/doc-pages/modal/project.json
@@ -24,10 +24,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["libs/doc-pages/modal/src/**/*.ts", "libs/doc-pages/modal/src/**/*.html"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }