Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: overwrite tries files on postinstall rather than copying #39

Merged
merged 1 commit into from Oct 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lists/icann.complete.js
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion lists/icann.light.js
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion lists/private.complete.js
Expand Up @@ -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);
5 changes: 0 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions package.json
Expand Up @@ -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": [
Expand All @@ -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"
Expand Down
14 changes: 2 additions & 12 deletions scripts/build-tries.js
Expand Up @@ -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",
Expand Down Expand Up @@ -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());

Expand Down
21 changes: 0 additions & 21 deletions scripts/write-pre.js

This file was deleted.