Merge branch 'development' into feature/fr-ca-integration

apps/ngx-bootstrap-docs/src/assets/json/current-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "18.0.0"
+  "version": "18.0.2"
 }

libs/common-docs/src/lib/common/documentation/documentation.component.html

@@ -112,6 +112,22 @@ <h2 id="installation">
         <a class="anchor-link" routerLink="." fragment="installation">#</a>
       </h2>
       <h4>Angular CLI way</h4>
+      <p>Make sure that your app uses modular approach and you have app.module.ts set as your starting point before you proceed</p>
+      <pre class="prettyprint lang-js prettyprinted">
+<span class="kwd">import</span><span class="pln"> </span><span class="pun">{{'{'}}</span><span class="kwd"> platformBrowser </span><span
+        class="pun">{{'}'}}</span><span class="pln"> from </span><span class="str">'&#64;angular/platform-browser'</span><span
+        class="pun">;</span>
+<span class="kwd">import</span><span class="pln"> </span><span class="pun">{{'{'}}</span><span class="kwd"> AppModule </span><span
+        class="pun">{{'}'}}</span><span class="pln"> from </span><span class="str">'./app.module'</span><span
+class="pun">;</span>
+<span class="pln">&nbsp;</span>
+<span class="pun">platformBrowser().bootstrapModule(AppModule).catch((err) => console.error(err));</span>
+      </pre>
+<!--          // main.ts-->
+<!--          import { platformBrowser } from '&#64;angular/platform-browser';-->
+<!--          import { AppModule } from './app.module';-->
+
+<!--          platformBrowser().bootstrapModule(AppModule).catch((err) => console.error(err));-->
       <p>Use the Angular CLI ng add command for updating your Angular project.</p>
       <pre class="prettyprint lang-bash prettyprinted"><span class="pln">ng add ngx-bootstrap</span></pre>
 
@@ -233,7 +249,7 @@ <h2 id="compatibility">
         </thead>
         <tbody>
           <tr>
-            <th>13.x.x</th>
+            <th>18.x.x</th>
             <th>18.x.x</th>
             <th>5.x.x or 4.x.x</th>
           </tr>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap-base",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "license": "MIT",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "schematics": "./schematics/src/collection.json",

src/accordion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/accordion",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/alert/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/alert",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/buttons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/buttons",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/carousel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/carousel",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/chronos",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/collapse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/collapse",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/component-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/component-loader",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/datepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/datepicker",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/dropdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/dropdown",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/focus-trap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/focus-trap",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/locale/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/locale",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/mini-ngrx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/mini-ngrx",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/modal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/modal",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/pagination/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/pagination",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/popover/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/popover",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/positioning/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/positioning",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/progressbar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/progressbar",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/rating/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/rating",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/root/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "description": "Angular Bootstrap",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT",

src/schematics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "schematics",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "schematics": "./collection.json",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"

src/schematics/src/utils/current_dependency_versions.json

@@ -1,4 +1,4 @@
 {
-  "NGX_BOOTSTRAP_VERSION": "18.0.0",
+  "NGX_BOOTSTRAP_VERSION": "18.0.2",
   "BOOTSTRAP_VERSION": "^5.2.3"
 }

src/schematics/src/utils/index.ts

@@ -92,6 +92,10 @@ export function addModuleImportToRootModule(
   if (!moduleSource) {
     throw new SchematicsException(`Module not found: ${modulePath}`);
   }
+  if (modulePath.includes('component')) {
+    throw new SchematicsException(`ngx-bootstrap doesn't support moduleless approach if we couldn't find
+    your starting *.module.ts learn more here https://valor-software.com/ngx-bootstrap/#/documentation#installation`);
+  }
 
   const changes: Change[] = addImportToModule(moduleSource, modulePath, moduleName, src);
   const recorder = host.beginUpdate(modulePath);

src/schematics/src/utils/project-main-file.ts

@@ -13,10 +13,10 @@ import { workspaces } from '@angular-devkit/core';
 /** Looks for the main TypeScript file in the given project and returns its path. */
 export function getProjectMainFile(project: workspaces.ProjectDefinition): string {
   const buildOptions = getProjectTargetOptions(project, 'build');
-  if (!buildOptions.main) {
+  if (!buildOptions.main && !buildOptions.browser) {
     throw new SchematicsException(`Could not find the project main file inside of the ` +
       `workspace config (${project.sourceRoot})`);
   }
 
-  return buildOptions.main.toString();
+  return buildOptions.main?.toString() ?? buildOptions.browser.toString();
 }

src/sortable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/sortable",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/tabs",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/timepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/timepicker",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/tooltip/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/tooltip",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/typeahead/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/typeahead",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }

src/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/utils",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }