diff --git a/lists/icann.complete.js b/lists/icann.complete.js index 2b331e9..89e014f 100644 --- a/lists/icann.complete.js +++ b/lists/icann.complete.js @@ -2,4 +2,4 @@ const parseTrie = require("../lib/tries/parseTrie"); -module.exports = parseTrie(require("../build/tries/current/icann.complete.json").trie); +module.exports = parseTrie(require("../build/tries/icann.complete.json").trie); diff --git a/lists/icann.light.js b/lists/icann.light.js index 2228da7..ff885f1 100644 --- a/lists/icann.light.js +++ b/lists/icann.light.js @@ -2,4 +2,4 @@ const parseTrie = require("../lib/tries/parseTrie"); -module.exports = parseTrie(require("../build/tries/current/icann.light.json").trie); +module.exports = parseTrie(require("../build/tries/icann.light.json").trie); diff --git a/lists/private.complete.js b/lists/private.complete.js index daa0999..5c13af7 100644 --- a/lists/private.complete.js +++ b/lists/private.complete.js @@ -2,4 +2,4 @@ const parseTrie = require("../lib/tries/parseTrie"); -module.exports = parseTrie(require("../build/tries/current/private.complete.json").trie); +module.exports = parseTrie(require("../build/tries/private.complete.json").trie); diff --git a/package-lock.json b/package-lock.json index 9103da8..92061b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1251,11 +1251,6 @@ "null-check": "^1.0.0" } }, - "fs-copy-file-sync": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz", - "integrity": "sha512-2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ==" - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", diff --git a/package.json b/package.json index 3f776b6..c94be89 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "test": "nyc mocha -R spec", "posttest": "eslint lib test", "postinstall": "node scripts/build-tries.js", - "prepare": "node scripts/write-pre.js", "release": "standard-version" }, "keywords": [ @@ -29,7 +28,6 @@ "license": "Unlicense", "dependencies": { "chai": "^4.1.2", - "fs-copy-file-sync": "^1.1.1", "got": "^8.0.1", "mkdirp": "^0.5.1", "mocha": "^4.0.1" diff --git a/scripts/build-tries.js b/scripts/build-tries.js index 3215a71..371722d 100644 --- a/scripts/build-tries.js +++ b/scripts/build-tries.js @@ -5,15 +5,13 @@ const fs = require("fs"); const path = require("path"); const childProcess = require("child_process"); const got = require("got"); -const copySync = require("fs-copy-file-sync"); const mkdirp = require("mkdirp"); const parsePubSuffixList = require("../lib/tries/parsePubSuffixList"); const serializeTrie = require("../lib/tries/serializeTrie"); const PUBLIC_SUFFIX_URL = "https://publicsuffix.org/list/public_suffix_list.dat"; const rootPath = path.resolve(__dirname, ".."); -const triesPrePath = path.resolve(rootPath, "build", "tries", "pre"); -const triesPath = path.resolve(rootPath, "build", "tries", "current"); +const triesPath = path.resolve(rootPath, "build", "tries"); const tries = [ { listName: "icann", @@ -72,15 +70,7 @@ got(PUBLIC_SUFFIX_URL) console.error(""); console.error("Could not update list of known top-level domains for parse-domain because of " + err.message); - tries.forEach(list => { - const src = path.resolve(triesPrePath, list.filename); - const dest = path.resolve(triesPath, list.filename); - - mkdirp.sync(path.dirname(dest)); - copySync(src, dest); - }); - - const prebuiltList = JSON.parse(fs.readFileSync(path.resolve(triesPrePath, tries[0].filename))); + const prebuiltList = JSON.parse(fs.readFileSync(path.resolve(triesPath, tries[0].filename))); console.error("Using possibly outdated prebuilt list from " + new Date(prebuiltList.updatedAt).toDateString()); diff --git a/scripts/write-pre.js b/scripts/write-pre.js deleted file mode 100644 index 79ea154..0000000 --- a/scripts/write-pre.js +++ /dev/null @@ -1,21 +0,0 @@ -"use strict"; - -const fs = require("fs"); -const path = require("path"); -const os = require("os"); -const copySync = require("fs-copy-file-sync"); -const mkdirp = require("mkdirp"); - -const rootPath = path.resolve(__dirname, ".."); -const triesPath = path.resolve(rootPath, "build", "tries", "current"); -const triesPrePath = path.resolve(rootPath, "build", "tries", "pre"); - -process.stderr.write("Writing prebuilt lists... "); -mkdirp.sync(triesPrePath); -fs.readdirSync(triesPath).forEach(file => { - const src = path.resolve(triesPath, file); - const dest = path.resolve(triesPrePath, file); - - copySync(src, dest); -}); -process.stderr.write("ok" + os.EOL); \ No newline at end of file