Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

Commit

Permalink
fix publish
Browse files Browse the repository at this point in the history
  • Loading branch information
jgeschwendt committed Nov 13, 2018
1 parent c751b84 commit f7dc181
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 8 deletions.
16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,19 @@ deploy-master:
@make stop-docker
@docker run --env-file .env.master $(NODE_CONTAINER) yarn run tsc
@docker run --env-file .env.master $(NODE_CONTAINER) yarn run tslint
@docker run --env-file .env.master $(NODE_CONTAINER) yarn run build:static
@docker run --env-file .env.master $(NODE_CONTAINER) serverless deploy --stage master
@docker run --env-file .env.master $(NODE_CONTAINER) serverless client deploy --no-confirm --stage master
@docker run \
--env-file .env.master \
--env "BABEL_ENV=production" \
--env "NODE_ENV=production" \
$(NODE_CONTAINER) yarn run build:static
@docker run \
--env-file .env.master \
--env "BABEL_ENV=serverless" \
--env "NODE_ENV=production" \
$(NODE_CONTAINER) serverless deploy --stage master
@docker run \
--env-file .env.master \
$(NODE_CONTAINER) serverless client deploy --no-confirm --stage master

check:
@make tsc
Expand Down
8 changes: 6 additions & 2 deletions scripts/ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ if [ ${TRAVIS_BRANCH:-} == "master" ]; then
--env APP_DOMAIN_NAME=$APP_DOMAIN_NAME \
--env APP_HOSTED_ZONE=$APP_HOSTED_ZONE \
--env APP_SSL_CERT_ARN=$APP_SSL_CERT_ARN \
--env BABEL_ENV=production \
--env NODE_ENV=production \
--rm \
--tty \
--volume $TRAVIS_BUILD_DIR:/var/task \
Expand All @@ -29,11 +31,13 @@ if [ ${TRAVIS_BRANCH:-} == "master" ]; then
--env APP_DOMAIN_NAME=$APP_DOMAIN_NAME \
--env APP_HOSTED_ZONE=$APP_HOSTED_ZONE \
--env APP_SSL_CERT_ARN=$APP_SSL_CERT_ARN \
--env BABEL_ENV=serverless \
--env NODE_ENV=production \
--rm \
--tty \
--volume $TRAVIS_BUILD_DIR:/var/task \
--workdir /var/task \
$CONTAINER_NAME serverless client deploy --no-confirm --stage master
$CONTAINER_NAME serverless deploy --stage master

docker run \
--env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
Expand All @@ -47,7 +51,7 @@ if [ ${TRAVIS_BRANCH:-} == "master" ]; then
--tty \
--volume $TRAVIS_BUILD_DIR:/var/task \
--workdir /var/task \
$CONTAINER_NAME serverless deploy --stage master
$CONTAINER_NAME serverless client deploy --no-confirm --stage master

exit 0
fi
Expand Down
10 changes: 7 additions & 3 deletions src/app/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ import loadable from '@loadable/component'
import withTracker from './addons/withTracker'
import Main from './Root'

const Home = loadable(() => import('./containers/Home'))
const Page1 = loadable(() => import('./containers/Page1'))
const Page2 = loadable(() => import('./containers/Page2'))
import Home from './containers/Home'
import Page1 from './containers/Page1'
import Page2 from './containers/Page2'

// const Home = loadable(() => import('./containers/Home'))
// const Page1 = loadable(() => import('./containers/Page1'))
// const Page2 = loadable(() => import('./containers/Page2'))

const routes = [{
component: Main,
Expand Down
2 changes: 2 additions & 0 deletions src/platforms/lambda/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ export default async ({ location }) => {
const statsFile = process.env.IS_OFFLINE
? resolve('.webpack/service/loadable-stats.json')
: resolve('loadable-stats.json')

const store = createStore(reducer)
await client.resetStore() // the cache persists between lambda requests

const extractor = new ChunkExtractor({ entrypoints: [], statsFile })

const sheet = new ServerStyleSheet()

const content = await renderToStringWithData(
Expand Down

0 comments on commit f7dc181

Please sign in to comment.