Merge pull request #9 from SirPole/master

Update google-fonts-plugin to 3.0.0

.gitignore

@@ -30,6 +30,7 @@ _optimize
 coverage
 /*.js
 /*.js.map
+.idea
 !gatsby-config.js
 
 # Temporary

package.json

@@ -82,7 +82,8 @@
     "fs-extra": "^7.0.0",
     "get-urls": "^8.0.0",
     "globby": "^8.0.1",
-    "google-fonts-plugin": "^2.0.2",
+    "google-fonts-plugin": "^3.0.0",
+    "mkdirp": "^0.5.1",
     "object-hash": "^1.3.0"
   },
   "main": "gatsby-ssr.js",

plugins/export/download-css.js

@@ -1,4 +1,9 @@
+const fs = require('fs')
+const path = require('path')
 const GoogleFontsWebpackPlugin = require(`google-fonts-plugin`)
+const mkdirp = require('mkdirp')
+
+const outputDir = `.cache/google-fonts`
 
 module.exports = async ({
 	fonts,
@@ -13,10 +18,15 @@ module.exports = async ({
 	const googleFontsPlugin = new GoogleFontsWebpackPlugin({
 		fonts,
 		formats,
-		outputDir: `.cache/google-fonts`,
 		encode: false,
 		minify: false,
 		verbose: true,
 	})
-	await googleFontsPlugin.make()
-}
+
+	mkdirp.sync(outputDir)
+
+	for (const format of Object.values(googleFontsPlugin.options.formats)) {
+		let css = await this.requestFontsCSS(format);
+		fs.writeFileSync(path.join(outputDir, format + '.css'), css)
+	}
+}