From dd935a7ee8072caec9274a77139240ad68a75625 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Mon, 29 Apr 2024 13:37:56 -0400 Subject: [PATCH 1/3] fix(styling): properly import Vanilla-Calendar CSS and only once - we should have only 1 import and for it to be properly imported in SASS, we need to remove the file externsion when importing - fixes invalid import and missing CSS when tested in Salesforce --- packages/common/src/styles/_variables.scss | 3 +++ packages/common/src/styles/slickgrid-theme-bootstrap.scss | 3 +-- packages/common/src/styles/slickgrid-theme-material.scss | 1 - packages/common/src/styles/slickgrid-theme-salesforce.scss | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/common/src/styles/_variables.scss b/packages/common/src/styles/_variables.scss index 3733a3924..4aa074c98 100644 --- a/packages/common/src/styles/_variables.scss +++ b/packages/common/src/styles/_variables.scss @@ -1,3 +1,6 @@ +// import external lib CSS files (without the .css extension) +@import 'vanilla-calendar-picker/build/vanilla-calendar.min'; + /* * SlickGrid-Universal theming variables, used by all Themes * Lib Website (https://github.com/ghiscoding/slickgrid-universal) diff --git a/packages/common/src/styles/slickgrid-theme-bootstrap.scss b/packages/common/src/styles/slickgrid-theme-bootstrap.scss index 8f5335601..03e24b708 100644 --- a/packages/common/src/styles/slickgrid-theme-bootstrap.scss +++ b/packages/common/src/styles/slickgrid-theme-bootstrap.scss @@ -4,8 +4,7 @@ * @author: Ghislain B. (ghiscoding) */ - /** SlickGrid Bootstrap Theme */ -@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css'; +/** SlickGrid Bootstrap Theme */ @import './slick-grid'; @import './slick-editors'; @import './slick-plugins'; diff --git a/packages/common/src/styles/slickgrid-theme-material.scss b/packages/common/src/styles/slickgrid-theme-material.scss index 6dfebbccc..950b4250a 100644 --- a/packages/common/src/styles/slickgrid-theme-material.scss +++ b/packages/common/src/styles/slickgrid-theme-material.scss @@ -9,7 +9,6 @@ * sames as `slickgrid-theme-material.lite.scss` but includes all external 3rd party lib styling */ -@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css'; @import './roboto-font'; @import './variables-theme-material'; @import './slick-without-bootstrap-min-styling'; diff --git a/packages/common/src/styles/slickgrid-theme-salesforce.scss b/packages/common/src/styles/slickgrid-theme-salesforce.scss index 184434d70..6b3485b3e 100644 --- a/packages/common/src/styles/slickgrid-theme-salesforce.scss +++ b/packages/common/src/styles/slickgrid-theme-salesforce.scss @@ -10,8 +10,6 @@ */ @import './sass-utilities'; -@import 'vanilla-calendar-picker/build/vanilla-calendar.min.css'; - @import './variables-theme-salesforce'; @import './slick-without-bootstrap-min-styling'; @import './slick-grid'; From fe9f8f5a17772ec9f7bf790652862586ea0fa7d0 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Mon, 29 Apr 2024 14:25:40 -0400 Subject: [PATCH 2/3] chore(deps): update Vanilla-Calendar to fix a few SF issues --- .../vite-demo-vanilla-bundle/package.json | 2 +- package.json | 2 +- packages/common/package.json | 2 +- packages/vanilla-bundle/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/vite-demo-vanilla-bundle/package.json b/examples/vite-demo-vanilla-bundle/package.json index bfbe74855..cd7e2096b 100644 --- a/examples/vite-demo-vanilla-bundle/package.json +++ b/examples/vite-demo-vanilla-bundle/package.json @@ -30,7 +30,7 @@ "moment-tiny": "^2.30.3", "multiple-select-vanilla": "^3.1.0", "rxjs": "^7.8.1", - "vanilla-calendar-picker": "^2.11.2", + "vanilla-calendar-picker": "^2.11.3", "whatwg-fetch": "^3.6.20" }, "devDependencies": { diff --git a/package.json b/package.json index 3030b3a9e..2f76a5ab6 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "ts-node": "^10.9.2", "typescript": "^5.4.5", "typescript-eslint": "^7.7.1", - "vanilla-calendar-picker": "^2.11.2", + "vanilla-calendar-picker": "^2.11.3", "whatwg-fetch": "^3.6.20" }, "funding": { diff --git a/packages/common/package.json b/packages/common/package.json index ba164fb25..24ef194ab 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -80,7 +80,7 @@ "multiple-select-vanilla": "^3.1.0", "sortablejs": "^1.15.2", "un-flatten-tree": "^2.0.12", - "vanilla-calendar-picker": "^2.11.2" + "vanilla-calendar-picker": "^2.11.3" }, "devDependencies": { "autoprefixer": "^10.4.19", diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json index 5630ec222..e2e8d15aa 100644 --- a/packages/vanilla-bundle/package.json +++ b/packages/vanilla-bundle/package.json @@ -60,7 +60,7 @@ "@slickgrid-universal/utils": "workspace:~", "dequal": "^2.0.3", "sortablejs": "^1.15.2", - "vanilla-calendar-picker": "^2.11.2", + "vanilla-calendar-picker": "^2.11.3", "whatwg-fetch": "^3.6.20" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ccbed8dee..8a04f99f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -120,8 +120,8 @@ importers: specifier: ^7.7.1 version: 7.7.1(eslint@9.1.1)(typescript@5.4.5) vanilla-calendar-picker: - specifier: ^2.11.2 - version: 2.11.2 + specifier: ^2.11.3 + version: 2.11.3 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -189,8 +189,8 @@ importers: specifier: ^7.8.1 version: 7.8.1 vanilla-calendar-picker: - specifier: ^2.11.2 - version: 2.11.2 + specifier: ^2.11.3 + version: 2.11.3 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -262,8 +262,8 @@ importers: specifier: ^2.0.12 version: 2.0.12 vanilla-calendar-picker: - specifier: ^2.11.2 - version: 2.11.2 + specifier: ^2.11.3 + version: 2.11.3 devDependencies: autoprefixer: specifier: ^10.4.19 @@ -470,8 +470,8 @@ importers: specifier: ^1.15.2 version: 1.15.2 vanilla-calendar-picker: - specifier: ^2.11.2 - version: 2.11.2 + specifier: ^2.11.3 + version: 2.11.3 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -9165,8 +9165,8 @@ packages: builtins: 5.0.1 dev: true - /vanilla-calendar-picker@2.11.2: - resolution: {integrity: sha512-ZAlQEqcuTPVj9+vHCzaMRqVY63d4mBeyyvG3rNvzD2FatbOipiz0K4oiRYwJJgURJOeWZeDPDSieJ+vPlN4crQ==} + /vanilla-calendar-picker@2.11.3: + resolution: {integrity: sha512-UwhZWk2xotPWA5Is5bu6lPhEjm5h6XHpWKBRVdpzBYWErpmibCgAL6v4Bn90eX+FxluG1U18x5yNDlLDg99p1w==} /verror@1.10.0: resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} From 4c99671936e14966761b3da5e5763808d08d9d6f Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Mon, 29 Apr 2024 14:37:54 -0400 Subject: [PATCH 3/3] chore(deps): update Vanilla-Calendar to fix a few SF issues --- .../vite-demo-vanilla-bundle/package.json | 2 +- package.json | 2 +- packages/common/package.json | 2 +- packages/vanilla-bundle/package.json | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/vite-demo-vanilla-bundle/package.json b/examples/vite-demo-vanilla-bundle/package.json index cd7e2096b..698e4fd9b 100644 --- a/examples/vite-demo-vanilla-bundle/package.json +++ b/examples/vite-demo-vanilla-bundle/package.json @@ -30,7 +30,7 @@ "moment-tiny": "^2.30.3", "multiple-select-vanilla": "^3.1.0", "rxjs": "^7.8.1", - "vanilla-calendar-picker": "^2.11.3", + "vanilla-calendar-picker": "^2.11.4", "whatwg-fetch": "^3.6.20" }, "devDependencies": { diff --git a/package.json b/package.json index 2f76a5ab6..a60995caa 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "ts-node": "^10.9.2", "typescript": "^5.4.5", "typescript-eslint": "^7.7.1", - "vanilla-calendar-picker": "^2.11.3", + "vanilla-calendar-picker": "^2.11.4", "whatwg-fetch": "^3.6.20" }, "funding": { diff --git a/packages/common/package.json b/packages/common/package.json index 24ef194ab..5affdb306 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -80,7 +80,7 @@ "multiple-select-vanilla": "^3.1.0", "sortablejs": "^1.15.2", "un-flatten-tree": "^2.0.12", - "vanilla-calendar-picker": "^2.11.3" + "vanilla-calendar-picker": "^2.11.4" }, "devDependencies": { "autoprefixer": "^10.4.19", diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json index e2e8d15aa..956473118 100644 --- a/packages/vanilla-bundle/package.json +++ b/packages/vanilla-bundle/package.json @@ -60,7 +60,7 @@ "@slickgrid-universal/utils": "workspace:~", "dequal": "^2.0.3", "sortablejs": "^1.15.2", - "vanilla-calendar-picker": "^2.11.3", + "vanilla-calendar-picker": "^2.11.4", "whatwg-fetch": "^3.6.20" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a04f99f4..0448a8c8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -120,8 +120,8 @@ importers: specifier: ^7.7.1 version: 7.7.1(eslint@9.1.1)(typescript@5.4.5) vanilla-calendar-picker: - specifier: ^2.11.3 - version: 2.11.3 + specifier: ^2.11.4 + version: 2.11.4 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -189,8 +189,8 @@ importers: specifier: ^7.8.1 version: 7.8.1 vanilla-calendar-picker: - specifier: ^2.11.3 - version: 2.11.3 + specifier: ^2.11.4 + version: 2.11.4 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -262,8 +262,8 @@ importers: specifier: ^2.0.12 version: 2.0.12 vanilla-calendar-picker: - specifier: ^2.11.3 - version: 2.11.3 + specifier: ^2.11.4 + version: 2.11.4 devDependencies: autoprefixer: specifier: ^10.4.19 @@ -470,8 +470,8 @@ importers: specifier: ^1.15.2 version: 1.15.2 vanilla-calendar-picker: - specifier: ^2.11.3 - version: 2.11.3 + specifier: ^2.11.4 + version: 2.11.4 whatwg-fetch: specifier: ^3.6.20 version: 3.6.20 @@ -9165,8 +9165,8 @@ packages: builtins: 5.0.1 dev: true - /vanilla-calendar-picker@2.11.3: - resolution: {integrity: sha512-UwhZWk2xotPWA5Is5bu6lPhEjm5h6XHpWKBRVdpzBYWErpmibCgAL6v4Bn90eX+FxluG1U18x5yNDlLDg99p1w==} + /vanilla-calendar-picker@2.11.4: + resolution: {integrity: sha512-0FJixXnw7qIf1Uvr6FbhJP4OP+hnLPjuhVRj05Uy98Or5UiXTiLoGEolNH5BvEG/bOdyPIkGohOMIrizSthDnA==} /verror@1.10.0: resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}