From 720ddd2e6350839558398ffb35def95c9713ca59 Mon Sep 17 00:00:00 2001 From: Suneil Nyamathi Date: Tue, 17 Apr 2018 13:21:49 -0700 Subject: [PATCH] Move source files to src folder, transpile into dist folder (#585) * Move addons and lib folder into src folder * Transpile src folder into dist * Update relative paths * Ignore source, generated, and otherwise unneeded files --- .gitignore | 1 + packages/fluxible-router/.npmignore | 3 +++ packages/fluxible-router/index.js | 14 +++++++------- packages/fluxible-router/package.json | 4 ++++ .../{ => src}/addons/HistoryWithHash.js | 0 packages/fluxible-router/{ => src}/addons/index.js | 0 packages/fluxible-router/{ => src}/lib/History.js | 0 packages/fluxible-router/{ => src}/lib/NavLink.js | 0 .../fluxible-router/{ => src}/lib/RouteStore.js | 0 .../{ => src}/lib/createNavLinkComponent.js | 0 .../fluxible-router/{ => src}/lib/handleHistory.js | 0 .../fluxible-router/{ => src}/lib/handleRoute.js | 0 .../{ => src}/lib/navigateAction.js | 0 .../tests/mocks/MockAppComponent.js | 2 +- .../tests/unit/addons/HistoryWithHash-test.js | 2 +- .../fluxible-router/tests/unit/lib/History-test.js | 2 +- .../fluxible-router/tests/unit/lib/NavLink-test.js | 8 ++++---- .../tests/unit/lib/handleHistory-test.js | 6 +++--- .../tests/unit/lib/handleRoute-test.js | 2 +- .../tests/unit/lib/navigateAction-test.js | 2 +- 20 files changed, 27 insertions(+), 19 deletions(-) rename packages/fluxible-router/{ => src}/addons/HistoryWithHash.js (100%) rename packages/fluxible-router/{ => src}/addons/index.js (100%) rename packages/fluxible-router/{ => src}/lib/History.js (100%) rename packages/fluxible-router/{ => src}/lib/NavLink.js (100%) rename packages/fluxible-router/{ => src}/lib/RouteStore.js (100%) rename packages/fluxible-router/{ => src}/lib/createNavLinkComponent.js (100%) rename packages/fluxible-router/{ => src}/lib/handleHistory.js (100%) rename packages/fluxible-router/{ => src}/lib/handleRoute.js (100%) rename packages/fluxible-router/{ => src}/lib/navigateAction.js (100%) diff --git a/.gitignore b/.gitignore index 371893f5..4b49313c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ dist artifacts node_modules *.log +*.tgz .jshintrc package-lock.json diff --git a/packages/fluxible-router/.npmignore b/packages/fluxible-router/.npmignore index 18ba1bed..80c8b499 100644 --- a/packages/fluxible-router/.npmignore +++ b/packages/fluxible-router/.npmignore @@ -1,5 +1,8 @@ .npmignore /artifacts/ /docs/ +/src/ /tests/ *.log +*.md +*.tgz diff --git a/packages/fluxible-router/index.js b/packages/fluxible-router/index.js index 3159d5bf..4dc2d3f4 100644 --- a/packages/fluxible-router/index.js +++ b/packages/fluxible-router/index.js @@ -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') }; diff --git a/packages/fluxible-router/package.json b/packages/fluxible-router/package.json index 0f59e6da..f2e4c386 100644 --- a/packages/fluxible-router/package.json +++ b/packages/fluxible-router/package.json @@ -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" diff --git a/packages/fluxible-router/addons/HistoryWithHash.js b/packages/fluxible-router/src/addons/HistoryWithHash.js similarity index 100% rename from packages/fluxible-router/addons/HistoryWithHash.js rename to packages/fluxible-router/src/addons/HistoryWithHash.js diff --git a/packages/fluxible-router/addons/index.js b/packages/fluxible-router/src/addons/index.js similarity index 100% rename from packages/fluxible-router/addons/index.js rename to packages/fluxible-router/src/addons/index.js diff --git a/packages/fluxible-router/lib/History.js b/packages/fluxible-router/src/lib/History.js similarity index 100% rename from packages/fluxible-router/lib/History.js rename to packages/fluxible-router/src/lib/History.js diff --git a/packages/fluxible-router/lib/NavLink.js b/packages/fluxible-router/src/lib/NavLink.js similarity index 100% rename from packages/fluxible-router/lib/NavLink.js rename to packages/fluxible-router/src/lib/NavLink.js diff --git a/packages/fluxible-router/lib/RouteStore.js b/packages/fluxible-router/src/lib/RouteStore.js similarity index 100% rename from packages/fluxible-router/lib/RouteStore.js rename to packages/fluxible-router/src/lib/RouteStore.js diff --git a/packages/fluxible-router/lib/createNavLinkComponent.js b/packages/fluxible-router/src/lib/createNavLinkComponent.js similarity index 100% rename from packages/fluxible-router/lib/createNavLinkComponent.js rename to packages/fluxible-router/src/lib/createNavLinkComponent.js diff --git a/packages/fluxible-router/lib/handleHistory.js b/packages/fluxible-router/src/lib/handleHistory.js similarity index 100% rename from packages/fluxible-router/lib/handleHistory.js rename to packages/fluxible-router/src/lib/handleHistory.js diff --git a/packages/fluxible-router/lib/handleRoute.js b/packages/fluxible-router/src/lib/handleRoute.js similarity index 100% rename from packages/fluxible-router/lib/handleRoute.js rename to packages/fluxible-router/src/lib/handleRoute.js diff --git a/packages/fluxible-router/lib/navigateAction.js b/packages/fluxible-router/src/lib/navigateAction.js similarity index 100% rename from packages/fluxible-router/lib/navigateAction.js rename to packages/fluxible-router/src/lib/navigateAction.js diff --git a/packages/fluxible-router/tests/mocks/MockAppComponent.js b/packages/fluxible-router/tests/mocks/MockAppComponent.js index f3095e4a..b2ab5c49 100644 --- a/packages/fluxible-router/tests/mocks/MockAppComponent.js +++ b/packages/fluxible-router/tests/mocks/MockAppComponent.js @@ -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({ diff --git a/packages/fluxible-router/tests/unit/addons/HistoryWithHash-test.js b/packages/fluxible-router/tests/unit/addons/HistoryWithHash-test.js index 854618c7..bf771ca9 100644 --- a/packages/fluxible-router/tests/unit/addons/HistoryWithHash-test.js +++ b/packages/fluxible-router/tests/unit/addons/HistoryWithHash-test.js @@ -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, diff --git a/packages/fluxible-router/tests/unit/lib/History-test.js b/packages/fluxible-router/tests/unit/lib/History-test.js index cbddfca2..b22914f6 100644 --- a/packages/fluxible-router/tests/unit/lib/History-test.js +++ b/packages/fluxible-router/tests/unit/lib/History-test.js @@ -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, diff --git a/packages/fluxible-router/tests/unit/lib/NavLink-test.js b/packages/fluxible-router/tests/unit/lib/NavLink-test.js index 6ce0333e..02c84814 100644 --- a/packages/fluxible-router/tests/unit/lib/NavLink-test.js +++ b/packages/fluxible-router/tests/unit/lib/NavLink-test.js @@ -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('', { url: 'http://yahoo.com' }); @@ -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); diff --git a/packages/fluxible-router/tests/unit/lib/handleHistory-test.js b/packages/fluxible-router/tests/unit/lib/handleHistory-test.js index ddf3c77b..959d9a86 100644 --- a/packages/fluxible-router/tests/unit/lib/handleHistory-test.js +++ b/packages/fluxible-router/tests/unit/lib/handleHistory-test.js @@ -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; @@ -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({ diff --git a/packages/fluxible-router/tests/unit/lib/handleRoute-test.js b/packages/fluxible-router/tests/unit/lib/handleRoute-test.js index ff25e64c..d7e189a4 100644 --- a/packages/fluxible-router/tests/unit/lib/handleRoute-test.js +++ b/packages/fluxible-router/tests/unit/lib/handleRoute-test.js @@ -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({ diff --git a/packages/fluxible-router/tests/unit/lib/navigateAction-test.js b/packages/fluxible-router/tests/unit/lib/navigateAction-test.js index 8c21fdfc..0c572e41 100644 --- a/packages/fluxible-router/tests/unit/lib/navigateAction-test.js +++ b/packages/fluxible-router/tests/unit/lib/navigateAction-test.js @@ -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;