From 5a67bc642b4ad5bedf5f3450aa4d8a7dc62432f5 Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 4 Apr 2017 02:37:50 +1000 Subject: [PATCH 1/4] Replaced the dev script with webpack-watch-server. --- api/package.json | 8 +++----- api/scripts/dev.js | 49 ---------------------------------------------- 2 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 api/scripts/dev.js diff --git a/api/package.json b/api/package.json index 211041e..96d0d8e 100644 --- a/api/package.json +++ b/api/package.json @@ -21,15 +21,13 @@ "zoo": "^0.1.9" }, "devDependencies": { - "babel-cli": "^6.24.0", "babel-eslint": "^7.2.1", - "chalk": "^1.1.3", - "indent-string": "^3.1.0", - "standard": "^9.0.2" + "standard": "^9.0.2", + "webpack-watch-server": "^1.0.0" }, "scripts": { "lint": "standard", - "dev": "zoo babel-node scripts/dev", + "dev": "zoo webpack-watch-server", "build": "zoo webpack", "start": "zoo node dist" }, diff --git a/api/scripts/dev.js b/api/scripts/dev.js deleted file mode 100644 index 80b2761..0000000 --- a/api/scripts/dev.js +++ /dev/null @@ -1,49 +0,0 @@ -import 'source-map-support/register' -import {spawn} from 'child_process' -import chalk from 'chalk' -import indentString from 'indent-string' -import webpack from 'webpack' -import webpackConfig from '../webpack.config.babel' - -let serverProcess -let wasServerMessage - -function startServer () { - serverProcess = spawn('node', [webpackConfig.output.path]) - serverProcess.stdout.on('data', data => { - console.log((wasServerMessage ? '' : '\n') + indentString(chalk.white(data), 4)) - wasServerMessage = true - }) - serverProcess.stderr.on('data', data => { - console.error((wasServerMessage ? '' : '\n') + indentString(chalk.red(data), 4)) - wasServerMessage = true - }) -} - -function stopServer () { - if (serverProcess) serverProcess.kill() -} - -const compiler = webpack(webpackConfig) -const watcher = compiler.watch({}, (errors, stats) => { - const hasErrors = errors || stats.hasErrors() - console[hasErrors ? 'error' : 'log']((stats.toString('minimal'))) - wasServerMessage = false - - stopServer() - if (!hasErrors) startServer() -}) - -function exit () { - watcher.close() - stopServer() -} - -;[ - 'SIGINT', - 'SIGTERM', - 'SIGHUP', - 'SIGQUIT', - 'exit', - 'uncaughtException' -].forEach(event => process.on(event, exit)) From c9e72d26bec9b828e36425500adbf838863907d7 Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 4 Apr 2017 02:38:08 +1000 Subject: [PATCH 2/4] Updated dependencies. --- api/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package.json b/api/package.json index 96d0d8e..b2efe64 100644 --- a/api/package.json +++ b/api/package.json @@ -17,7 +17,7 @@ "koa-compress": "^2.0.0", "koa-router": "^7.1.1", "source-map-support": "^0.4.14", - "webpack": "^2.3.2", + "webpack": "^2.3.3", "zoo": "^0.1.9" }, "devDependencies": { From 5a935b6765b9d4b18ddfbc6b7b343ff2005f1d7b Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 4 Apr 2017 02:49:18 +1000 Subject: [PATCH 3/4] =?UTF-8?q?Renamed=20=E2=80=9Cclient=E2=80=9D=20?= =?UTF-8?q?=E2=80=9Capp=E2=80=9D=20for=20clarity.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was not intuitive that the “client” contained a client and server. --- api/readme.md | 2 +- {client => app}/.env.example | 0 {client => app}/.gitignore | 0 {client => app}/components/single-uploader.js | 0 {client => app}/helpers/with-data.js | 0 {client => app}/package.json | 2 +- {client => app}/pages/index.js | 0 {client => app}/readme.md | 4 ++-- readme.md | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename {client => app}/.env.example (100%) rename {client => app}/.gitignore (100%) rename {client => app}/components/single-uploader.js (100%) rename {client => app}/helpers/with-data.js (100%) rename {client => app}/package.json (94%) rename {client => app}/pages/index.js (100%) rename {client => app}/readme.md (55%) diff --git a/api/readme.md b/api/readme.md index f6ded8e..c6895cc 100644 --- a/api/readme.md +++ b/api/readme.md @@ -1,4 +1,4 @@ -# Apollo upload examples API +# Apollo upload example API An example GraphQL API using [Apollo upload server](https://github.com/jaydenseric/apollo-upload-server). diff --git a/client/.env.example b/app/.env.example similarity index 100% rename from client/.env.example rename to app/.env.example diff --git a/client/.gitignore b/app/.gitignore similarity index 100% rename from client/.gitignore rename to app/.gitignore diff --git a/client/components/single-uploader.js b/app/components/single-uploader.js similarity index 100% rename from client/components/single-uploader.js rename to app/components/single-uploader.js diff --git a/client/helpers/with-data.js b/app/helpers/with-data.js similarity index 100% rename from client/helpers/with-data.js rename to app/helpers/with-data.js diff --git a/client/package.json b/app/package.json similarity index 94% rename from client/package.json rename to app/package.json index 91c555c..43a4ef6 100644 --- a/client/package.json +++ b/app/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-upload-examples-client", + "name": "apollo-upload-examples-app", "private": true, "dependencies": { "apollo-upload-client": "^3.0.1", diff --git a/client/pages/index.js b/app/pages/index.js similarity index 100% rename from client/pages/index.js rename to app/pages/index.js diff --git a/client/readme.md b/app/readme.md similarity index 55% rename from client/readme.md rename to app/readme.md index db2cf61..19caebb 100644 --- a/client/readme.md +++ b/app/readme.md @@ -1,6 +1,6 @@ -# Apollo upload examples client +# Apollo upload example web application -An example [Next.js](https://github.com/zeit/next.js) [React Apollo client](http://dev.apollodata.com/react) using [Apollo upload client](https://github.com/jaydenseric/apollo-upload-client). +An example web application using [Next.js](https://github.com/zeit/next.js), [React Apollo client](http://dev.apollodata.com/react) and [Apollo upload client](https://github.com/jaydenseric/apollo-upload-client). ## Setup diff --git a/readme.md b/readme.md index e81d83e..e8da4ea 100644 --- a/readme.md +++ b/readme.md @@ -8,4 +8,4 @@ An example GraphQL API using [Apollo upload server](https://github.com/jaydenser ## Setup -See readmes in `/client` and `/api`. +See readmes in `/api` and `/app`. From 0d5ab6494d409a8a1bb813d770f76212e33d357d Mon Sep 17 00:00:00 2001 From: Jayden Seric Date: Tue, 4 Apr 2017 02:49:33 +1000 Subject: [PATCH 4/4] Version 1.0.1. --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e8da4ea..11b14dc 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# ![Apollo upload examples](https://cdn.rawgit.com/jaydenseric/apollo-upload-examples/v1.0.0/apollo-upload-logo.svg) +# ![Apollo upload examples](https://cdn.rawgit.com/jaydenseric/apollo-upload-examples/v1.0.1/apollo-upload-logo.svg) ![Github release](https://img.shields.io/github/release/jaydenseric/apollo-upload-examples.svg?style=flat-square) ![Github issues](https://img.shields.io/github/issues/jaydenseric/apollo-upload-examples.svg?style=flat-square) ![Github stars](https://img.shields.io/github/stars/jaydenseric/apollo-upload-examples.svg?style=flat-square)