Merge branch 'master' of https://github.com/pizzafox/netlify-cache-nextjs

Author: jonahsnider

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Install dependencies with Yarn
         run: yarn install
       - name: Lint with XO
-        run: yarn run xo
+        run: yarn run lint
   style:
     name: Check style
 

package.json

@@ -8,7 +8,7 @@
 		"url": "https://github.com/pizzafox/netlify-cache-nextjs/issues"
 	},
 	"dependencies": {
-		"@netlify/cache-utils": "^0.2.4"
+		"@netlify/cache-utils": "^0.2.8"
 	},
 	"devDependencies": {
 		"prettier": "^1.19.1",
@@ -17,7 +17,7 @@
 		"xo": "^0.28.1"
 	},
 	"engines": {
-		"node": "12"
+		"node": ">=8.3.0"
 	},
 	"keywords": [
 		"netlify",

src/index.ts

@@ -8,8 +8,11 @@ interface NetlifyUtils {
 }
 
 interface NetlifyInputs {
+	// The TOML config uses camelcase for readability and because it's convention
+	/* eslint-disable camelcase */
 	custom_build_dir_name?: string;
 	build_dir_path?: string;
+	/* eslint-enable camelcase */
 }
 
 interface NetlifyOpts {
@@ -58,9 +61,7 @@ module.exports = {
 	//  - the file/directory has not been cached yet
 	async onPreBuild({utils, netlifyConfig, inputs}: NetlifyOpts) {
 		const paths = generateAbsolutePaths({netlifyConfig, inputs});
-		const success = await utils.cache.restore(paths.absolute.buildDir, {
-			digest: [paths.absolute.manifest]
-		});
+		const success = await utils.cache.restore(paths.absolute.buildDir);
 
 		if (success) {
 			console.log(`Restored the cached ${paths.buildDirName} folder at the location \`${paths.absolute.buildDir}\``);

yarn.lock

@@ -42,19 +42,18 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@netlify/cache-utils@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@netlify/cache-utils/-/cache-utils-0.2.4.tgz#78325ccf4446c5ba341516789ee72920e68b7b85"
-  integrity sha512-qySES6dAxYHxj90gKvHKJ+dX7SdtcjsYPTQopgp2kcW7CdNxoPZsTM3lpTr2JSvz6jzo/tUGv9jexk14MALDNw==
+"@netlify/cache-utils@^0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@netlify/cache-utils/-/cache-utils-0.2.8.tgz#c7ba3389853ea6611530b1361095858711290eee"
+  integrity sha512-gH04KLAnAs3HR/AGojWjFfvHbSSmypRZ7K7ca1r19agobjcH+IWrYLxHDcd1HtnvIpitWAYlT4YYGOajr1ywKg==
   dependencies:
     array-flat-polyfill "^1.0.1"
     cpy "^8.0.0"
     del "^5.1.0"
     get-stream "^5.1.0"
     global-cache-dir "^1.0.1"
-    junk "^3.1.0"
+    locate-path "^5.0.0"
     move-file "^1.2.0"
-    p-map "^3.0.0"
     path-exists "^4.0.0"
     readdirp "^3.4.0"