Skip to content

Commit

Permalink
Bump deps, fix TRUSTED_PROXIES
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Jan 14, 2020
1 parent 0b08bfa commit 2a8bd50
Show file tree
Hide file tree
Showing 7 changed files with 4,054 additions and 3,267 deletions.
4 changes: 2 additions & 2 deletions admin/package.json
Expand Up @@ -3,8 +3,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@api-platform/admin": "^1.0.0",
"@babel/runtime": "7.0.0-beta.55",
"@api-platform/admin": "^2.0.0",
"@babel/runtime": "7.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-scripts": "^3.1.2"
Expand Down
4,121 changes: 2,264 additions & 1,857 deletions admin/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/.env
Expand Up @@ -20,7 +20,7 @@ VARNISH_URL=http://cache-proxy
###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=!ChangeMe!
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_HOSTS='^localhost|api$'
###< symfony/framework-bundle ###

Expand Down
48 changes: 25 additions & 23 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions api/symfony.lock
Expand Up @@ -17,10 +17,10 @@
]
},
"api-platform/schema-generator": {
"version": "v2.1.0"
"version": "v2.2.2"
},
"composer/semver": {
"version": "1.5.0"
"version": "1.5.1"
},
"composer/xdebug-handler": {
"version": "1.4.0"
Expand All @@ -44,7 +44,7 @@
"version": "1.6.4"
},
"doctrine/common": {
"version": "v2.11.0"
"version": "2.12.0"
},
"doctrine/dbal": {
"version": "v2.10.1"
Expand Down Expand Up @@ -93,16 +93,16 @@
"version": "1.2.0"
},
"doctrine/migrations": {
"version": "2.2.0"
"version": "2.2.1"
},
"doctrine/orm": {
"version": "v2.7.0"
},
"doctrine/persistence": {
"version": "1.3.3"
"version": "1.3.5"
},
"doctrine/reflection": {
"version": "v1.0.0"
"version": "v1.1.0"
},
"easyrdf/easyrdf": {
"version": "0.9.1"
Expand Down Expand Up @@ -165,7 +165,7 @@
"version": "1.5.1"
},
"ocramius/proxy-manager": {
"version": "2.2.3"
"version": "2.6.0"
},
"php": {
"version": "7.4"
Expand Down Expand Up @@ -463,7 +463,7 @@
"version": "v4.4.2"
},
"twig/twig": {
"version": "v2.12.3"
"version": "v3.0.1"
},
"webimpress/safe-writer": {
"version": "2.0.0"
Expand Down

1 comment on commit 2a8bd50

@teohhanhui
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why the dev-certs volume is mounted to node_modules/webpack-dev-server/ssl as rw?

Please sign in to comment.