Tim Neutkens 52ccc14059 Merge branch 'canary' ...

# Conflicts:
#	examples/with-markdown/readme.md
#	lib/page-loader.js
#	package.json
#	server/build/plugins/pages-plugin.js

2017-12-08 15:11:37 -08:00

..

build

Merge branch 'canary'

2017-12-08 15:11:37 -08:00

config.js

Add .jsx extension support (#3376)

2017-12-05 15:46:06 -08:00

document.js

Merge branch 'canary'

2017-12-08 15:11:37 -08:00

export.js

Always load pages with ".js" extension (#3393)

2017-12-05 04:49:53 +05:30

hot-reloader.js

[WIP] Use buildId in chunk urls as well (#2873)

2017-08-31 05:47:06 +05:30

index.js

Merge branch 'canary'

2017-12-08 15:11:37 -08:00

next.js

Programmatic API (#310)

2016-12-16 12:33:08 -08:00

on-demand-entry-handler.js

Keep some buffered pages, that won't be disposed. Fix #1939 (#2592)

2017-09-28 14:51:03 +02:00

render.js

Add a charset to the default Content-Type (#3333)

2017-12-05 16:00:58 -08:00

require.js

…

resolve.js

Add .jsx extension support (#3376)

2017-12-05 15:46:06 -08:00

router.js

Allow parsed url to be passed down (#950)

2017-02-02 12:21:08 +05:30

utils.js

Add .jsx extension support (#3376)

2017-12-05 15:46:06 -08:00