From 8bfbfa568f7eeac718438885c3003ea1c1d6f563 Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Mon, 20 Dec 2021 16:19:23 +0200 Subject: [PATCH] fix(build): change build folder structure in order to work properly with nx 13 --- .github/workflows/on-push-or-pull.yml | 4 +- .github/workflows/on-release.yml | 8 +-- angular.json | 63 ++++++++++--------- .../src/assets/css/style.scss | 2 +- .../schematics/schematics.component.html | 2 +- .../src/lib/datepicker-section.list.ts | 2 +- src/accordion/ng-package.json | 2 +- src/alert/ng-package.json | 2 +- src/buttons/ng-package.json | 2 +- src/carousel/ng-package.json | 2 +- src/chronos/ng-package.json | 2 +- src/collapse/ng-package.json | 2 +- src/component-loader/ng-package.json | 2 +- src/datepicker/ng-package.json | 2 +- src/dropdown/ng-package.json | 2 +- src/focus-trap/ng-package.json | 2 +- src/locale/ng-package.json | 2 +- src/mini-ngrx/ng-package.json | 2 +- src/modal/ng-package.json | 2 +- src/pagination/ng-package.json | 2 +- src/popover/ng-package.json | 2 +- src/positioning/ng-package.json | 2 +- src/progressbar/ng-package.json | 2 +- src/rating/ng-package.json | 2 +- src/root/ng-package.json | 2 +- src/schematics/src/ng-add/index.ts | 2 +- src/sortable/ng-package.json | 2 +- src/tabs/ng-package.json | 2 +- src/timepicker/ng-package.json | 2 +- src/tooltip/ng-package.json | 2 +- src/typeahead/ng-package.json | 2 +- src/utils/ng-package.json | 2 +- tsconfig.base.json | 48 +++++++------- 33 files changed, 96 insertions(+), 85 deletions(-) diff --git a/.github/workflows/on-push-or-pull.yml b/.github/workflows/on-push-or-pull.yml index e9f485544a..3f693c4500 100644 --- a/.github/workflows/on-push-or-pull.yml +++ b/.github/workflows/on-push-or-pull.yml @@ -20,11 +20,11 @@ env: CACHE_NODE_MODULES_PATH: | ~/.npm node_modules - node_modules/ngx-bootstrap + dist/ngx-bootstrap CACHE_DIST_PATH: | dist - node_modules/ngx-bootstrap + dist/ngx-bootstrap jobs: # one run diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index cc03a86ea6..a40fe92358 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -49,7 +49,7 @@ jobs: with: path: | dist - node_modules/ngx-bootstrap + dist/ngx-bootstrap key: dist-${{ github.run_id }} - run: npx ng build --runner cloud --prod --with-deps @@ -84,7 +84,7 @@ jobs: with: path: | dist - node_modules/ngx-bootstrap + dist/ngx-bootstrap key: dist-${{ github.run_id }} # - run: npm run scully @@ -118,9 +118,9 @@ jobs: with: path: | dist - node_modules/ngx-bootstrap + dist/ngx-bootstrap key: dist-${{ github.run_id }} - uses: JS-DevTools/npm-publish@v1 with: - package: "node_modules/ngx-bootstrap/package.json" + package: "dist/ngx-bootstrap/package.json" token: ${{ secrets.NPM_TOKEN }} diff --git a/angular.json b/angular.json index c588e15179..8f9dc62cd4 100644 --- a/angular.json +++ b/angular.json @@ -28,7 +28,12 @@ "styles": [ "apps/ngx-bootstrap-docs/src/assets/css/style.scss", "apps/ngx-bootstrap-docs/src/assets/css/prettify-angulario.css" - ] + ], + "stylePreprocessorOptions": { + "includePaths": [ + "src/datepicker" + ] + } }, "configurations": { "production": { @@ -140,7 +145,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/accordion" + "dist/ngx-bootstrap/accordion" ], "options": { "tsConfig": "src/accordion/tsconfig.lib.json", @@ -189,7 +194,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/alert" + "dist/ngx-bootstrap/alert" ], "options": { "tsConfig": "src/alert/tsconfig.lib.json", @@ -238,7 +243,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/buttons" + "dist/ngx-bootstrap/buttons" ], "options": { "tsConfig": "src/buttons/tsconfig.lib.json", @@ -280,7 +285,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/carousel" + "dist/ngx-bootstrap/carousel" ], "options": { "tsConfig": "src/carousel/tsconfig.lib.json", @@ -329,7 +334,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/chronos" + "dist/ngx-bootstrap/chronos" ], "options": { "tsConfig": "src/chronos/tsconfig.lib.json", @@ -371,7 +376,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/collapse" + "dist/ngx-bootstrap/collapse" ], "options": { "tsConfig": "src/collapse/tsconfig.lib.json", @@ -413,7 +418,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/component-loader" + "dist/ngx-bootstrap/component-loader" ], "options": { "tsConfig": "src/component-loader/tsconfig.lib.json", @@ -462,7 +467,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/datepicker" + "dist/ngx-bootstrap/datepicker" ], "options": { "tsConfig": "src/datepicker/tsconfig.lib.json", @@ -511,7 +516,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/dropdown" + "dist/ngx-bootstrap/dropdown" ], "options": { "tsConfig": "src/dropdown/tsconfig.lib.json", @@ -560,7 +565,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/focus-trap" + "dist/ngx-bootstrap/focus-trap" ], "options": { "tsConfig": "src/focus-trap/tsconfig.lib.json", @@ -602,7 +607,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/locale" + "dist/ngx-bootstrap/locale" ], "options": { "tsConfig": "src/locale/tsconfig.lib.json", @@ -651,7 +656,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/mini-ngrx" + "dist/ngx-bootstrap/mini-ngrx" ], "options": { "tsConfig": "src/mini-ngrx/tsconfig.lib.json", @@ -693,7 +698,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/modal" + "dist/ngx-bootstrap/modal" ], "options": { "tsConfig": "src/modal/tsconfig.lib.json", @@ -742,7 +747,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/pagination" + "dist/ngx-bootstrap/pagination" ], "options": { "tsConfig": "src/pagination/tsconfig.lib.json", @@ -784,7 +789,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/popover" + "dist/ngx-bootstrap/popover" ], "options": { "tsConfig": "src/popover/tsconfig.lib.json", @@ -833,7 +838,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/positioning" + "dist/ngx-bootstrap/positioning" ], "options": { "tsConfig": "src/positioning/tsconfig.lib.json", @@ -882,7 +887,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/progressbar" + "dist/ngx-bootstrap/progressbar" ], "options": { "tsConfig": "src/progressbar/tsconfig.lib.json", @@ -931,7 +936,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/rating" + "dist/ngx-bootstrap/rating" ], "options": { "tsConfig": "src/rating/tsconfig.lib.json", @@ -973,7 +978,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/sortable" + "dist/ngx-bootstrap/sortable" ], "options": { "tsConfig": "src/sortable/tsconfig.lib.json", @@ -1015,7 +1020,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/tabs" + "dist/ngx-bootstrap/tabs" ], "options": { "tsConfig": "src/tabs/tsconfig.lib.json", @@ -1057,7 +1062,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/timepicker" + "dist/ngx-bootstrap/timepicker" ], "options": { "tsConfig": "src/timepicker/tsconfig.lib.json", @@ -1106,7 +1111,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/tooltip" + "dist/ngx-bootstrap/tooltip" ], "options": { "tsConfig": "src/tooltip/tsconfig.lib.json", @@ -1155,7 +1160,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/typeahead" + "dist/ngx-bootstrap/typeahead" ], "options": { "tsConfig": "src/typeahead/tsconfig.lib.json", @@ -1204,7 +1209,7 @@ "build": { "builder": "@nrwl/angular:package", "outputs": [ - "node_modules/ngx-bootstrap/utils" + "dist/ngx-bootstrap/utils" ], "options": { "tsConfig": "src/utils/tsconfig.lib.json", @@ -1246,7 +1251,7 @@ "build": { "builder": "@nrwl/workspace:run-commands", "outputs": [ - "node_modules/ngx-bootstrap" + "dist/ngx-bootstrap" ], "options": { "commands": [ @@ -1290,7 +1295,7 @@ "builder": "@nrwl/workspace:run-commands", "outputs": [], "options": { - "command": "npx sass src:node_modules/ngx-bootstrap --source-map" + "command": "npx sass src:dist/ngx-bootstrap --source-map" } }, "docs": { @@ -1367,7 +1372,7 @@ "{options.outputPath}" ], "options": { - "outputPath": "node_modules/ngx-bootstrap/schematics", + "outputPath": "dist/ngx-bootstrap/schematics", "tsConfig": "src/schematics/tsconfig.lib.json", "packageJson": "src/schematics/package.json", "main": "src/schematics/src/ng-add/index.ts", @@ -1389,7 +1394,7 @@ "build": { "builder": "@nrwl/angular:ng-packagr-lite", "outputs": [ - "node_modules/ngx-bootstrap/accordion" + "dist/ngx-bootstrap/accordion" ], "options": { "tsConfig": "libs/doc-pages/accordion/tsconfig.lib.json", diff --git a/apps/ngx-bootstrap-docs/src/assets/css/style.scss b/apps/ngx-bootstrap-docs/src/assets/css/style.scss index c8466d153e..6039c40562 100644 --- a/apps/ngx-bootstrap-docs/src/assets/css/style.scss +++ b/apps/ngx-bootstrap-docs/src/assets/css/style.scss @@ -1,5 +1,5 @@ @import "sidebar"; -@import "~ngx-bootstrap/datepicker/bs-datepicker"; +@import "bs-datepicker"; /* HEADER */ diff --git a/libs/common-docs/src/lib/common/schematics/schematics.component.html b/libs/common-docs/src/lib/common/schematics/schematics.component.html index 9dc83cfa94..f0649bc87d 100644 --- a/libs/common-docs/src/lib/common/schematics/schematics.component.html +++ b/libs/common-docs/src/lib/common/schematics/schematics.component.html @@ -51,7 +51,7 @@ 

 "styles": [
     "./node_modules/bootstrap/dist/css/bootstrap.min.css",
-    "./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
+    "./dist/ngx-bootstrap/datepicker/bs-datepicker.css",
       …
 ]
diff --git a/libs/doc-pages/datepicker/src/lib/datepicker-section.list.ts b/libs/doc-pages/datepicker/src/lib/datepicker-section.list.ts index b0e82849d4..3497082e57 100644 --- a/libs/doc-pages/datepicker/src/lib/datepicker-section.list.ts +++ b/libs/doc-pages/datepicker/src/lib/datepicker-section.list.ts @@ -73,7 +73,7 @@ export const demoComponentContent: ContentSection[] = [
  • Load it from CDN. Add <link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css"> to your index.html
    • -
  • Load it from node_modules/ngx-bootstrap/datepicker/bs-datepicker.css via package bundler +
  • Load it from dist/ngx-bootstrap/datepicker/bs-datepicker.css via package bundler like Angular CLI, if you're using one.
    • diff --git a/src/accordion/ng-package.json b/src/accordion/ng-package.json index d6fa5831a2..1a930b7e12 100644 --- a/src/accordion/ng-package.json +++ b/src/accordion/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/accordion", + "dest": "../../dist/ngx-bootstrap/accordion", "lib": { "entryFile": "index.ts" } diff --git a/src/alert/ng-package.json b/src/alert/ng-package.json index 56eeef6483..f06147fcfe 100644 --- a/src/alert/ng-package.json +++ b/src/alert/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/alert", + "dest": "../../dist/ngx-bootstrap/alert", "lib": { "entryFile": "index.ts" } diff --git a/src/buttons/ng-package.json b/src/buttons/ng-package.json index 5cc4a6205a..06307955a5 100644 --- a/src/buttons/ng-package.json +++ b/src/buttons/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/buttons", + "dest": "../../dist/ngx-bootstrap/buttons", "lib": { "entryFile": "index.ts" } diff --git a/src/carousel/ng-package.json b/src/carousel/ng-package.json index c1b9f8a5c9..f1c8b60a58 100644 --- a/src/carousel/ng-package.json +++ b/src/carousel/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/carousel", + "dest": "../../dist/ngx-bootstrap/carousel", "lib": { "entryFile": "index.ts" } diff --git a/src/chronos/ng-package.json b/src/chronos/ng-package.json index f8839a3669..e2be9fb4c6 100644 --- a/src/chronos/ng-package.json +++ b/src/chronos/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/chronos", + "dest": "../../dist/ngx-bootstrap/chronos", "lib": { "entryFile": "index.ts" } diff --git a/src/collapse/ng-package.json b/src/collapse/ng-package.json index 20f28f5f76..924bb0c769 100644 --- a/src/collapse/ng-package.json +++ b/src/collapse/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/collapse", + "dest": "../../dist/ngx-bootstrap/collapse", "lib": { "entryFile": "index.ts" } diff --git a/src/component-loader/ng-package.json b/src/component-loader/ng-package.json index 76e25c8a55..1aaf68ad6e 100644 --- a/src/component-loader/ng-package.json +++ b/src/component-loader/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/component-loader", + "dest": "../../dist/ngx-bootstrap/component-loader", "lib": { "entryFile": "index.ts" } diff --git a/src/datepicker/ng-package.json b/src/datepicker/ng-package.json index 27514688c6..f562b29b25 100644 --- a/src/datepicker/ng-package.json +++ b/src/datepicker/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/datepicker", + "dest": "../../dist/ngx-bootstrap/datepicker", "lib": { "entryFile": "index.ts" }, diff --git a/src/dropdown/ng-package.json b/src/dropdown/ng-package.json index f3ed422af3..8e6a64f27a 100644 --- a/src/dropdown/ng-package.json +++ b/src/dropdown/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/dropdown", + "dest": "../../dist/ngx-bootstrap/dropdown", "lib": { "entryFile": "index.ts" } diff --git a/src/focus-trap/ng-package.json b/src/focus-trap/ng-package.json index b733a85da9..5c73fd194e 100644 --- a/src/focus-trap/ng-package.json +++ b/src/focus-trap/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/focus-trap", + "dest": "../../dist/ngx-bootstrap/focus-trap", "lib": { "entryFile": "index.ts" } diff --git a/src/locale/ng-package.json b/src/locale/ng-package.json index 7321514819..394b3bd054 100644 --- a/src/locale/ng-package.json +++ b/src/locale/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/locale", + "dest": "../../dist/ngx-bootstrap/locale", "lib": { "entryFile": "index.ts" } diff --git a/src/mini-ngrx/ng-package.json b/src/mini-ngrx/ng-package.json index dbae9d0980..75e77b0062 100644 --- a/src/mini-ngrx/ng-package.json +++ b/src/mini-ngrx/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/mini-ngrx", + "dest": "../../dist/ngx-bootstrap/mini-ngrx", "lib": { "entryFile": "index.ts" } diff --git a/src/modal/ng-package.json b/src/modal/ng-package.json index 0a22aca449..238c11a7fb 100644 --- a/src/modal/ng-package.json +++ b/src/modal/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/modal", + "dest": "../../dist/ngx-bootstrap/modal", "lib": { "entryFile": "index.ts" } diff --git a/src/pagination/ng-package.json b/src/pagination/ng-package.json index 8528591fee..1059c5fd33 100644 --- a/src/pagination/ng-package.json +++ b/src/pagination/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/pagination", + "dest": "../../dist/ngx-bootstrap/pagination", "lib": { "entryFile": "index.ts" } diff --git a/src/popover/ng-package.json b/src/popover/ng-package.json index 75b5beac58..8b0de146da 100644 --- a/src/popover/ng-package.json +++ b/src/popover/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/popover", + "dest": "../../dist/ngx-bootstrap/popover", "lib": { "entryFile": "index.ts" } diff --git a/src/positioning/ng-package.json b/src/positioning/ng-package.json index a0fd52742c..e9cacd77b6 100644 --- a/src/positioning/ng-package.json +++ b/src/positioning/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/positioning", + "dest": "../../dist/ngx-bootstrap/positioning", "lib": { "entryFile": "index.ts" } diff --git a/src/progressbar/ng-package.json b/src/progressbar/ng-package.json index 6ea681b984..bf57ef86fd 100644 --- a/src/progressbar/ng-package.json +++ b/src/progressbar/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/progressbar", + "dest": "../../dist/ngx-bootstrap/progressbar", "lib": { "entryFile": "index.ts" } diff --git a/src/rating/ng-package.json b/src/rating/ng-package.json index 78ae71238c..da33314d4a 100644 --- a/src/rating/ng-package.json +++ b/src/rating/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/rating", + "dest": "../../dist/ngx-bootstrap/rating", "lib": { "entryFile": "index.ts" } diff --git a/src/root/ng-package.json b/src/root/ng-package.json index 82433f0c5e..8f1e5384f9 100644 --- a/src/root/ng-package.json +++ b/src/root/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap", + "dest": "../../dist/ngx-bootstrap", "deleteDestPath": false, "lib": { "entryFile": "index.ts" diff --git a/src/schematics/src/ng-add/index.ts b/src/schematics/src/ng-add/index.ts index 9948ffaeb9..151cf8b358 100644 --- a/src/schematics/src/ng-add/index.ts +++ b/src/schematics/src/ng-add/index.ts @@ -27,7 +27,7 @@ const BOOTSTRAP_AVAILABLE_STYLES = { `] }; const DATEPICKER_AVAILABLESTYLES = { - 'css': [`./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css`], + 'css': [`./dist/ngx-bootstrap/datepicker/bs-datepicker.css`], 'scss': [` /* Importing Datepicker SCSS file. */ @import "~ngx-bootstrap/datepicker/bs-datepicker"; diff --git a/src/sortable/ng-package.json b/src/sortable/ng-package.json index 988c72ed34..e12af17a06 100644 --- a/src/sortable/ng-package.json +++ b/src/sortable/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/sortable", + "dest": "../../dist/ngx-bootstrap/sortable", "lib": { "entryFile": "index.ts" } diff --git a/src/tabs/ng-package.json b/src/tabs/ng-package.json index 79652fbcd0..206c6fed84 100644 --- a/src/tabs/ng-package.json +++ b/src/tabs/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/tabs", + "dest": "../../dist/ngx-bootstrap/tabs", "lib": { "entryFile": "index.ts" } diff --git a/src/timepicker/ng-package.json b/src/timepicker/ng-package.json index ef8fc65bbe..b7af16db32 100644 --- a/src/timepicker/ng-package.json +++ b/src/timepicker/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/timepicker", + "dest": "../../dist/ngx-bootstrap/timepicker", "lib": { "entryFile": "index.ts" } diff --git a/src/tooltip/ng-package.json b/src/tooltip/ng-package.json index a776931ec8..1319e5311d 100644 --- a/src/tooltip/ng-package.json +++ b/src/tooltip/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/tooltip", + "dest": "../../dist/ngx-bootstrap/tooltip", "lib": { "entryFile": "index.ts" } diff --git a/src/typeahead/ng-package.json b/src/typeahead/ng-package.json index b8c38d52ef..4d0e7609e2 100644 --- a/src/typeahead/ng-package.json +++ b/src/typeahead/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/typeahead", + "dest": "../../dist/ngx-bootstrap/typeahead", "lib": { "entryFile": "index.ts" } diff --git a/src/utils/ng-package.json b/src/utils/ng-package.json index 934d02ed94..8cf0a9dcfa 100644 --- a/src/utils/ng-package.json +++ b/src/utils/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../node_modules/ngx-bootstrap/utils", + "dest": "../../dist/ngx-bootstrap/utils", "lib": { "entryFile": "index.ts" } diff --git a/tsconfig.base.json b/tsconfig.base.json index 1d78f1f8fe..bd95858571 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,11 +3,11 @@ "compilerOptions": { "rootDir": ".", "sourceMap": true, - "strict": true, + "strict": false, + "noImplicitReturns": false, + "noFallthroughCasesInSwitch": false, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, "declaration": false, "moduleResolution": "node", "emitDecoratorMetadata": true, @@ -77,24 +77,30 @@ "@ngx-bootstrap-doc/typeahead": [ "libs/doc-pages/typeahead/src/index.ts" ], - "ngx-bootstrap/progressbar": [ - "src/progressbar/index.ts" - ], - "ngx-bootstrap/utils": [ - "src/utils/index.ts" - ], - "ngx-bootstrap/datepicker": [ - "src/datepicker/index.ts" - ], - "ngx-bootstrap/modal": [ - "src/modal/index.ts" - ], - "ngx-bootstrap/typeahead": [ - "src/typeahead/index.ts" - ], - "ngx-bootstrap/dropdown": [ - "src/dropdown/index.ts" - ] + "ngx-bootstrap/accordion": ["src/accordion/index.ts"], + "ngx-bootstrap/alert": ["src/alert/index.ts"], + "ngx-bootstrap/buttons": ["src/buttons/index.ts"], + "ngx-bootstrap/carousel": ["src/carousel/index.ts"], + "ngx-bootstrap/chronos": ["src/chronos/index.ts"], + "ngx-bootstrap/collapse": ["src/collapse/index.ts"], + "ngx-bootstrap/component-loader": ["src/component-loader/index.ts"], + "ngx-bootstrap/datepicker": ["src/datepicker/index.ts"], + "ngx-bootstrap/dropdown": ["src/dropdown/index.ts"], + "ngx-bootstrap/focus-trap": ["src/focus-trap/index.ts"], + "ngx-bootstrap/locale": ["src/locale/index.ts"], + "ngx-bootstrap/mini-ngrx": ["src/mini-ngrx/index.ts"], + "ngx-bootstrap/modal": ["src/modal/index.ts"], + "ngx-bootstrap/pagination": ["src/pagination/index.ts"], + "ngx-bootstrap/popover": ["src/popover/index.ts"], + "ngx-bootstrap/positioning": ["src/positioning/index.ts"], + "ngx-bootstrap/progressbar": ["src/progressbar/index.ts"], + "ngx-bootstrap/rating": ["src/rating/index.ts"], + "ngx-bootstrap/sortable": ["src/sortable/index.ts"], + "ngx-bootstrap/tabs": ["src/tabs/index.ts"], + "ngx-bootstrap/timepicker": ["src/timepicker/index.ts"], + "ngx-bootstrap/tooltip": ["src/tooltip/index.ts"], + "ngx-bootstrap/typeahead": ["src/typeahead/index.ts"], + "ngx-bootstrap/utils": ["src/utils/index.ts"] } }, "angularCompilerOptions": {