Skip to content

Commit 81c7a57

Browse files
committed
[changed] Removed "modules" directory
This should make it easier to use our private modules, e.g. var TestLocation = require('react-router/locations/TestLocation');
1 parent ae912a6 commit 81c7a57

Some content is hidden

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

49 files changed

+24
-17
lines changed
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.

modules/components/__tests__/DefaultRoute-test.js components/tests/DefaultRoute-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var React = require('react');
33
var Router = require('../../index');
44
var DefaultRoute = require('../DefaultRoute');
55
var Route = require('../Route');
6-
var { Foo, Bar, Nested } = require('../../__tests__/TestHandlers');
6+
var { Foo, Bar, Nested } = require('../../utils/TestHandlers');
77

88
describe('DefaultRoute', function () {
99

modules/components/__tests__/Link-test.js components/tests/Link-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var Route = require('../Route');
66
var Link = require('../Link');
77
var RouteHandler = require('../RouteHandler');
88
var TestLocation = require('../../locations/TestLocation');
9-
var { Foo, Bar } = require('../../__tests__/TestHandlers');
9+
var { Foo, Bar } = require('../../utils/TestHandlers');
1010
var { click } = React.addons.TestUtils.Simulate;
1111

1212
describe('A Link', function () {

modules/components/__tests__/NotFoundRoute-test.js components/tests/NotFoundRoute-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var React = require('react');
33
var Router = require('../../index');
44
var NotFoundRoute = require('../NotFoundRoute');
55
var Route = require('../Route');
6-
var { Nested, Foo, Bar } = require('../../__tests__/TestHandlers');
6+
var { Nested, Foo, Bar } = require('../../utils/TestHandlers');
77

88
describe('NotFoundRoute', function () {
99

modules/components/__tests__/Redirect-test.js components/tests/Redirect-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var expect = require('expect');
22
var React = require('react');
33
var Router = require('../../index');
44
var TestLocation = require('../../locations/TestLocation');
5-
var { Nested, Bar } = require('../../__tests__/TestHandlers');
5+
var { Nested, Bar } = require('../../utils/TestHandlers');
66
var Redirect = require('../Redirect');
77
var Route = require('../Route');
88

modules/components/__tests__/RouteHandler-test.js components/tests/RouteHandler-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Router = require('../../index');
44
var Route = require('../Route');
55
var RouteHandler = require('../RouteHandler');
66
var TestLocation = require('../../locations/TestLocation');
7-
var { Bar, Foo } = require('../../__tests__/TestHandlers');
7+
var { Bar, Foo } = require('../../utils/TestHandlers');
88

99
describe('RouteHandler', function () {
1010

docs/api/README.md

+1-1

docs/api/misc/Location.md

+1-1

examples/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = {
3434

3535
resolve: {
3636
alias: {
37-
'react-router': '../../modules'
37+
'react-router': '../../index'
3838
}
3939
},
4040

modules/index.js index.js

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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

modules/mixins/__tests__/State-test.js mixins/tests/State-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var React = require('react');
33
var Router = require('../../index');
44
var Route = require('../../components/Route');
55
var TestLocation = require('../../locations/TestLocation');
6-
var { Foo } = require('../../__tests__/TestHandlers');
6+
var { Foo } = require('../../utils/TestHandlers');
77

88
describe('State', function () {
99

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "react-router",
33
"version": "0.11.6",
44
"description": "A complete routing library for React.js",
5-
"main": "./modules/index",
5+
"main": "index.js",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/rackt/react-router.git"
@@ -13,8 +13,8 @@
1313
"example": "examples"
1414
},
1515
"scripts": {
16-
"build": "NODE_ENV=production webpack modules/index.js dist/react-router.js",
17-
"build-min": "NODE_ENV=production COMPRESS=1 webpack modules/index.js dist/react-router.min.js",
16+
"build": "NODE_ENV=production webpack index.js dist/react-router.js",
17+
"build-min": "NODE_ENV=production COMPRESS=1 webpack index.js dist/react-router.min.js",
1818
"examples": "webpack-dev-server --config examples/webpack.config.js --no-info --content-base examples",
1919
"test": "jsxhint . && karma start"
2020
},

tests.webpack.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
var context = require.context('./modules', true, /-test\.js$/);
2-
context.keys().forEach(context);
1+
function requireAll(context) {
2+
context.keys().forEach(context);
3+
}
4+
5+
requireAll(require.context('./tests', true, /-test\.js$/));
6+
requireAll(require.context('./components/tests', true, /-test\.js$/));
7+
requireAll(require.context('./locations/tests', true, /-test\.js$/));
8+
requireAll(require.context('./mixins/tests', true, /-test\.js$/));
9+
requireAll(require.context('./utils/tests', true, /-test\.js$/));

modules/__tests__/Router-test.js tests/Router-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var {
1919
RedirectToFooAsync,
2020
Abort,
2121
AbortAsync
22-
} = require('./TestHandlers');
22+
} = require('../utils/TestHandlers');
2323

2424
describe('Router', function () {
2525
describe('transitions', function () {
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

modules/utils/__tests__/History-test.js utils/tests/History-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var expect = require('expect');
22
var React = require('react');
3-
var { Foo, RedirectToFoo } = require('../../__tests__/TestHandlers');
3+
var { Foo, RedirectToFoo } = require('../../utils/TestHandlers');
44
var TestLocation = require('../../locations/TestLocation');
55
var Route = require('../../components/Route');
66
var Router = require('../../index');
File renamed without changes.

webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var webpack = require('webpack');
22

33
var plugins = [
44
new webpack.DefinePlugin({
5-
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
5+
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
66
})
77
];
88

0 commit comments

Comments
 (0)