From 70818322f7023ecf494a2026eab57a0a08a553e2 Mon Sep 17 00:00:00 2001 From: Trevor Blades Date: Tue, 5 Feb 2019 13:51:08 -0800 Subject: [PATCH] Move theme to packages dir and use lerna --- .gitignore | 5 +- .gitmodules | 2 +- lerna.json | 6 +++ package.json | 44 ++--------------- .../gatsby-theme-apollo/gatsby-config.js | 0 .../gatsby-theme-apollo/gatsby-node.js | 0 .../gatsby-theme-apollo/gatsby-ssr.js | 0 .../gatsby-theme-apollo/index.js | 0 .../gatsby-theme-apollo/package-lock.json | 0 packages/gatsby-theme-apollo/package.json | 45 ++++++++++++++++++ .../src}/components/header.js | 0 .../src}/components/layout.js | 0 .../src}/components/sidebar.js | 0 .../gatsby-theme-apollo/src}/pages/404.js | 0 .../src}/templates/docs/index.js | 0 .../src}/templates/docs/page-content.js | 0 .../src}/templates/docs/search.js | 0 .../templates/docs/sidebar-nav/directory.js | 0 .../src}/templates/docs/sidebar-nav/index.js | 0 .../src}/templates/docs/version-select.js | 0 .../src}/util/code-to-hast.js | 0 .../gatsby-theme-apollo/src}/util/colors.js | 0 .../src}/util/find-headings.js | 0 .../src}/util/typography.js | 0 .../gatsby-theme-apollo/static}/favicon.ico | Bin .../gatsby-theme-apollo/ui/logo-small.svg | 4 ++ packages/gatsby-theme-apollo/ui/logo.svg | 3 ++ ui | 1 - 28 files changed, 63 insertions(+), 47 deletions(-) create mode 100644 lerna.json rename gatsby-config.js => packages/gatsby-theme-apollo/gatsby-config.js (100%) rename gatsby-node.js => packages/gatsby-theme-apollo/gatsby-node.js (100%) rename gatsby-ssr.js => packages/gatsby-theme-apollo/gatsby-ssr.js (100%) rename index.js => packages/gatsby-theme-apollo/index.js (100%) rename package-lock.json => packages/gatsby-theme-apollo/package-lock.json (100%) create mode 100644 packages/gatsby-theme-apollo/package.json rename {src => packages/gatsby-theme-apollo/src}/components/header.js (100%) rename {src => packages/gatsby-theme-apollo/src}/components/layout.js (100%) rename {src => packages/gatsby-theme-apollo/src}/components/sidebar.js (100%) rename {src => packages/gatsby-theme-apollo/src}/pages/404.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/index.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/page-content.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/search.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/sidebar-nav/directory.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/sidebar-nav/index.js (100%) rename {src => packages/gatsby-theme-apollo/src}/templates/docs/version-select.js (100%) rename {src => packages/gatsby-theme-apollo/src}/util/code-to-hast.js (100%) rename {src => packages/gatsby-theme-apollo/src}/util/colors.js (100%) rename {src => packages/gatsby-theme-apollo/src}/util/find-headings.js (100%) rename {src => packages/gatsby-theme-apollo/src}/util/typography.js (100%) rename {static => packages/gatsby-theme-apollo/static}/favicon.ico (100%) create mode 100644 packages/gatsby-theme-apollo/ui/logo-small.svg create mode 100644 packages/gatsby-theme-apollo/ui/logo.svg delete mode 160000 ui diff --git a/.gitignore b/.gitignore index c6585f52..3c3629e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -.cache -.env -public -node_modules \ No newline at end of file +node_modules diff --git a/.gitmodules b/.gitmodules index 1f354735..18662f31 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ui"] - path = ui + path = packages/gatsby-theme-apollo/ui url = https://github.com/apollographql/ui diff --git a/lerna.json b/lerna.json new file mode 100644 index 00000000..a2bb50ba --- /dev/null +++ b/lerna.json @@ -0,0 +1,6 @@ +{ + "packages": [ + "packages/*" + ], + "version": "independent" +} diff --git a/package.json b/package.json index 39466e53..3ee74dfa 100644 --- a/package.json +++ b/package.json @@ -1,45 +1,7 @@ { - "name": "gatsby-theme-apollo", - "version": "0.0.48", - "main": "index.js", - "scripts": { - "develop": "gatsby develop", - "start": "npm run develop", - "build": "gatsby build", - "serve": "gatsby serve" - }, - "dependencies": { - "@emotion/core": "^10.0.6", - "@emotion/styled": "^10.0.6", - "@svgr/webpack": "^4.1.0", - "detab": "^2.0.1", - "emotion": "^10.0.2", - "gatsby": "^2.0.91", - "gatsby-plugin-emotion": "^4.0.1", - "gatsby-plugin-react-helmet": "^3.0.2", - "gatsby-plugin-svgr": "^2.0.1", - "gatsby-plugin-typography": "^2.2.2", - "gray-matter": "^4.0.1", - "js-yaml": "^3.12.1", - "polished": "^2.3.3", - "prismjs": "^1.15.0", - "prop-types": "^15.6.2", - "react": "^16.6.3", - "react-dom": "^16.6.3", - "react-helmet": "^5.2.0", - "react-icons": "^3.3.0", - "react-typography": "^0.16.13", - "recompose": "^0.30.0", - "remark": "^10.0.1", - "remark-react": "^5.0.1", - "remark-slug": "^5.1.1", - "simple-git": "^1.107.0", - "typography": "^0.16.17", - "unist-builder": "^1.0.3" - }, + "name": "root", + "private": true, "devDependencies": { - "@trevorblades/eslint-config": "^6.19.2", - "babel-eslint": "^10.0.1", - "eslint": "^5.9.0" + "lerna": "^3.10.7" } } diff --git a/gatsby-config.js b/packages/gatsby-theme-apollo/gatsby-config.js similarity index 100% rename from gatsby-config.js rename to packages/gatsby-theme-apollo/gatsby-config.js diff --git a/gatsby-node.js b/packages/gatsby-theme-apollo/gatsby-node.js similarity index 100% rename from gatsby-node.js rename to packages/gatsby-theme-apollo/gatsby-node.js diff --git a/gatsby-ssr.js b/packages/gatsby-theme-apollo/gatsby-ssr.js similarity index 100% rename from gatsby-ssr.js rename to packages/gatsby-theme-apollo/gatsby-ssr.js diff --git a/index.js b/packages/gatsby-theme-apollo/index.js similarity index 100% rename from index.js rename to packages/gatsby-theme-apollo/index.js diff --git a/package-lock.json b/packages/gatsby-theme-apollo/package-lock.json similarity index 100% rename from package-lock.json rename to packages/gatsby-theme-apollo/package-lock.json diff --git a/packages/gatsby-theme-apollo/package.json b/packages/gatsby-theme-apollo/package.json new file mode 100644 index 00000000..39466e53 --- /dev/null +++ b/packages/gatsby-theme-apollo/package.json @@ -0,0 +1,45 @@ +{ + "name": "gatsby-theme-apollo", + "version": "0.0.48", + "main": "index.js", + "scripts": { + "develop": "gatsby develop", + "start": "npm run develop", + "build": "gatsby build", + "serve": "gatsby serve" + }, + "dependencies": { + "@emotion/core": "^10.0.6", + "@emotion/styled": "^10.0.6", + "@svgr/webpack": "^4.1.0", + "detab": "^2.0.1", + "emotion": "^10.0.2", + "gatsby": "^2.0.91", + "gatsby-plugin-emotion": "^4.0.1", + "gatsby-plugin-react-helmet": "^3.0.2", + "gatsby-plugin-svgr": "^2.0.1", + "gatsby-plugin-typography": "^2.2.2", + "gray-matter": "^4.0.1", + "js-yaml": "^3.12.1", + "polished": "^2.3.3", + "prismjs": "^1.15.0", + "prop-types": "^15.6.2", + "react": "^16.6.3", + "react-dom": "^16.6.3", + "react-helmet": "^5.2.0", + "react-icons": "^3.3.0", + "react-typography": "^0.16.13", + "recompose": "^0.30.0", + "remark": "^10.0.1", + "remark-react": "^5.0.1", + "remark-slug": "^5.1.1", + "simple-git": "^1.107.0", + "typography": "^0.16.17", + "unist-builder": "^1.0.3" + }, + "devDependencies": { + "@trevorblades/eslint-config": "^6.19.2", + "babel-eslint": "^10.0.1", + "eslint": "^5.9.0" + } +} diff --git a/src/components/header.js b/packages/gatsby-theme-apollo/src/components/header.js similarity index 100% rename from src/components/header.js rename to packages/gatsby-theme-apollo/src/components/header.js diff --git a/src/components/layout.js b/packages/gatsby-theme-apollo/src/components/layout.js similarity index 100% rename from src/components/layout.js rename to packages/gatsby-theme-apollo/src/components/layout.js diff --git a/src/components/sidebar.js b/packages/gatsby-theme-apollo/src/components/sidebar.js similarity index 100% rename from src/components/sidebar.js rename to packages/gatsby-theme-apollo/src/components/sidebar.js diff --git a/src/pages/404.js b/packages/gatsby-theme-apollo/src/pages/404.js similarity index 100% rename from src/pages/404.js rename to packages/gatsby-theme-apollo/src/pages/404.js diff --git a/src/templates/docs/index.js b/packages/gatsby-theme-apollo/src/templates/docs/index.js similarity index 100% rename from src/templates/docs/index.js rename to packages/gatsby-theme-apollo/src/templates/docs/index.js diff --git a/src/templates/docs/page-content.js b/packages/gatsby-theme-apollo/src/templates/docs/page-content.js similarity index 100% rename from src/templates/docs/page-content.js rename to packages/gatsby-theme-apollo/src/templates/docs/page-content.js diff --git a/src/templates/docs/search.js b/packages/gatsby-theme-apollo/src/templates/docs/search.js similarity index 100% rename from src/templates/docs/search.js rename to packages/gatsby-theme-apollo/src/templates/docs/search.js diff --git a/src/templates/docs/sidebar-nav/directory.js b/packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/directory.js similarity index 100% rename from src/templates/docs/sidebar-nav/directory.js rename to packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/directory.js diff --git a/src/templates/docs/sidebar-nav/index.js b/packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/index.js similarity index 100% rename from src/templates/docs/sidebar-nav/index.js rename to packages/gatsby-theme-apollo/src/templates/docs/sidebar-nav/index.js diff --git a/src/templates/docs/version-select.js b/packages/gatsby-theme-apollo/src/templates/docs/version-select.js similarity index 100% rename from src/templates/docs/version-select.js rename to packages/gatsby-theme-apollo/src/templates/docs/version-select.js diff --git a/src/util/code-to-hast.js b/packages/gatsby-theme-apollo/src/util/code-to-hast.js similarity index 100% rename from src/util/code-to-hast.js rename to packages/gatsby-theme-apollo/src/util/code-to-hast.js diff --git a/src/util/colors.js b/packages/gatsby-theme-apollo/src/util/colors.js similarity index 100% rename from src/util/colors.js rename to packages/gatsby-theme-apollo/src/util/colors.js diff --git a/src/util/find-headings.js b/packages/gatsby-theme-apollo/src/util/find-headings.js similarity index 100% rename from src/util/find-headings.js rename to packages/gatsby-theme-apollo/src/util/find-headings.js diff --git a/src/util/typography.js b/packages/gatsby-theme-apollo/src/util/typography.js similarity index 100% rename from src/util/typography.js rename to packages/gatsby-theme-apollo/src/util/typography.js diff --git a/static/favicon.ico b/packages/gatsby-theme-apollo/static/favicon.ico similarity index 100% rename from static/favicon.ico rename to packages/gatsby-theme-apollo/static/favicon.ico diff --git a/packages/gatsby-theme-apollo/ui/logo-small.svg b/packages/gatsby-theme-apollo/ui/logo-small.svg new file mode 100644 index 00000000..5aee8f11 --- /dev/null +++ b/packages/gatsby-theme-apollo/ui/logo-small.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packages/gatsby-theme-apollo/ui/logo.svg b/packages/gatsby-theme-apollo/ui/logo.svg new file mode 100644 index 00000000..0ccc2f68 --- /dev/null +++ b/packages/gatsby-theme-apollo/ui/logo.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ui b/ui deleted file mode 160000 index 5083537e..00000000 --- a/ui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5083537e45d44a23bb3edfe4373f95f2c7262df3