Skip to content

Commit bb7b666

Browse files
committed
[removed] .js files from repo root
Also reorganized a few things: index.js => modules/index.js modules/helpers => modules/utils script => scripts Fixes #256
1 parent e57112e commit bb7b666

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+210
-267
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
examples/_*
22
examples/build
33
node_modules
4-

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ CONTRIBUTING.md
22
bower.json
33
examples
44
karma.conf.js
5-
script
5+
scripts
66
specs
77
webpack.config.js

ActiveState.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

AsyncState.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

DefaultRoute.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

Link.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

NotFoundRoute.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

Redirect.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

Route.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

Routes.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/react-router.js

Lines changed: 156 additions & 181 deletions
Large diffs are not rendered by default.

dist/react-router.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/animations/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Routes = Router.Routes;
55
var Route = Router.Route;
66
var Link = Router.Link;

examples/auth-flow/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/data-flow/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/dynamic-segments/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Redirect = Router.Redirect;

examples/master-detail/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var DefaultRoute = Router.DefaultRoute;
66
var Routes = Router.Routes;

examples/partial-app-loading/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/partial-app-loading/dashboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @jsx React.DOM */
22

33
var React = require('react');
4-
var ReactRouter = require('../../index');
4+
var ReactRouter = require('../../modules');
55
var Link = ReactRouter.Link;
66

77
var Dashboard = React.createClass({

examples/query-params/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/shared-root/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/simple-master-detail/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

examples/transitions/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var Router = require('../../index');
3+
var Router = require('../../modules');
44
var Route = Router.Route;
55
var Routes = Router.Routes;
66
var Link = Router.Link;

goBack.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

index.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

makeHref.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

modules/Router.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/actions/LocationActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var LocationDispatcher = require('../dispatchers/LocationDispatcher');
2-
var makePath = require('../helpers/makePath');
2+
var makePath = require('../utils/makePath');
33

44
/**
55
* Actions that modify the URL.

modules/components/Link.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
var React = require('react');
22
var ActiveState = require('../mixins/ActiveState');
33
var transitionTo = require('../actions/LocationActions').transitionTo;
4-
var withoutProperties = require('../helpers/withoutProperties');
5-
var hasOwnProperty = require('../helpers/hasOwnProperty');
6-
var makeHref = require('../helpers/makeHref');
4+
var withoutProperties = require('../utils/withoutProperties');
5+
var hasOwnProperty = require('../utils/hasOwnProperty');
6+
var makeHref = require('../utils/makeHref');
77
var warning = require('react/lib/warning');
88

99
function isLeftClickEvent(event) {

modules/components/Route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var React = require('react');
2-
var withoutProperties = require('../helpers/withoutProperties');
2+
var withoutProperties = require('../utils/withoutProperties');
33

44
/**
55
* A map of <Route> component props that are reserved for use by the

modules/components/Routes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ var copyProperties = require('react/lib/copyProperties');
44
var Promise = require('when/lib/Promise');
55
var LocationActions = require('../actions/LocationActions');
66
var Route = require('../components/Route');
7-
var Path = require('../helpers/Path');
8-
var Redirect = require('../helpers/Redirect');
9-
var Transition = require('../helpers/Transition');
7+
var Path = require('../utils/Path');
8+
var Redirect = require('../utils/Redirect');
9+
var Transition = require('../utils/Transition');
1010
var HashLocation = require('../locations/HashLocation');
1111
var HistoryLocation = require('../locations/HistoryLocation');
1212
var RefreshLocation = require('../locations/RefreshLocation');

modules/index.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
exports.goBack = require('./actions/LocationActions').goBack;
2+
exports.replaceWith = require('./actions/LocationActions').replaceWith;
3+
exports.transitionTo = require('./actions/LocationActions').transitionTo;
4+
5+
exports.DefaultRoute = require('./components/DefaultRoute');
6+
exports.Link = require('./components/Link');
7+
exports.NotFoundRoute = require('./components/NotFoundRoute');
8+
exports.Redirect = require('./components/Redirect');
9+
exports.Route = require('./components/Route');
10+
exports.Routes = require('./components/Routes');
11+
12+
exports.makeHref = require('./utils/makeHref');
13+
14+
exports.ActiveState = require('./mixins/ActiveState');
15+
exports.AsyncState = require('./mixins/AsyncState');

modules/locations/HashLocation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var invariant = require('react/lib/invariant');
22
var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
3-
var getWindowPath = require('../helpers/getWindowPath');
3+
var getWindowPath = require('../utils/getWindowPath');
44

55
function getHashPath() {
66
return window.location.hash.substr(1);

modules/locations/HistoryLocation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var invariant = require('react/lib/invariant');
22
var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
3-
var getWindowPath = require('../helpers/getWindowPath');
3+
var getWindowPath = require('../utils/getWindowPath');
44

55
var _onChange;
66

modules/locations/RefreshLocation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var invariant = require('react/lib/invariant');
22
var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
3-
var getWindowPath = require('../helpers/getWindowPath');
3+
var getWindowPath = require('../utils/getWindowPath');
44

55
/**
66
* A Location that uses full page refreshes. This is used as

modules/mixins/AsyncState.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var React = require('react');
2-
var resolveAsyncState = require('../helpers/resolveAsyncState');
2+
var resolveAsyncState = require('../utils/resolveAsyncState');
33

44
/**
55
* A mixin for route handler component classes that fetch at least

modules/stores/PathStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var warning = require('react/lib/warning');
22
var EventEmitter = require('events').EventEmitter;
33
var LocationActions = require('../actions/LocationActions');
44
var LocationDispatcher = require('../dispatchers/LocationDispatcher');
5-
var supportsHistory = require('../helpers/supportsHistory');
5+
var supportsHistory = require('../utils/supportsHistory');
66
var HistoryLocation = require('../locations/HistoryLocation');
77
var RefreshLocation = require('../locations/RefreshLocation');
88

modules/stores/RouteStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var React = require('react');
22
var invariant = require('react/lib/invariant');
33
var warning = require('react/lib/warning');
4-
var Path = require('../helpers/Path');
4+
var Path = require('../utils/Path');
55

66
var _namedRoutes = {};
77

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
"name": "react-router",
33
"version": "0.6.1",
44
"description": "A complete routing library for React.js",
5-
"tags": [
6-
"react",
7-
"router"
8-
],
9-
"main": "./index",
5+
"main": "./modules/index",
106
"repository": {
117
"type": "git",
128
"url": "https://github.com/rackt/react-router.git"
@@ -54,6 +50,10 @@
5450
"qs": "2.2.2",
5551
"when": "^3.4.4"
5652
},
53+
"tags": [
54+
"react",
55+
"router"
56+
],
5757
"keywords": [
5858
"react",
5959
"react-component",

replaceWith.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

script/build

Lines changed: 0 additions & 4 deletions
This file was deleted.

scripts/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
mkdir -p dist
3+
NODE_ENV=production node_modules/.bin/browserify modules/index.js -t browserify-shim -t envify --detect-globals false -s ReactRouter > dist/react-router.js
4+
node_modules/.bin/uglifyjs dist/react-router.js --compress warnings=false > dist/react-router.min.js
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
#!/bin/sh
22
webpack --devtool inline-source-map "$@"
3-
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
#!/bin/sh
22
node_modules/rf-release/node_modules/.bin/changelog -t preview -s
3-
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/sh
2-
script/build
2+
scripts/build
33
node_modules/.bin/release
4-
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
#!/bin/sh
22
node_modules/.bin/karma start "$@"
3-

specs/Path.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require('./helper');
2-
var Path = require('../modules/helpers/Path');
2+
var Path = require('../modules/utils/Path');
33

44
describe('Path.extractParamNames', function () {
55
describe('when a pattern contains no dynamic segments', function () {

transitionTo.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)