Merge pull request #150 from 30-seconds/yild-v2

Resolves #148
Resolves #145

.env.development

@@ -0,0 +1,2 @@
+ENV=development
+CACHE_KEY=dev_2020_08

.env.production

@@ -0,0 +1,2 @@
+ENV=production
+CACHE_KEY=30swp20200826234402

.gitignore

@@ -114,3 +114,4 @@ public
 .content
 content/data
 static/assets
+src/xml/sitemap.xml

.vscode/settings.json

@@ -0,0 +1,16 @@
+{
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": false,
+  "eslint.autoFixOnSave": true,
+  "git.detectSubmodules": false,
+  "editor.rulers": [
+    80
+  ],
+  "files.insertFinalNewline": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "diffEditor.ignoreTrimWhitespace": false,
+  "files.trimTrailingWhitespace": true
+}

content/configs/30blog.json

@@ -3,9 +3,6 @@
   "dirName": "30blog",
   "repoUrl": "https://github.com/30-seconds/30-seconds-blog",
   "snippetPath": "blog_posts",
-  "requirables": [
-    "blog_data/snippets.json"
-  ],
   "slug": "blog",
   "resolver": "blogResolver",
   "isBlog": true,
@@ -19,5 +16,6 @@
   "images": {
     "name": "blog_images",
     "path": "blog_images"
-  }
+  },
+  "cardTemplate": "BlogSnippetCard"
 }

content/configs/30code.json

@@ -3,9 +3,6 @@
   "dirName": "30code",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-code",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "js",
     "long": "JavaScript"

content/configs/30csharp.json

@@ -3,9 +3,6 @@
   "dirName": "30csharp",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-csharp",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "csharp",
     "long": "C#"

content/configs/30css.json

@@ -3,9 +3,6 @@
   "dirName": "30css",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-css",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "css",
     "long": "CSS"
@@ -26,5 +23,6 @@
     "foreColor": "#ffffff",
     "iconName": "css"
   },
-  "biasPenaltyMultiplier": 1.05
+  "biasPenaltyMultiplier": 1.05,
+  "cardTemplate": "CssSnippetCard"
 }

content/configs/30dart.json

@@ -3,9 +3,6 @@
   "dirName": "30dart",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-dart",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "dart",
     "long": "Dart"

content/configs/30golang.json

@@ -3,9 +3,6 @@
   "dirName": "30golang",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-golang",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "go",
     "long": "Go"

content/configs/30php.json

@@ -3,9 +3,6 @@
   "dirName": "30php",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-php",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "php",
     "long": "PHP"

content/configs/30python.json

@@ -3,9 +3,6 @@
   "dirName": "30python",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-python",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "py",
     "long": "Python"

content/configs/30react.json

@@ -3,9 +3,6 @@
   "dirName": "30react",
   "repoUrl": "https://github.com/30-seconds/30-seconds-of-react",
   "snippetPath": "snippets",
-  "requirables": [
-    "snippet_data/snippets.json"
-  ],
   "language": {
     "short": "jsx",
     "long": "React"

gatsby-config.js

@@ -11,7 +11,6 @@ module.exports = {
   },
   plugins: [
     `gatsby-plugin-resolve-src`,
-    `gatsby-plugin-sitemap`,
     {
       resolve: `gatsby-source-filesystem`,
       options: {

gatsby-node.js

@@ -1,29 +1,14 @@
-const { green } = require('kleur');
-const env = require('./.build/env').default;
-
+const { green } = require('chalk');
 const {
-  sourceNodes,
   createPages,
   onCreateWebpackConfig,
-} = require(`./src/build`);
-const {
-  parseQueries,
-  parseRequirables,
-  parseTemplates,
-} = require(`./src/build/parsers`);
-const paths = require(`./src/config/paths`);
-
-const requirables = parseRequirables(paths.contentPath);
-console.log(`${green('success')} parse requirables`);
-
-const templates = parseTemplates(env === 'DEVELOPMENT' ? paths.devTemplates : paths.templates, paths.templatesPath);
-console.log(`${green('success')} parse templates`);
-
-const pagesQuery = parseQueries(paths.queryPath);
-console.log(`${green('success')} parse queries`);
-
-exports.createPages = createPages(pagesQuery, templates, requirables);
+  onPostBuild,
+  parseRequirements,
+} = require(`./src/gatsby`);
 
-exports.sourceNodes = sourceNodes(requirables);
+const { requirables, templates} = parseRequirements();
+console.log(`${green('success')} parse requirements`);
 
+exports.createPages = createPages(templates, requirables);
 exports.onCreateWebpackConfig = onCreateWebpackConfig;
+exports.onPostBuild = onPostBuild;