Skip to content

Commit

Permalink
Merge pull request #736 from arqex/src-directory-organization
Browse files Browse the repository at this point in the history
Split source files into directories
  • Loading branch information
arqex committed Sep 29, 2020
2 parents 90d85ae + b8961ff commit 5e7ecf6
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports = {
appBuild: resolveApp('build'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appIndexJs: resolveModule(resolveApp, 'src/playground/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'),
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const path = require('path');
const outputPath = path.join(__dirname, '../dist/');

const baseConfig = {
entry: ['./src/datetime/DateTime.js'],
entry: ['./src/DateTime.js'],
mode: 'production',

resolve: {
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"scripts": {
"build": "webpack --config config/webpack.config.build.js",
"lint": "eslint src/datetime/DateTime.js test/ && echo 'Linting OK! 💪'",
"lint": "eslint src/DateTime.js test/ && echo 'Linting OK! 💪'",
"notify-pre-commit-hook": "echo '### Starting pre-commit hook 🦄'",
"playground": "node scripts/start.js",
"test": "jest",
Expand Down Expand Up @@ -127,8 +127,9 @@
"<rootDir>/test"
],
"collectCoverageFrom": [
"src/datetime/**/*.{js,jsx,ts,tsx}",
"!src/datetime/**/*.d.ts"
"src/**/*.{js,jsx,ts,tsx}",
"!src/playground/**",
"!src/**/*.d.ts"
],
"setupFiles": [
"react-app-polyfill/jsdom"
Expand Down
8 changes: 4 additions & 4 deletions src/datetime/DateTime.js → src/DateTime.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import PropTypes from 'prop-types';
import moment from 'moment';
import React from 'react';
import DaysView from './DaysView';
import MonthsView from './MonthsView';
import YearsView from './YearsView';
import TimeView from './TimeView';
import DaysView from './views/DaysView';
import MonthsView from './views/MonthsView';
import YearsView from './views/YearsView';
import TimeView from './views/TimeView';
import onClickOutside from 'react-onclickoutside';

const viewModes = {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/App.js → src/playground/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is the playground used for development purposes (npm run playground)
// not part of the library
import React from 'react';
import Datetime from './datetime/DateTime';
import Datetime from '../DateTime';

// import moment from 'moment';
// import 'moment/locale/tzm-latn';
Expand Down
2 changes: 1 addition & 1 deletion src/index.js → src/playground/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import React from 'react';
import ReactDOM from 'react-dom';
import '../css/react-datetime.css';
import '../../css/react-datetime.css';
import App from './App';

ReactDOM.render(<App />, document.getElementById('root'));
2 changes: 1 addition & 1 deletion src/datetime/DaysView.js → src/views/DaysView.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ViewNavigation from './ViewNavigation';
import ViewNavigation from '../parts/ViewNavigation';

export default class DaysView extends React.Component {
static defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion src/datetime/MonthsView.js → src/views/MonthsView.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ViewNavigation from './ViewNavigation';
import ViewNavigation from '../parts/ViewNavigation';

export default class MonthsView extends React.Component {
render() {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/datetime/YearsView.js → src/views/YearsView.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ViewNavigation from './ViewNavigation';
import ViewNavigation from '../parts/ViewNavigation';

export default class YearsView extends React.Component {
static defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion test/snapshots.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* global it, describe, expect, jest */

import React from 'react'; // eslint-disable-line no-unused-vars
import Datetime from '../src/datetime/DateTime';
import Datetime from '../src/DateTime';
import renderer from 'react-test-renderer';

// findDOMNode is not supported by the react-test-renderer,
Expand Down

0 comments on commit 5e7ecf6

Please sign in to comment.