From 28ba28b681765fe41c90da46d1ce690074175924 Mon Sep 17 00:00:00 2001 From: Adrian Schmidt Date: Wed, 12 Jun 2019 14:22:38 +0200 Subject: [PATCH] fix(flatpickr): switch to @limetech/flatpickr and update to v4.5.5 --- package-lock.json | 10 +++++----- package.json | 2 +- src/components/date-picker/date-picker.scss | 2 +- src/components/date-picker/pickers/DatePicker.ts | 2 +- src/components/date-picker/pickers/DatetimePicker.ts | 2 +- src/components/date-picker/pickers/MonthPicker.tsx | 2 +- src/components/date-picker/pickers/Picker.ts | 4 ++-- src/components/date-picker/pickers/QuarterPicker.tsx | 2 +- src/components/date-picker/pickers/TimePicker.ts | 2 +- src/components/date-picker/pickers/WeekPicker.ts | 4 ++-- src/components/date-picker/pickers/YearPicker.tsx | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index dce59435e4..0987fbad54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2012,6 +2012,11 @@ "@lime-material-16px/feature-targeting": "^0.44.1" } }, + "@limetech/flatpickr": { + "version": "4.5.5", + "resolved": "http://npm.lundalogik.com:4873/@limetech%2fflatpickr/-/flatpickr-4.5.5.tgz", + "integrity": "sha512-b4SP8vFC1Jxx7fvB6MY/HuStU3PfucFt8UMTtfXQ4mD++KE4mwa8oGxfy+EV/SiiKgF4h54EnSPr1zTaBCyw4g==" + }, "@loadable/component": { "version": "5.10.1", "resolved": "http://npm.lundalogik.com:4873/@loadable%2fcomponent/-/component-5.10.1.tgz", @@ -8045,11 +8050,6 @@ "write": "1.0.3" } }, - "flatpickr": { - "version": "4.5.5-lime2", - "resolved": "http://npm.lundalogik.com:4873/flatpickr/-/flatpickr-4.5.5-lime2.tgz", - "integrity": "sha512-4L/z1k4UxqWrGglp1ExFTQFdOT+eqBjnqyzhyLkQQrZee8k+nPOzG0kD+z+NRtRMyUd4V0muAwBpOAIyfWqpTg==" - }, "flatted": { "version": "2.0.0", "resolved": "http://npm.lundalogik.com:4873/flatted/-/flatted-2.0.0.tgz", diff --git a/package.json b/package.json index e7b7acf2c6..90d6b49ac0 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,9 @@ "test:watch": "cross-env-shell SASS_PATH=node_modules \"stencil test --e2e --watch\"" }, "dependencies": { + "@limetech/flatpickr": "^4.5.5", "awesome-debounce-promise": "^2.1.0", "chart.js": "^2.8.0", - "flatpickr": "4.5.5-lime2", "jsx-dom": "^6.3.1", "lime-material-components-web-16px": "1.1.1-chrome.ripple.fix.2", "moment": "^2.24.0" diff --git a/src/components/date-picker/date-picker.scss b/src/components/date-picker/date-picker.scss index cb5d87f157..51a2aece87 100644 --- a/src/components/date-picker/date-picker.scss +++ b/src/components/date-picker/date-picker.scss @@ -1,7 +1,7 @@ @import '../../style/variables'; @import '@lime-material-16px/theme/mdc-theme'; -@import '../../../node_modules/flatpickr/dist/flatpickr.min.css'; +@import '../../../node_modules/@limetech/flatpickr/dist/flatpickr.min.css'; $inactiveTextColor: var(--mdc-theme-text-disabled-on-background, #{$mdc-theme-text-disabled-on-background}); diff --git a/src/components/date-picker/pickers/DatePicker.ts b/src/components/date-picker/pickers/DatePicker.ts index b162882e4f..e79eb138a1 100644 --- a/src/components/date-picker/pickers/DatePicker.ts +++ b/src/components/date-picker/pickers/DatePicker.ts @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { Picker } from './Picker'; export class DatePicker extends Picker { diff --git a/src/components/date-picker/pickers/DatetimePicker.ts b/src/components/date-picker/pickers/DatetimePicker.ts index 36671e39d0..9cabe7357e 100644 --- a/src/components/date-picker/pickers/DatetimePicker.ts +++ b/src/components/date-picker/pickers/DatetimePicker.ts @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { Picker } from './Picker'; export class DatetimePicker extends Picker { diff --git a/src/components/date-picker/pickers/MonthPicker.tsx b/src/components/date-picker/pickers/MonthPicker.tsx index 7c25f8abd8..11e0178f22 100644 --- a/src/components/date-picker/pickers/MonthPicker.tsx +++ b/src/components/date-picker/pickers/MonthPicker.tsx @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { range } from 'lodash-es'; import moment from 'moment/moment'; import { Picker } from './Picker'; diff --git a/src/components/date-picker/pickers/Picker.ts b/src/components/date-picker/pickers/Picker.ts index 6fe8bce593..fb1473a792 100644 --- a/src/components/date-picker/pickers/Picker.ts +++ b/src/components/date-picker/pickers/Picker.ts @@ -1,6 +1,6 @@ +import flatpickr from '@limetech/flatpickr'; +import FlatpickrLanguages from '@limetech/flatpickr/dist/l10n'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; -import FlatpickrLanguages from 'flatpickr/dist/l10n'; import 'moment/locale/da'; import 'moment/locale/fi'; import 'moment/locale/nb'; diff --git a/src/components/date-picker/pickers/QuarterPicker.tsx b/src/components/date-picker/pickers/QuarterPicker.tsx index d38a1d9dea..9529e84c67 100644 --- a/src/components/date-picker/pickers/QuarterPicker.tsx +++ b/src/components/date-picker/pickers/QuarterPicker.tsx @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { range } from 'lodash-es'; import moment from 'moment/moment'; import { Picker } from './Picker'; diff --git a/src/components/date-picker/pickers/TimePicker.ts b/src/components/date-picker/pickers/TimePicker.ts index 2c72546e85..1c83a5745e 100644 --- a/src/components/date-picker/pickers/TimePicker.ts +++ b/src/components/date-picker/pickers/TimePicker.ts @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { Picker } from './Picker'; export class TimePicker extends Picker { diff --git a/src/components/date-picker/pickers/WeekPicker.ts b/src/components/date-picker/pickers/WeekPicker.ts index d6860ced04..2ce1209c90 100644 --- a/src/components/date-picker/pickers/WeekPicker.ts +++ b/src/components/date-picker/pickers/WeekPicker.ts @@ -1,6 +1,6 @@ +import flatpickr from '@limetech/flatpickr'; +import weekSelectPlugin from '@limetech/flatpickr/dist/plugins/weekSelect/weekSelect'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; -import weekSelectPlugin from 'flatpickr/dist/plugins/weekSelect/weekSelect'; import { Picker } from './Picker'; export class WeekPicker extends Picker { diff --git a/src/components/date-picker/pickers/YearPicker.tsx b/src/components/date-picker/pickers/YearPicker.tsx index eec000d185..8ffa5c05fd 100644 --- a/src/components/date-picker/pickers/YearPicker.tsx +++ b/src/components/date-picker/pickers/YearPicker.tsx @@ -1,5 +1,5 @@ +import flatpickr from '@limetech/flatpickr'; import { EventEmitter } from '@stencil/core'; -import flatpickr from 'flatpickr'; import { range } from 'lodash-es'; import moment from 'moment/moment'; import { Picker } from './Picker';