Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unvendor react datepicker #276

Merged
merged 3 commits into from
Mar 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ SHELL = /bin/bash

BABEL := node_modules/babel-cli/bin/babel.js
JEST := ./node_modules/.bin/jest --maxWorkers=1 --config ./jestconfig.json
JS_FILES := $(shell find . -name "*.js" -not -path "./node_modules/*" -not -path "./dist/*" -not -name "bundle.js" -not -path "./vendor/*")
JSX_FILES := $(shell find . -name "*.jsx" -not -path "./node_modules/*" -not -path "./dist/*" -not -path "./vendor/*")
JS_FILES := $(shell find . -name "*.js" -not -path "./node_modules/*" -not -path "./dist/*" -not -name "bundle.js")
JSX_FILES := $(shell find . -name "*.jsx" -not -path "./node_modules/*" -not -path "./dist/*")
TS_FILES := $(shell find . -regex ".*\.tsx*" -not -path "./node_modules/*")
LESS_FILES := $(shell find . -name "*.less" -not -path "./node_modules/*" -not -path "./dist/*" -not -path "./vendor/*")
LESS_FILES := $(shell find . -name "*.less" -not -path "./node_modules/*" -not -path "./dist/*")
LINT := ./node_modules/.bin/eslint
STYLELINT := ./node_modules/.bin/stylelint --config ./stylelint.config.js
TESTS := $(TESTS_JS) $(TESTS_TS)
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clever-components",
"version": "0.29.3",
"version": "0.29.4",
"description": "A library of helpful React components and less styles",
"repository": {
"type": "git",
Expand All @@ -26,14 +26,15 @@
"react-accessible-accordion": "^1.0.2",
"react-transition-group": "~1.2.0",
"react-autosize-textarea": "^3.0.1",
"react-bootstrap": "^0.30.0",
"react-bootstrap": "^0.32.1",
"react-copy-to-clipboard": "^4.2.1",
"react-datetime": "^2.12.0",
"react-datepicker": "1.2.2",
"react-datetime": "^2.14.0",
"react-dropzone": "^3.11.0",
"react-fontawesome": "^1.6.1",
"react-linkify": "^0.2.1",
"react-onclickoutside": "^5.11.1",
"react-overlays": "^0.7.0",
"react-overlays": "^0.8.3",
"react-select": "^1.2.1",
"react-sticky": "^6.0.1",
"short-number": "^1.0.6",
Expand Down
2 changes: 1 addition & 1 deletion src/DateInput/DateInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import moment from "moment";
import React from "react";
import * as PropTypes from "prop-types";
import classnames from "classnames";
import ReactDatePicker from "../../vendor/react-datepicker/dist/react-datepicker.min.js";
import ReactDatePicker from "react-datepicker";
import ReactDateTime from "react-datetime";

import "./DateInput.less";
Expand Down
2 changes: 1 addition & 1 deletion src/DateInput/DateInput.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@import (reference) "../less/type-size";
@import (reference) "../less/type-utilities";
@import (reference) "../less/spacing";
@import "../../vendor/react-datetime/react-datetime.css";
@import "~react-datetime/css/react-datetime.css";

.DateInput {
.padding--x--s;
Expand Down
2 changes: 1 addition & 1 deletion src/DatePicker/DatePicker.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import moment from "moment";
import classnames from "classnames";
import ReactDatePicker from "../../vendor/react-datepicker/dist/react-datepicker.min.js";
import React from "react";
import * as PropTypes from "prop-types";
import ReactDatePicker from "react-datepicker";

import "./DatePicker.less";

Expand Down
2 changes: 1 addition & 1 deletion src/DatePicker/DatePicker.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import (reference) "../less/index";
@import "../../vendor/react-datepicker/dist/react-datepicker.min.css";
@import "~react-datepicker/dist/react-datepicker.min.css";

.DatePicker {
.borderRadius--0;
Expand Down
1 change: 0 additions & 1 deletion tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"./dist",
"./docs",
"./node_modules",
"./vendor",
"**/*.js",
"**/*.jsx",
"**/*_test.ts",
Expand Down
1 change: 0 additions & 1 deletion tsconfig.docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"./dist",
"./src",
"./node_modules",
"./vendor",
"**/*.js",
"**/*.jsx",
"**/*_test.ts",
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
},
"exclude": [
"./dist",
"./node_modules",
"./vendor"
"./node_modules"
]
}
4 changes: 0 additions & 4 deletions vendor/react-datepicker/README.md

This file was deleted.

Loading