More general cleanup

2019-01-06 19:42:41 -05:00 · 2019-01-06 19:42:41 -05:00 · f856feb2e5
parent 9351538abd
commit f856feb2e5
25 changed files with 73 additions and 93 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
-*/node_modules
-*.log
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +0,0 @@
-# 1.0.0
-
-Initial release
--- a/10
+++ b/10
@ -1,10 +0,0 @@
-FROM node:8.11.4
-
-WORKDIR /app/website
-
-EXPOSE 3000 35729
-COPY ./docs /app/docs
-COPY ./website /app/website
-RUN yarn install
-
-CMD ["yarn", "start"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,18 +0,0 @@
-version: "3"
-
-services:
-  docusaurus:
-    build: .
-    ports:
-      - 3000:3000
-      - 35729:35729
-    volumes:
-      - ./docs:/app/docs
-      - ./website/blog:/app/website/blog
-      - ./website/core:/app/website/core
-      - ./website/i18n:/app/website/i18n
-      - ./website/pages:/app/website/pages
-      - ./website/static:/app/website/static
-      - ./website/sidebars.json:/app/website/sidebars.json
-      - ./website/siteConfig.js:/app/website/siteConfig.js
-    working_dir: /app/website
--- a/examples/README.md
+++ b/examples/README.md
@ -1,14 +1,22 @@
 # GraphQL Nexus Examples

-All of these example can be run at once... from the root of the directory, call
+All of these example can be run at once:
+
+With Yarn:

 ```
+git clone https://github.com/graphql-nexus/nexus.git
+cd nexus
+yarn
 yarn examples
 ```

-or
+or NPM:

 ```
+git clone https://github.com/graphql-nexus/nexus.git
+cd nexus
+npm i
 npm run examples
 ```

--- a/examples/apollo-fullstack/package.json
+++ b/examples/apollo-fullstack/package.json
@ -15,9 +15,9 @@
    "apollo-server": "2.2.0-alpha.2",
    "apollo-server-testing": "2.2.0-alpha.2",
    "fullstack-tutorial": "apollographql/fullstack-tutorial.git",
-    "nexus": "0.5.0",
    "graphql": "^14.0.2",
    "isemail": "^3.2.0",
+    "nexus": "0.6.2",
    "sequelize": "^4.41.1",
    "sqlite3": "^4.0.4"
  },
--- a/examples/apollo-fullstack/src/fullstack-typegen.ts
+++ b/examples/apollo-fullstack/src/fullstack-typegen.ts
@ -12,16 +12,16 @@ declare global {
 }

 // Maybe Promise
-type MaybePromise<T> = T | PromiseLike<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;

 // Maybe Promise List
-type MaybePromiseList<T> = Array<MaybePromise<T>>;
+export type MaybePromiseList<T> = Array<MaybePromise<T>>;

 // Maybe Thunk
-type MaybeThunk<T> = T | (() => T);
+export type MaybeThunk<T> = T | (() => T);

 // Maybe Thunk, with args
-type MaybeThunkArgs<T, A> = T | ((args?: A) => T);
+export type MaybeThunkArgs<T, A> = T | ((args?: A) => T);

 export type QueryLaunchReturnType = Launch_ReturnType;

--- a/examples/apollo-fullstack/yarn.lock
+++ b/examples/apollo-fullstack/yarn.lock
@ -4537,10 +4537,10 @@ netrc-parser@^3.1.4:
    debug "^3.1.0"
    execa "^0.10.0"

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"

--- a/examples/githunt-api/package.json
+++ b/examples/githunt-api/package.json
@ -6,8 +6,8 @@
  "dependencies": {
    "apollo-server": "2.2.0-alpha.2",
    "githunt-api": "apollographql/GitHunt-API.git",
-    "nexus": "0.5.0",
-    "graphql": "^14.0.2"
+    "graphql": "^14.0.2",
+    "nexus": "0.6.2"
  },
  "devDependencies": {
    "nodemon": "^1.18.6",
--- a/examples/githunt-api/src/githunt-typegen.ts
+++ b/examples/githunt-api/src/githunt-typegen.ts
@ -12,16 +12,16 @@ declare global {
 }

 // Maybe Promise
-type MaybePromise<T> = T | PromiseLike<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;

 // Maybe Promise List
-type MaybePromiseList<T> = Array<MaybePromise<T>>;
+export type MaybePromiseList<T> = Array<MaybePromise<T>>;

 // Maybe Thunk
-type MaybeThunk<T> = T | (() => T);
+export type MaybeThunk<T> = T | (() => T);

 // Maybe Thunk, with args
-type MaybeThunkArgs<T, A> = T | ((args?: A) => T);
+export type MaybeThunkArgs<T, A> = T | ((args?: A) => T);

 export type QueryCurrentUserReturnType = User_ReturnType;

--- a/examples/githunt-api/yarn.lock
+++ b/examples/githunt-api/yarn.lock
@ -3484,10 +3484,10 @@ negotiator@0.6.1:
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"

--- a/examples/kitchen-sink/package.json
+++ b/examples/kitchen-sink/package.json
@ -6,8 +6,8 @@
  },
  "dependencies": {
    "apollo-server": "^2.2.0",
-    "nexus": "0.5.0",
    "graphql": "^14.0.2",
+    "nexus": "0.6.2",
    "ts-node-dev": "^1.0.0-pre.30"
  },
  "devDependencies": {
--- a/examples/kitchen-sink/src/kitchen-sink-typegen.ts
+++ b/examples/kitchen-sink/src/kitchen-sink-typegen.ts
@ -12,16 +12,16 @@ declare global {
 }

 // Maybe Promise
-type MaybePromise<T> = T | PromiseLike<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;

 // Maybe Promise List
-type MaybePromiseList<T> = Array<MaybePromise<T>>;
+export type MaybePromiseList<T> = Array<MaybePromise<T>>;

 // Maybe Thunk
-type MaybeThunk<T> = T | (() => T);
+export type MaybeThunk<T> = T | (() => T);

 // Maybe Thunk, with args
-type MaybeThunkArgs<T, A> = T | ((args?: A) => T);
+export type MaybeThunkArgs<T, A> = T | ((args?: A) => T);

 export type QueryOkReturnType = boolean;

--- a/examples/kitchen-sink/yarn.lock
+++ b/examples/kitchen-sink/yarn.lock
@ -3266,10 +3266,10 @@ negotiator@0.6.1:
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"

--- a/examples/star-wars/package.json
+++ b/examples/star-wars/package.json
@ -6,8 +6,8 @@
  },
  "dependencies": {
    "apollo-server": "^2.2.0",
-    "nexus": "0.5.0",
    "graphql": "^14.0.2",
+    "nexus": "0.6.2",
    "ts-node-dev": "^1.0.0-pre.30"
  },
  "devDependencies": {
--- a/examples/star-wars/src/star-wars-typegen.ts
+++ b/examples/star-wars/src/star-wars-typegen.ts
@ -12,16 +12,16 @@ declare global {
 }

 // Maybe Promise
-type MaybePromise<T> = T | PromiseLike<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;

 // Maybe Promise List
-type MaybePromiseList<T> = Array<MaybePromise<T>>;
+export type MaybePromiseList<T> = Array<MaybePromise<T>>;

 // Maybe Thunk
-type MaybeThunk<T> = T | (() => T);
+export type MaybeThunk<T> = T | (() => T);

 // Maybe Thunk, with args
-type MaybeThunkArgs<T, A> = T | ((args?: A) => T);
+export type MaybeThunkArgs<T, A> = T | ((args?: A) => T);

 export type QueryDroidReturnType = Droid_ReturnType;

--- a/examples/star-wars/yarn.lock
+++ b/examples/star-wars/yarn.lock
@ -3266,10 +3266,10 @@ negotiator@0.6.1:
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"

--- a/examples/ts-ast-reader/package.json
+++ b/examples/ts-ast-reader/package.json
@ -7,8 +7,8 @@
  "dependencies": {
    "apollo-server": "^2.2.5",
    "fs-extra": "^7.0.1",
-    "nexus": "0.5.0",
    "graphql": "^14.0.2",
+    "nexus": "0.6.2",
    "ts-node-dev": "1.0.0-pre.31",
    "typescript": "3.2.0-rc"
  },
--- a/examples/ts-ast-reader/src/ts-ast-reader-typegen.ts
+++ b/examples/ts-ast-reader/src/ts-ast-reader-typegen.ts
@ -13,16 +13,16 @@ declare global {
 }

 // Maybe Promise
-type MaybePromise<T> = T | PromiseLike<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;

 // Maybe Promise List
-type MaybePromiseList<T> = Array<MaybePromise<T>>;
+export type MaybePromiseList<T> = Array<MaybePromise<T>>;

 // Maybe Thunk
-type MaybeThunk<T> = T | (() => T);
+export type MaybeThunk<T> = T | (() => T);

 // Maybe Thunk, with args
-type MaybeThunkArgs<T, A> = T | ((args?: A) => T);
+export type MaybeThunkArgs<T, A> = T | ((args?: A) => T);

 export type QueryParseFileReturnType = SourceFile_ReturnType;

--- a/examples/ts-ast-reader/yarn.lock
+++ b/examples/ts-ast-reader/yarn.lock
@ -1251,10 +1251,10 @@ negotiator@0.6.1:
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"

--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@ -41,7 +41,8 @@
    "links": {
      "Docs": "Docs",
      "API": "API",
-      "Playground": "Playground"
+      "Playground": "Playground",
+      "Examples": "Examples"
    },
    "categories": {
      "Documentation": "Documentation"
--- a/website/package.json
+++ b/website/package.json
@ -13,9 +13,9 @@
  },
  "dependencies": {
    "dedent": "^0.7.0",
-    "nexus": "0.5.0",
    "graphql": "^14.0.2",
    "monaco-editor": "^0.15.5",
+    "nexus": "0.6.2",
    "react": "^16.7.0-alpha.2",
    "react-dom": "^16.7.0-alpha.2"
  },
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@ -14,7 +14,7 @@ const siteConfig = {
  tagline:
    "Simple, scalable, strongly typed GraphQL schema construction for TypeScript/JavaScript",
  // url: "https://tgriesser.com", // Your website URL
-  baseUrl: "/nexus/", // Base URL for your project */
+  baseUrl: "/", // Base URL for your project */
  noIndex: true,

  // algolia: {
@ -32,6 +32,10 @@ const siteConfig = {
    { doc: "getting-started", label: "Docs" },
    { page: "api-reference", label: "API" },
    { page: "playground", label: "Playground" },
+    {
+      href: "https://github.com/graphql-nexus/nexus/tree/develop/examples",
+      label: "Examples",
+    },
  ],

  // If you have users set above, you add it here:
@ -74,13 +78,13 @@ const siteConfig = {
  scripts: [
    "https://buttons.github.io/buttons.js",
    "https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.0/clipboard.min.js",
-    "/nexus/js/api-docs.js",
-    "/nexus/js/code-block-buttons.js",
-    "/nexus/js/code-block-toggle.js",
+    "/js/api-docs.js",
+    "/js/code-block-buttons.js",
+    "/js/code-block-toggle.js",
  ],
  stylesheets: [
    "https://cdnjs.cloudflare.com/ajax/libs/prism/1.15.0/themes/prism.css",
-    "/nexus/css/code-block-buttons.css",
+    "/css/code-block-buttons.css",
  ],

  // On page navigation for the current documentation page.
--- a/website/webpack.config.js
+++ b/website/webpack.config.js
@ -14,7 +14,7 @@ module.exports = {
    playground: "./playground/index.tsx",
  },
  output: {
-    publicPath: "/nexus/playground-dist/",
+    publicPath: "/playground-dist/",
    filename: "[name].js",
    path: __dirname + "/static/playground-dist",
  },
--- a/website/yarn.lock
+++ b/website/yarn.lock
@ -5016,10 +5016,10 @@ neo-async@^2.5.0:
  version "2.6.0"
  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"

-nexus@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.5.0.tgz#9d72fac4a4a93351fbbcc70885a25952238f6456"
-  integrity sha512-weZcOr0M6dkMeB4n0LhPpaRmRz0GSaS0Y4IKWnrMdEobsZzaay+tnWpMfJA3lytcydVN0W8COfwqLjKs8sXDUg==
+nexus@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nexus/-/nexus-0.6.2.tgz#d6901aacf36f59420fe56df31182fa37534906fd"
+  integrity sha512-Ax/zIdmgyvsIRAqLjdp5BCsm4H6y+2QCA2+AQGpX/f0E0k4pL64chny9W5t1vMBUtnjG5f5vBM3XE66Y7BQTgA==
  dependencies:
    tslib "^1.9.3"