From 68e2a0dc4a4bfa02181204a2c122a5ee535b0486 Mon Sep 17 00:00:00 2001 From: "bhavinpatel@ebay.com" Date: Sun, 11 Oct 2020 01:58:20 -0700 Subject: [PATCH] revert scss-bundle to 3.0.2 --- package-lock.json | 79 ++++--------------- package.json | 8 +- .../ngx-datetime-range-picker/package.json | 8 +- .../src/lib/material/material.base.scss | 2 +- .../ngx-datetime-range-picker.component.scss | 4 +- .../tsconfig.lib.json | 1 - src/app/app.theme.scss | 2 +- 7 files changed, 33 insertions(+), 71 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2536b9..bb6aec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2089,9 +2089,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.161", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", - "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==", + "version": "4.14.162", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz", + "integrity": "sha512-alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==", "dev": true }, "@types/lodash.debounce": { @@ -14033,40 +14033,31 @@ } }, "scss-bundle": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-3.1.2.tgz", - "integrity": "sha512-lvxTwCKDLgzmRWhGwJ834ggtnEhs0G9FxSJRWte+NwlshVvBcQ/kOHHkpAGDpCxIMNGz/Utl0yd/MWyQAOBhqg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-3.0.2.tgz", + "integrity": "sha512-6OUFD+bD1ko/nrcXEGQ58NY/pTAQyj3LBfUyCpDeplcs8m8U7CWAfSuK49BrV5PEUGRXEh3oiETxqeG1vJSvrA==", "dev": true, "requires": { "@types/archy": "^0.0.31", "@types/debug": "^4.1.5", - "@types/fs-extra": "^8.0.1", + "@types/fs-extra": "^8.0.0", "@types/glob": "^7.1.1", "@types/lodash.debounce": "^4.0.6", "@types/sass": "^1.16.0", "archy": "^1.0.0", - "chalk": "^3.0.0", - "chokidar": "^3.3.1", - "commander": "^4.0.1", + "chalk": "^2.4.2", + "chokidar": "^3.0.2", + "commander": "^3.0.0", "fs-extra": "^8.1.0", "globs": "^0.1.4", "lodash.debounce": "^4.0.8", - "loglevel": "^1.6.6", + "loglevel": "^1.6.3", "loglevel-plugin-prefix": "^0.8.4", "pretty-bytes": "^5.3.0", - "sass": "^1.23.7", + "sass": "^1.22.9", "tslib": "^1.10.0" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "anymatch": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", @@ -14092,16 +14083,6 @@ "fill-range": "^7.0.1" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "chokidar": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", @@ -14118,25 +14099,10 @@ "readdirp": "~3.4.0" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", + "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==", "dev": true }, "fill-range": { @@ -14175,12 +14141,6 @@ "is-glob": "^4.0.1" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -14205,15 +14165,6 @@ "picomatch": "^2.2.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index f327ab8..c42023a 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,16 @@ "angular5", "angular6", "angular7", + "angular8", + "angular9", + "angular10", "ng2", "ng4", "ng5", "ng7", + "ng8", + "ng9", + "ng10", "ngx", "boilerplate", "barebone", @@ -124,7 +130,7 @@ "prettier": "^1.15.3", "pretty-quick": "^1.8.0", "protractor": "~7.0.0", - "scss-bundle": "^3.0.1", + "scss-bundle": "3.0.2", "stylelint": "^9.9.0", "ts-node": "~7.0.0", "tslint": "~6.1.0", diff --git a/projects/ngx-datetime-range-picker/package.json b/projects/ngx-datetime-range-picker/package.json index 4c4b1cd..b02c727 100644 --- a/projects/ngx-datetime-range-picker/package.json +++ b/projects/ngx-datetime-range-picker/package.json @@ -1,6 +1,6 @@ { "name": "ngx-datetime-range-picker", - "version": "2.0.3", + "version": "3.0.0", "homepage": "https://github.com/BhavinPatel04/ngx-datetime-range-picker", "bugs": "https://github.com/BhavinPatel04/ngx-datetime-range-picker/issues", "repository": { @@ -18,10 +18,16 @@ "angular5", "angular6", "angular7", + "angular8", + "angular9", + "angular10", "ng2", "ng4", "ng5", "ng7", + "ng8", + "ng9", + "ng10", "ngx", "boilerplate", "barebone", diff --git a/projects/ngx-datetime-range-picker/src/lib/material/material.base.scss b/projects/ngx-datetime-range-picker/src/lib/material/material.base.scss index 16debb9..b82bda9 100644 --- a/projects/ngx-datetime-range-picker/src/lib/material/material.base.scss +++ b/projects/ngx-datetime-range-picker/src/lib/material/material.base.scss @@ -1,4 +1,4 @@ -@import "../../../../../node_modules/@angular/material/theming"; +@import "~@angular/material/theming"; $ndtrp-primary: ( 50: #e6f0fa, diff --git a/projects/ngx-datetime-range-picker/src/lib/ngx-datetime-range-picker.component.scss b/projects/ngx-datetime-range-picker/src/lib/ngx-datetime-range-picker.component.scss index 2ebeffd..873ba35 100644 --- a/projects/ngx-datetime-range-picker/src/lib/ngx-datetime-range-picker.component.scss +++ b/projects/ngx-datetime-range-picker/src/lib/ngx-datetime-range-picker.component.scss @@ -1,6 +1,6 @@ -@import "../../../../node_modules/bootstrap/scss/bootstrap.scss"; +@import "~bootstrap/scss/bootstrap.scss"; $fa-font-path: "~font-awesome/fonts"; -@import "../../../../node_modules/font-awesome/scss/font-awesome.scss"; +@import "~font-awesome/scss/font-awesome.scss"; @mixin ngx-datetime-range-picker-component-theme($theme) { $ndtrp-primary-color-map: map-get($theme, primary); diff --git a/projects/ngx-datetime-range-picker/tsconfig.lib.json b/projects/ngx-datetime-range-picker/tsconfig.lib.json index f311a19..09a00a0 100644 --- a/projects/ngx-datetime-range-picker/tsconfig.lib.json +++ b/projects/ngx-datetime-range-picker/tsconfig.lib.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "baseUrl": "./", "outDir": "../../out-tsc/lib", "target": "es2015", "module": "amd", diff --git a/src/app/app.theme.scss b/src/app/app.theme.scss index 4f31760..3246617 100644 --- a/src/app/app.theme.scss +++ b/src/app/app.theme.scss @@ -1,4 +1,4 @@ -@import "../../node_modules/@angular/material/theming"; +@import "~@angular/material/theming"; $ndtrp-primary: $mat-red;