Skip to content

Commit

Permalink
Move source files to src folder, transpile into dist folder (#585)
Browse files Browse the repository at this point in the history
* Move addons and lib folder into src folder

* Transpile src folder into dist

* Update relative paths

* Ignore source, generated, and otherwise unneeded files
  • Loading branch information
snyamathi authored and redonkulus committed Apr 17, 2018
1 parent ed82afa commit 720ddd2
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ dist
artifacts
node_modules
*.log
*.tgz
.jshintrc
package-lock.json
3 changes: 3 additions & 0 deletions packages/fluxible-router/.npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.npmignore
/artifacts/
/docs/
/src/
/tests/
*.log
*.md
*.tgz
14 changes: 7 additions & 7 deletions packages/fluxible-router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
'use strict';

module.exports = {
createNavLinkComponent: require('./lib/createNavLinkComponent'),
handleHistory: require('./lib/handleHistory'),
handleRoute: require('./lib/handleRoute'),
History: require('./lib/History'),
navigateAction: require('./lib/navigateAction'),
NavLink: require('./lib/NavLink'),
RouteStore: require('./lib/RouteStore')
createNavLinkComponent: require('./dist/lib/createNavLinkComponent'),
handleHistory: require('./dist/lib/handleHistory'),
handleRoute: require('./dist/lib/handleRoute'),
History: require('./dist/lib/History'),
navigateAction: require('./dist/lib/navigateAction'),
NavLink: require('./dist/lib/NavLink'),
RouteStore: require('./dist/lib/RouteStore')
};
4 changes: 4 additions & 0 deletions packages/fluxible-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"url": "git://github.com/yahoo/fluxible.git"
},
"scripts": {
"dist": "../../node_modules/.bin/babel src -d dist",
"precover": "npm run dist",
"prepublish": "npm run dist",
"pretest": "npm run dist",
"test": "../../node_modules/.bin/mocha tests/unit/ --opts ../../mocha.opts",
"cover": "BABEL_ENV=test ../../node_modules/.bin/nyc ../../node_modules/.bin/_mocha tests/unit/ --opts ../../mocha.opts",
"lint": "../../node_modules/.bin/eslint *.js */*.js"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/fluxible-router/tests/mocks/MockAppComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var React = require('react');
var PropTypes = require('prop-types');
var provideContext = require('fluxible-addons-react/provideContext');
var handleHistory = require('../../lib/handleHistory');
var handleHistory = require('../../dist/lib/handleHistory');
var createReactClass = require('create-react-class');

var MockAppComponent = createReactClass({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
*/
/*globals describe,it,before,beforeEach */
var HistoryWithHash = require('../../../addons/HistoryWithHash'),
var HistoryWithHash = require('../../../dist/addons/HistoryWithHash'),
expect = require('chai').expect,
_ = require('lodash'),
windowMock,
Expand Down
2 changes: 1 addition & 1 deletion packages/fluxible-router/tests/unit/lib/History-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
*/
/*globals describe,it,before,beforeEach */
var History = require('../../../lib/History'),
var History = require('../../../dist/lib/History'),
expect = require('chai').expect,
_ = require('lodash'),
windowMock,
Expand Down
8 changes: 4 additions & 4 deletions packages/fluxible-router/tests/unit/lib/NavLink-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ function setup(options, done) {
if (options.nodeEnv) {
process.env.NODE_ENV = options.nodeEnv;
}
var path = fs.realpathSync(resolve.sync('../../../lib/createNavLinkComponent'));
var path = fs.realpathSync(resolve.sync('../../../dist/lib/createNavLinkComponent'));
delete require.cache[path];
path = fs.realpathSync(resolve.sync('../../../lib/NavLink'));
path = fs.realpathSync(resolve.sync('../../../dist/lib/NavLink'));
delete require.cache[path];

var jsdom = new JSDOM('<html><body></body></html>', { url: 'http://yahoo.com' });
Expand All @@ -58,8 +58,8 @@ function setup(options, done) {
method: 'GET'
});
MockAppComponent = require('../../mocks/MockAppComponent');
NavLink = require('../../../lib/NavLink');
createNavLinkComponent = require('../../../lib/createNavLinkComponent');
NavLink = require('../../../dist/lib/NavLink');
createNavLinkComponent = require('../../../dist/lib/createNavLinkComponent');
testResult = {};

return done(null, mockContext);
Expand Down
6 changes: 3 additions & 3 deletions packages/fluxible-router/tests/unit/lib/handleHistory-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var mockCreators = {
decoratedCreator: 'createDecoratedMockAppComponent'
};
var MockAppComponentLib;
var RouteStore = require('../../../lib/RouteStore');
var RouteStore = require('../../../dist/lib/RouteStore');
var createMockComponentContext = require('fluxible/utils/createMockComponentContext');
var ReactTestUtils;

Expand Down Expand Up @@ -80,14 +80,14 @@ describe('handleHistory', function () {
global.Event = window.Event;

// Reset cache of handleHistory to allow pre-emptyive pushState testing
delete require.cache[require.resolve('../../../lib/handleHistory')];
delete require.cache[require.resolve('../../../dist/lib/handleHistory')];
delete require.cache[require.resolve('../../mocks/MockAppComponent')];

React = require('react');
ReactDOM = require('react-dom');
createReactClass = require('create-react-class');
provideContext = require('fluxible-addons-react/provideContext');
handleHistory = require('../../../lib/handleHistory');
handleHistory = require('../../../dist/lib/handleHistory');
MockAppComponentLib = require('../../mocks/MockAppComponent');
ReactTestUtils = require('react-dom/test-utils');
mockContext = createMockComponentContext({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var expect = require('chai').expect;
var JSDOM = require('jsdom').JSDOM;
var React;
var ReactDOM;
var RouteStore = require('../../../lib/RouteStore');
var RouteStore = require('../../../dist/lib/RouteStore');
var createMockComponentContext = require('fluxible/utils/createMockComponentContext');
var ReactTestUtils;
var TestRouteStore = RouteStore.withStaticRoutes({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
/*globals describe,it,before,beforeEach */
var expect = require('chai').expect;
var navigateAction = require('../../../lib/navigateAction');
var navigateAction = require('../../../dist/lib/navigateAction');
var createMockActionContext = require('fluxible/utils/createMockActionContext');
var RouteStore = require('../../../').RouteStore;

Expand Down

0 comments on commit 720ddd2

Please sign in to comment.