Skip to content
This repository has been archived by the owner on Jun 3, 2019. It is now read-only.

Feature/apollo #469

Merged
merged 130 commits into from
Aug 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
abb61d9
Adds 'redux' feature branch.
ctrlplusb Dec 13, 2016
13563c8
Merge branch 'master' into feature/redux
ctrlplusb Dec 13, 2016
8ec239e
Merge branch 'next' into feature/redux
ctrlplusb Dec 23, 2016
9237ca2
Merge branch 'master' into feature/redux
ctrlplusb Dec 24, 2016
559be3b
Fixes issues with rename of APP_STATE to __APP_STATE__.
ctrlplusb Dec 24, 2016
4bf1f67
Adds flow configuration.
ctrlplusb Dec 30, 2016
2c1d319
Merge branch 'next' into feature/flow
ctrlplusb Dec 31, 2016
787f3fc
Adds the flow scripts back.
ctrlplusb Dec 31, 2016
5903d7b
Merge branch 'next' into feature/flow
ctrlplusb Dec 31, 2016
701f610
Fixes package.json
ctrlplusb Dec 31, 2016
0b0faae
Merge branch 'next' into feature/flow
ctrlplusb Dec 31, 2016
06a3423
Merge branch 'next' into feature/flow
ctrlplusb Jan 2, 2017
a2fe2ed
Fixes missing dependencies.
ctrlplusb Jan 2, 2017
35f7077
Merge branch 'feature/flow' into feature/redux
ctrlplusb Jan 2, 2017
0525d49
Migrates from the 'task routes' implementation for data loading to th…
ctrlplusb Jan 9, 2017
58b3986
Merge branch 'next' into feature/redux-opinionated
ctrlplusb Jan 9, 2017
3fda006
Merge branch 'next' into feature/redux-opinionated
ctrlplusb Jan 9, 2017
eea8277
Merge remote-tracking branch 'origin/master' into feature/redux-opini…
ctrlplusb Jan 9, 2017
64223b3
Merge remote-tracking branch 'origin/master' into feature/redux-opini…
ctrlplusb Jan 9, 2017
fdb6188
Merge remote-tracking branch 'origin/master' into feature/redux-opini…
ctrlplusb Jan 10, 2017
2aff2ee
Merge remote-tracking branch 'origin/master' into feature/redux-opini…
ctrlplusb Jan 11, 2017
e2d449f
Adds modernizr with illustrative example. closes #256
ctrlplusb Jan 13, 2017
c379c86
Linting now occurs on config, src and tools. closes #314
ctrlplusb Jan 13, 2017
5665b31
Updates dependencies.
ctrlplusb Jan 13, 2017
c22814f
update broken feature/flow link in docs
markyfyi Jan 14, 2017
28769d1
Merge pull request #324 from markshlick/patch-1
codepunkt Jan 14, 2017
0026b2d
Updates to latest react-jobs and fixes job attached to Post.
ctrlplusb Jan 17, 2017
97b0468
Merge branch 'master' into next
ctrlplusb Jan 17, 2017
4602df1
Updates dependencies.
ctrlplusb Jan 20, 2017
2438517
Updated CSP to add backwards compatibility to nonce. (#344)
rlindskog Jan 23, 2017
c2bec1c
- Renamed environment variables:
ctrlplusb Jan 23, 2017
fd693c8
Merge branch 'master' into next
ctrlplusb Jan 23, 2017
0b47de6
fix sw to exclude directory (#305)
diondirza Jan 23, 2017
8f319b3
Merge branch 'master' into next
ctrlplusb Jan 23, 2017
ae7249c
Adds Dion Dirza as a contributor 🎉
ctrlplusb Jan 23, 2017
2de7d2e
Fixes analyze.
ctrlplusb Jan 23, 2017
6721603
Docs and cleaning up.
ctrlplusb Jan 23, 2017
d79d624
Updates docs and version.
ctrlplusb Jan 23, 2017
8452f77
Removes code-split-component.
ctrlplusb Jan 23, 2017
eebd879
Updates deps and fixes config refs.
ctrlplusb Jan 23, 2017
dc24183
Huuuuuge refactor of project structure. The 'src/' was always unnece…
ctrlplusb Jan 23, 2017
4593e9d
Fixes offline page.
ctrlplusb Jan 24, 2017
d0ba64e
Cleans up and centralises util functions.
ctrlplusb Jan 24, 2017
66260b7
Minor fixes.
ctrlplusb Jan 24, 2017
ba2af33
Renames config/get to config/getConfig
ctrlplusb Feb 7, 2017
2180d3f
fixes typo: laoder -> loader (#353)
tyler-dot-earth Feb 12, 2017
22e6958
fixes typo: server -> serve (#354)
tyler-dot-earth Feb 12, 2017
db371ec
Huuuuuuuge update. Getting closer to v13.
ctrlplusb Feb 17, 2017
e3b99f6
Fixes incorrect import path in Menu.test.js (#360)
datoml Feb 19, 2017
e8f027e
Updates Error 404 component so that we can set 404 status on SSR rend…
diondirza Feb 19, 2017
f8e7fe5
Updates dependencies.
ctrlplusb Feb 20, 2017
dfd9426
Updates contributors and comments.
ctrlplusb Feb 20, 2017
29c8971
Merge branch 'next' of https://github.com/ctrlplusb/react-universally…
ctrlplusb Feb 20, 2017
18ff787
Restructures and fixes tests.
ctrlplusb Feb 20, 2017
f09a296
Cleaning up comments and docs.
ctrlplusb Feb 20, 2017
9451cbe
Fixes deprecated fallbackLoader (#365)
Feb 21, 2017
3d5f310
Changes default host config to bind to all hosts (0.0.0.0) by default…
birkir Feb 21, 2017
032abed
merge with next
sergiokopplin Feb 21, 2017
ccabc32
fix typo flag (#369)
diondirza Feb 24, 2017
4bd221b
removing flow from branch
sergiokopplin Feb 27, 2017
f802485
Missing default polyfill.io features
birkir Mar 1, 2017
3aae79f
Updated react-router-dom to beta 7 (#381)
datoml Mar 4, 2017
be004b8
Updates node version.
ctrlplusb Mar 4, 2017
28d36e6
Merge branch 'next' of https://github.com/ctrlplusb/react-universally…
ctrlplusb Mar 4, 2017
00479ef
Synchronises the react-router-dom dep into yarn.lock
ctrlplusb Mar 4, 2017
3237343
Updates dependencies.
ctrlplusb Mar 5, 2017
2e79a47
Removes onlyIf and replaces with ifElse helper. fixes #362
ctrlplusb Mar 5, 2017
cda183b
Update README.md
ctrlplusb Mar 5, 2017
6e9553a
Update README.md
ctrlplusb Mar 5, 2017
deb41e5
Fixes breaking context changes in RR4
birkir Mar 6, 2017
8a774bf
Rollback disableSSR. TODO: EnvVars this
birkir Mar 6, 2017
26daddf
Changes polyfill.io into a features array specification.
ctrlplusb Mar 13, 2017
98d968e
Upgrade [email protected] and other deps (#396)
diondirza Mar 13, 2017
38e6495
Syncs yarn.lock with package.json
ctrlplusb Mar 13, 2017
e95fe97
Fix Error404 test
birkir Mar 14, 2017
6e329f5
Upgrades to latest react-async-component.
ctrlplusb Apr 3, 2017
179f8d5
Adds 'es6' features to polyfill.io config.
ctrlplusb Apr 3, 2017
8b18f91
Removes aliasing of React libs and instead makes NODE_ENV get set to …
ctrlplusb Apr 3, 2017
35256c7
Updates comments.
ctrlplusb Apr 3, 2017
c3d8846
Removes babel-preset-latest.
ctrlplusb Apr 3, 2017
c75f781
staticContext on 404 route not required.
ctrlplusb Apr 4, 2017
ae3fa8e
Refactors async components structure.
ctrlplusb Apr 4, 2017
57367aa
Adds prettier 💄
ctrlplusb Apr 4, 2017
3bec7c6
Updates nvm
ctrlplusb Apr 4, 2017
0179f3c
Adds prepush hook to run jest.
ctrlplusb Apr 4, 2017
0e77a71
Fixes prettier config to use prettier-eslint. Woops\!
ctrlplusb Apr 4, 2017
c15e8b6
Removes unused eslint-flowtype plugin.
ctrlplusb Apr 4, 2017
579a57b
Updates dependencies.
ctrlplusb Apr 5, 2017
5dc5bc1
Updates docs
ctrlplusb Apr 5, 2017
fbac4a4
Moves all html page elements to DemoApp component. closes #390
ctrlplusb Apr 5, 2017
7c5338b
Removes 'host' from server start. closes #398
ctrlplusb Apr 5, 2017
e977ce2
Changes process.env build flags to be inline with expected string typ…
ctrlplusb Apr 5, 2017
6cb1651
Merge branch 'master' of https://github.com/ctrlplusb/react-universally
ctrlplusb Apr 5, 2017
d71b1e4
Preps v13 release
ctrlplusb Apr 5, 2017
9c4c902
Update README.md
ctrlplusb Apr 6, 2017
71f7c4d
Update README.md
ctrlplusb Apr 6, 2017
a25a5d3
Updates dependencies.
ctrlplusb Apr 6, 2017
a97f6de
Merge branch 'master' of https://github.com/ctrlplusb/react-universally
ctrlplusb Apr 6, 2017
0e6642d
Update breaking changes
ctrlplusb Apr 7, 2017
ebee892
Adds birkir to contributors list
ctrlplusb Apr 7, 2017
d1f6f5b
Adds @birkir to contributors on about us route.
ctrlplusb Apr 7, 2017
f4f3766
Changes over to all-contributors
ctrlplusb Apr 7, 2017
db284ea
Orders contributors by name
ctrlplusb Apr 7, 2017
dbb8d0e
fix the "collectCoverageFrom" config of jest
ChinW Apr 13, 2017
ab73cb3
Merge pull request #418 from ChinW/master
birkir Apr 13, 2017
4cd7850
[merge next] solving conflicts
sergiokopplin Apr 13, 2017
c838107
updating asyncPosts
sergiokopplin Apr 14, 2017
09c2d0f
Prepare React 15.5 (#413)
birkir Apr 15, 2017
7ee3d42
Updates deps.
ctrlplusb Apr 15, 2017
94a61ec
Another bug fixes, tweaks (#422)
diondirza Apr 21, 2017
ef35285
Add es6 back by default. (#429)
birkir Apr 21, 2017
1f26e01
Windows (#415)
Apr 21, 2017
cc28bb0
merge with universally/master
sergiokopplin Apr 28, 2017
6d3bb1f
merge with universally/master - updating snapshots
sergiokopplin Apr 28, 2017
01b2fb1
merge/next - adding async posts
sergiokopplin Apr 29, 2017
9afd8b0
merge/next - updating dependencies + updating async components + remo…
sergiokopplin Apr 29, 2017
a6f6ec6
merge/next - updating server side state
sergiokopplin Apr 29, 2017
d173af3
merge/next - fixing server async functions
sergiokopplin Apr 30, 2017
a73f171
universally/merge - fixing async posts route
sergiokopplin May 2, 2017
04b0d23
chore: add redux, react-redux, redux-thunk to vendorDLL
May 2, 2017
e589803
Removes reference to deprecated react PropTypes import and replaces w…
May 3, 2017
912216e
update snapshot
May 3, 2017
9ee484c
next -> redux opinionated (#366)
sergiokopplin Jun 21, 2017
1eb5405
Merge remote-tracking branch 'upstream/feature/redux-opinionated' int…
Jul 12, 2017
18a15fd
brings the apollo branch up to date with redux-op.
Jul 12, 2017
4ed1ae5
dont import graphql
Jul 12, 2017
96a5e16
fix tests
Jul 12, 2017
956e554
Add comments to graphql. Setup hybrid batch/simple network interface.…
Jul 12, 2017
33b439b
Update deps. Expand code documentation for the rendering aspect of ad…
Jul 19, 2017
21fefd3
merge conflict resolution. update all deps.
Aug 10, 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
224 changes: 224 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
{
"projectName": "react-universally",
"projectOwner": "ctrlplusb",
"files": [
"README.md"
],
"imageSize": 100,
"commit": true,
"contributors": [
{
"login": "aoc",
"name": "Andrés Calabrese",
"avatar_url": "https://avatars3.githubusercontent.com/u/243161?v=3",
"profile": "https://github.com/aoc",
"contributions": [
"code"
]
},
{
"login": "andreyluiz",
"name": "Andrey Luiz",
"avatar_url": "https://avatars3.githubusercontent.com/u/1965897?v=3",
"profile": "https://andreyluiz.github.io/",
"contributions": [
"code"
]
},
{
"login": "alinporumb",
"name": "Alin Porumb",
"avatar_url": "https://avatars3.githubusercontent.com/u/3148205?v=3",
"profile": "https://github.com/alinporumb",
"contributions": [
"code"
]
},
{
"login": "bkniffler",
"name": "Benjamin Kniffler",
"avatar_url": "https://avatars0.githubusercontent.com/u/4349324?v=3",
"profile": "https://github.com/bkniffler",
"contributions": [
"code"
]
},
{
"login": "birkir",
"name": "Birkir Rafn Guðjónsson",
"avatar_url": "https://avatars0.githubusercontent.com/u/180773?v=3",
"profile": "https://medium.com/@birkir.gudjonsson",
"contributions": [
"question",
"bug",
"code",
"review"
]
},
{
"login": "carsonperrotti",
"name": "Carson Perrotti",
"avatar_url": "https://avatars0.githubusercontent.com/u/2063102?v=3",
"profile": "http://carsonperrotti.com",
"contributions": [
"question",
"code",
"doc",
"review"
]
},
{
"login": "LorbusChris",
"name": "Christian Glombek",
"avatar_url": "https://avatars1.githubusercontent.com/u/13365531?v=3",
"profile": "https://github.com/LorbusChris",
"contributions": [
"bug",
"code"
]
},
{
"login": "codepunkt",
"name": "Christoph Werner",
"avatar_url": "https://avatars3.githubusercontent.com/u/603683?v=3",
"profile": "https://twitter.com/code_punkt",
"contributions": [
"question",
"bug",
"code",
"review"
]
},
{
"login": "threehams",
"name": "David Edmondson",
"avatar_url": "https://avatars0.githubusercontent.com/u/1399894?v=3",
"profile": "https://github.com/threehams",
"contributions": [
"code"
]
},
{
"login": "diondirza",
"name": "Dion Dirza",
"avatar_url": "https://avatars0.githubusercontent.com/u/10954870?v=3",
"profile": "https://github.com/diondirza",
"contributions": [
"question",
"bug",
"code",
"doc",
"review"
]
},
{
"login": "evgenyboxer",
"name": "Evgeny Boxer",
"avatar_url": "https://avatars0.githubusercontent.com/u/254095?v=3",
"profile": "https://github.com/evgenyboxer",
"contributions": [
"bug",
"code"
]
},
{
"login": "kohlmannj",
"name": "Joe Kohlmann",
"avatar_url": "https://avatars2.githubusercontent.com/u/191304?v=3",
"profile": "http://kohlmannj.com",
"contributions": [
"bug",
"code"
]
},
{
"login": "lucianlature",
"name": "Lucian Lature",
"avatar_url": "https://avatars2.githubusercontent.com/u/24992?v=3",
"profile": "https://www.linkedin.com/in/lucianlature/",
"contributions": [
"bug",
"code",
"review"
]
},
{
"login": "markshlick",
"name": "Mark Shlick",
"avatar_url": "https://avatars1.githubusercontent.com/u/1624703?v=3",
"profile": "https://github.com/markshlick",
"contributions": [
"code"
]
},
{
"login": "rlindskog",
"name": "Ryan Lindskog",
"avatar_url": "https://avatars1.githubusercontent.com/u/7436773?v=3",
"profile": "https://www.RyanLindskog.com/",
"contributions": [
"code"
]
},
{
"login": "enten",
"name": "Steven Enten",
"avatar_url": "https://avatars1.githubusercontent.com/u/977713?v=3",
"profile": "http://enten.fr",
"contributions": [
"question",
"bug",
"code",
"review"
]
},
{
"login": "ctrlplusb",
"name": "Sean Matheson",
"avatar_url": "https://avatars1.githubusercontent.com/u/12164768?v=3",
"profile": "http://www.ctrlplusb.com",
"contributions": [
"question",
"bug",
"code",
"doc",
"example",
"review",
"test",
"tool"
]
},
{
"login": "strues",
"name": "Steven Truesdell",
"avatar_url": "https://avatars0.githubusercontent.com/u/6218853?v=3",
"profile": "https://steventruesdell.com",
"contributions": [
"question",
"bug",
"code",
"doc",
"test"
]
},
{
"login": "datoml",
"name": "Thomas Leitgeb",
"avatar_url": "https://avatars0.githubusercontent.com/u/10552487?v=3",
"profile": "https://twitter.com/_datoml",
"contributions": [
"bug",
"code"
]
},
{
"login": "tsnieman",
"name": "Tyler Nieman",
"avatar_url": "https://avatars0.githubusercontent.com/u/595711?v=3",
"profile": "http://tsnieman.net/",
"contributions": [
"code"
]
}
]
}
8 changes: 5 additions & 3 deletions .env_example
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
# ==============================================================================

# The host on which to run the server.
SERVER_HOST=localhost
HOST=localhost

# The port on which to run the server.
SERVER_PORT=1337
PORT=1337

# The port on which to run the client bundle dev server (i.e. used during
# development only).
CLIENT_DEVSERVER_PORT=7331
CLIENT_DEV_PORT=7331

GRAPHQL_URI=http://localhost:1337/graphql
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
flow-typed/
tools/flow/
node_modules/
build/
24 changes: 13 additions & 11 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{
"parser": "babel-eslint",
"extends": "airbnb",
"plugins": [
"flowtype"
],
"env": {
"browser": true,
"es6": true,
"node": true,
"jest": true
},
"ecmaFeatures": {
"defaultParams": true
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"defaultParams": true
}
},
"rules": {
// We use the 'import' plugin which allows for cases "flow" awareness.
"no-duplicate-imports": 0,
// A .jsx extension is not required for files containing jsx.
// A jsx extension is not required for files containing jsx
"react/jsx-filename-extension": 0,
// This rule struggles with flow and class properties.
// This rule struggles with flow and class properties
"react/sort-comp": 0,
// We use global requires in various places, e.g. code splitting instances.
"global-require": 0
// ignore linebreak style. the CRLF / LF endings wont matter
// if a windows user correctly converts CRLF to LF upon commits otherwise
// there are errors every line.
"linebreak-style": 0,
"jsx-a11y/href-no-hash": 0
}
}
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,8 @@ npm-debug.log
.vscode
.history

# flow-typed Lib Defs
flow-typed/

# Flow Coverage Report
flow-coverage/

# Happypack
.happypack

# OSX Files
.DS_Store
7 changes: 7 additions & 0 deletions .modernizrrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"minify": true,
"options": [],
"feature-detects": [
"elem/picture"
]
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.9.2
v6.11.1
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,47 @@ I'll map them as follows:
- Minor: New features or changes to the build tools. Could contain some things that are traditionally know as breaking changes, however, I believe the upgrade path to minor.
- Patch: Small(ish) fixes/restructuring that I expect will take minimal effort to merge in.

# [13.0.0] - 2017-04-05

### BREAKING

- Renames the 'development' command to 'develop'.
- Big folder structure refactor, moving items from src/* into the root of the project.
- Renames the CONF_ENV variable to DEPLOYMENT for targetting of .env.{environment} environment files.
- Upgrades to `react-router` v4.
- Replaces `code-split-component` with `react-async-component`
- Complete restructure of the DefinePlugin special flags, they have been prefixed with "BUILD_FLAG_" to make them more obvious when used in the code. This also helps us distinguish these build-time values from other runtime provided process.env values.
- Removes cross-env and refactors the script commands. You can assign NODE_ENV as and when you need now (for example, to target a .env.production environment configuration file).
- Renamed environment variables:
- `SERVER_PORT` to `PORT`
- `SERVER_HOST` to `HOST`
- `CLIENT_DEVSERVER_PORT` to `CLIENT_DEV_PORT`
- Renames the `nodeBundlesIncludeNodeModuleFileTypes` config property to `nodeExternalsFileTypeWhitelist`
- Refactors the server and serviceworker offline page generation. We now use a set of React components (`ServerHTML` and `HTML`) to manage our HTML in a uniform fashion.
- Refactors the client configuration filter rule to be contained within the main configuration and moves the configuration object creation into the server middleware.
- Refactors the config folder in various ways. Cleaning up, restructuring, etc.
- Renames the `environmentVars` file and helpers.
- Moves all the HTML head tags into the DemoApp helmet configuration.

### Changed

- All server/client/shared code all use the shared config helper.
- Updated dependencies, including to the latest Webpack official 2 release.

### Added

- New babel plugins to optimise React production build performance.
- Adds new icon sets.
- Prettier
- Some basic global styling via milligram

### Fixed

- Chrome favicon request issue.
- Cleans up the package scripts.
- Service worker would fail if a subfolder was added to the public folder.
- Tons of other things. :)

# [12.0.0] - 2017-01-09

### BREAKING
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Sean Matheson
Copyright (c) 2017 Sean Matheson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading