Skip to content

Commit 5e7ecf6

Browse files
authored
Merge pull request arqex#736 from arqex/src-directory-organization
Split source files into directories
2 parents 90d85ae + b8961ff commit 5e7ecf6

File tree

12 files changed

+16
-15
lines changed

12 files changed

+16
-15
lines changed

config/paths.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ module.exports = {
7070
appBuild: resolveApp('build'),
7171
appPublic: resolveApp('public'),
7272
appHtml: resolveApp('public/index.html'),
73-
appIndexJs: resolveModule(resolveApp, 'src/index'),
73+
appIndexJs: resolveModule(resolveApp, 'src/playground/index'),
7474
appPackageJson: resolveApp('package.json'),
7575
appSrc: resolveApp('src'),
7676
appTsConfig: resolveApp('tsconfig.json'),

config/webpack.config.build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path');
44
const outputPath = path.join(__dirname, '../dist/');
55

66
const baseConfig = {
7-
entry: ['./src/datetime/DateTime.js'],
7+
entry: ['./src/DateTime.js'],
88
mode: 'production',
99

1010
resolve: {

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"scripts": {
1818
"build": "webpack --config config/webpack.config.build.js",
19-
"lint": "eslint src/datetime/DateTime.js test/ && echo 'Linting OK! 💪'",
19+
"lint": "eslint src/DateTime.js test/ && echo 'Linting OK! 💪'",
2020
"notify-pre-commit-hook": "echo '### Starting pre-commit hook 🦄'",
2121
"playground": "node scripts/start.js",
2222
"test": "jest",
@@ -127,8 +127,9 @@
127127
"<rootDir>/test"
128128
],
129129
"collectCoverageFrom": [
130-
"src/datetime/**/*.{js,jsx,ts,tsx}",
131-
"!src/datetime/**/*.d.ts"
130+
"src/**/*.{js,jsx,ts,tsx}",
131+
"!src/playground/**",
132+
"!src/**/*.d.ts"
132133
],
133134
"setupFiles": [
134135
"react-app-polyfill/jsdom"

src/datetime/DateTime.js renamed to src/DateTime.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import PropTypes from 'prop-types';
22
import moment from 'moment';
33
import React from 'react';
4-
import DaysView from './DaysView';
5-
import MonthsView from './MonthsView';
6-
import YearsView from './YearsView';
7-
import TimeView from './TimeView';
4+
import DaysView from './views/DaysView';
5+
import MonthsView from './views/MonthsView';
6+
import YearsView from './views/YearsView';
7+
import TimeView from './views/TimeView';
88
import onClickOutside from 'react-onclickoutside';
99

1010
const viewModes = {
File renamed without changes.

src/App.js renamed to src/playground/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This file is the playground used for development purposes (npm run playground)
22
// not part of the library
33
import React from 'react';
4-
import Datetime from './datetime/DateTime';
4+
import Datetime from '../DateTime';
55

66
// import moment from 'moment';
77
// import 'moment/locale/tzm-latn';

src/index.js renamed to src/playground/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import React from 'react';
55
import ReactDOM from 'react-dom';
6-
import '../css/react-datetime.css';
6+
import '../../css/react-datetime.css';
77
import App from './App';
88

99
ReactDOM.render(<App />, document.getElementById('root'));

src/datetime/DaysView.js renamed to src/views/DaysView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import ViewNavigation from './ViewNavigation';
2+
import ViewNavigation from '../parts/ViewNavigation';
33

44
export default class DaysView extends React.Component {
55
static defaultProps = {

src/datetime/MonthsView.js renamed to src/views/MonthsView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import ViewNavigation from './ViewNavigation';
2+
import ViewNavigation from '../parts/ViewNavigation';
33

44
export default class MonthsView extends React.Component {
55
render() {
File renamed without changes.

src/datetime/YearsView.js renamed to src/views/YearsView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import ViewNavigation from './ViewNavigation';
2+
import ViewNavigation from '../parts/ViewNavigation';
33

44
export default class YearsView extends React.Component {
55
static defaultProps = {

test/snapshots.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global it, describe, expect, jest */
22

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

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

0 commit comments

Comments
 (0)