From 3c77708279c7d4b88f4c4290f490220b2d8a1ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Daoust?= Date: Sun, 24 Jun 2018 10:49:33 +0200 Subject: [PATCH] [Framework] Bump version of fetch-filecache-for-crawling The new version follows HTTP cache expiration rules and let one control the expiration behavior more precisely. Note parameters now need to be explicitly set, the lib no longer reads them from `config.json` (that's a good thing, the lib shouldn't require the embedding app to use that pattern). --- package.json | 2 +- tools/extract-impl-data.js | 16 ++++++++++++++++ tools/extract-spec-data.js | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 11b7254b..8349641c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "web-roadmaps", "dependencies": { "ajv-cli": "^3.0.0", - "fetch-filecache-for-crawling": "^1.4.1", + "fetch-filecache-for-crawling": "^3.0.1", "jsdom": "^11.8.0", "mkdirp": "^0.5.1", "ncp": "^2.0.0" diff --git a/tools/extract-impl-data.js b/tools/extract-impl-data.js index e42ae9ab..d77e1840 100644 --- a/tools/extract-impl-data.js +++ b/tools/extract-impl-data.js @@ -629,6 +629,22 @@ module.exports.extractImplData = extractImplData; if (require.main === module) { + let config = {}; + try { + config = requireFromWorkingDirectory('config.json'); + } + catch (err) {} + + if (config.cacheFolder) { + fetch.setParameter('cacheFolder', config.cacheFolder); + } + if (config.cacheRefresh) { + fetch.setParameter('refresh', config.cacheRefresh); + } + if (config.logToConsole) { + fetch.setParameter('logToConsole', config.logToConsole); + } + const files = process.argv.slice(2).map(file => { let stat = fs.statSync(file); if (stat.isDirectory()) { diff --git a/tools/extract-spec-data.js b/tools/extract-spec-data.js index 144c9b31..f655f0f4 100644 --- a/tools/extract-spec-data.js +++ b/tools/extract-spec-data.js @@ -424,6 +424,16 @@ if (require.main === module) { } catch (err) {} + if (config.cacheFolder) { + fetch.setParameter('cacheFolder', config.cacheFolder); + } + if (config.cacheRefresh) { + fetch.setParameter('refresh', config.cacheRefresh); + } + if (config.logToConsole) { + fetch.setParameter('logToConsole', config.logToConsole); + } + // Read the W3C API key from the environment if defined there if (process.env.W3C_API_KEY) { config.w3cApiKey = process.env.W3C_API_KEY;