chore(themes): move themes into starters and packages (gatsbyjs#18794)

* Move theme starters into starters

* Move themes into packages

* Remove themes directory

* Cleaned up the renovate config

* Cleaned up the lerna config

* Cleaned up the CI config

* Exclude theme starters from markdown-magic

* Cleaned up themes package.json

* fix dependencies in yarn.lock

* add missing peer dependency

Author: vladar

.circleci/config.yml

@@ -224,8 +224,8 @@ jobs:
     executor: node
     steps:
       - checkout
-      - run: ./scripts/assert-changed-files.sh "starters/*|themes/gatsby-starter-*|.circleci/*"
-      - run: sh ./scripts/validate-starters.sh "starters/* themes/gatsby-starter-*"
+      - run: ./scripts/assert-changed-files.sh "starters/*|.circleci/*"
+      - run: sh ./scripts/validate-starters.sh "starters/*"
 
   starters_publish:
     executor: node
@@ -238,7 +238,7 @@ jobs:
       - run: sudo apt-get update && sudo apt-get install jq # jq is helpful for parsing json
       - run: git config --global user.name "GatsbyJS Bot"
       - run: git config --global user.email "[email protected]"
-      - run: sh ./scripts/publish-starters.sh "starters/* themes/gatsby-starter-*"
+      - run: sh ./scripts/publish-starters.sh "starters/*"
 
   build_www:
     docker:

lerna.json

@@ -10,7 +10,7 @@
       "message": "chore(release): Publish"
     }
   },
-  "packages": ["packages/*", "/gatsby-theme-*"],
+  "packages": ["packages/*"],
   "loglevel": "success",
   "version": "independent",
   "npmClient": "yarn",

markdown.config.js

@@ -9,6 +9,8 @@ module.exports = {
       const starters = fs
         .readdirSync(base)
         .filter(dir => fs.statSync(path.join(base, dir)).isDirectory())
+        // theme starters have their own README so skip those
+        .filter(dir => !dir.includes(`theme`))
         .reduce((merged, dir) => {
           merged[dir] = JSON.parse(
             fs.readFileSync(path.join(base, dir, `package.json`), `utf8`)

themes/gatsby-theme-blog-core/README.md renamed to packages/gatsby-theme-blog-core/README.md

@@ -4,6 +4,12 @@
   "main": "index.js",
   "author": "christopherbiscardi <[email protected]> (@chrisbiscardi)",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/gatsbyjs/gatsby.git",
+    "directory": "packages/gatsby-theme-blog-core"
+  },
+  "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-blog-core#readme",
   "peerDependencies": {
     "@mdx-js/react": "^1.0.27",
     "gatsby": "^2.13.13",

themes/gatsby-theme-blog-core/gatsby-config.js renamed to packages/gatsby-theme-blog-core/gatsby-config.js

@@ -14,9 +14,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/gatsbyjs/gatsby.git",
-    "directory": "themes/gatsby-theme-blog"
+    "directory": "packages/gatsby-theme-blog"
   },
-  "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-blog#readme",
+  "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-blog#readme",
   "dependencies": {
     "@emotion/core": "^10.0.21",
     "@mdx-js/react": "^1.5.1",

themes/gatsby-theme-blog-core/gatsby-node.js renamed to packages/gatsby-theme-blog-core/gatsby-node.js

@@ -16,9 +16,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/gatsbyjs/gatsby.git",
-    "directory": "themes/gatsby-theme-notes"
+    "directory": "packages/gatsby-theme-notes"
   },
-  "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-notes#readme",
+  "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-notes#readme",
   "devDependencies": {
     "gatsby": "^2.16.1",
     "react": "^16.10.2",

themes/gatsby-theme-blog-core/index.js renamed to packages/gatsby-theme-blog-core/index.js

@@ -3,7 +3,6 @@
   "includePaths": [
     "package.json",
     "starters/**",
-    "themes/**",
     "packages/**",
     "www/package.json"
   ],

themes/gatsby-theme-blog-core/package.json renamed to packages/gatsby-theme-blog-core/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "gatsby": "^2.16.1",
     "gatsby-theme-blog-core": "^1.0.0",
+    "@mdx-js/react": "^1.0.27",
     "react": "^16.10.2",
     "react-dom": "^16.10.2"
   }