Skip to content

Commit

Permalink
fix(flatpickr): switch to @limetech/flatpickr and update to v4.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschmidt committed Sep 10, 2019
1 parent 1a757b1 commit 28ba28b
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/date-picker.scss
Original file line number Diff line number Diff line change
@@ -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});

Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/DatePicker.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/DatetimePicker.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/MonthPicker.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/components/date-picker/pickers/Picker.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/QuarterPicker.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/TimePicker.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/components/date-picker/pickers/WeekPicker.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/date-picker/pickers/YearPicker.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down

0 comments on commit 28ba28b

Please sign in to comment.