Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve error messaging when requiring routes, add CLI tests #828

Merged
merged 11 commits into from
Jan 28, 2017
Merged

Improve error messaging when requiring routes, add CLI tests #828

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d16729
Output errors from the routes
kaytcat Jan 11, 2017
544ca6b
Remove try catch completely
kaytcat Jan 11, 2017
d9141e0
Disable routes require when command is 'init'
karlhorky Jan 12, 2017
dec327b
Conform to code style, add comment
karlhorky Jan 12, 2017
c44107c
Add integration tests for react-server-cli (#1)
karlhorky Jan 26, 2017
f1bf63b
Improve error message
karlhorky Jan 27, 2017
74513c1
Add comment
karlhorky Jan 27, 2017
8e73edc
Lock dependency
karlhorky Jan 27, 2017
4758224
Fix linting errors
karlhorky Jan 27, 2017
aeef9cb
Fix react and react-dom versions
karlhorky Jan 28, 2017
9d596cd
Merge branch 'master' into add-error-output
karlhorky Jan 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/react-server-cli/src/run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ export default function run(options = {}) {
options.routesPath = path.resolve(process.cwd(), routesFile);
options.routesDir = path.dirname(options.routesPath);

try {
// No routes file available when performing init command
if (options.command !== 'init') {
options.routes = require(options.routesPath);
} catch (e) {
// Pass. Commands need to check for routes themselves.
}

options.outputUrl = jsUrl || `${httpsOptions ? "https" : "http"}://${host}:${jsPort}/`;
Expand Down