Fix security issues + update some Mozilla references (#962)

Extension/webext-instrumentation/package-lock.json

@@ -320,6 +320,13 @@
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -334,6 +341,15 @@
         "lodash": "^4.17.19",
         "resolve-from": "^5.0.0",
         "resolve-global": "^1.0.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "@commitlint/types": {
@@ -1019,6 +1035,14 @@
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "atob": {
@@ -1460,6 +1484,12 @@
             "longest": "^2.0.1",
             "word-wrap": "^1.0.3"
           }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
         }
       }
     },
@@ -1565,6 +1595,14 @@
         "compare-func": "^2.0.0",
         "lodash": "^4.17.15",
         "q": "^1.5.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "conventional-changelog-core": {
@@ -1598,6 +1636,12 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "normalize-package-data": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
@@ -1709,6 +1753,12 @@
             "p-locate": "^4.1.0"
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "meow": {
           "version": "8.1.2",
           "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
@@ -1922,6 +1972,12 @@
             "p-locate": "^4.1.0"
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "meow": {
           "version": "8.1.2",
           "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
@@ -2982,6 +3038,14 @@
         "regextras": "^0.8.0",
         "semver": "^7.3.5",
         "spdx-expression-parse": "^3.0.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "eslint-plugin-prefer-arrow": {
@@ -3030,6 +3094,12 @@
             "p-locate": "^4.1.0"
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "p-limit": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -3977,6 +4047,12 @@
             "p-locate": "^4.1.0"
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "meow": {
           "version": "8.1.2",
           "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
@@ -4720,6 +4796,14 @@
         "string-width": "^2.1.0",
         "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "internal-slot": {
@@ -5292,12 +5376,6 @@
         "path-exists": "^3.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
@@ -6575,6 +6653,14 @@
             "string-width": "^2.1.0",
             "strip-ansi": "^4.0.0",
             "through": "^2.3.6"
+          },
+          "dependencies": {
+            "lodash": {
+              "version": "4.17.21",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+              "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+              "dev": true
+            }
           }
         },
         "is-number": {
@@ -6598,9 +6684,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.20",
+          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "micromatch": {

Extension/webext-instrumentation/package.json

@@ -6,8 +6,8 @@
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
   "module": "build/module/index.js",
-  "repository": "https://github.com/mozilla/OpenWPM",
+  "repository": "https://github.com/openwpm/OpenWPM",
-  "homepage": "https://github.com/mozilla/OpenWPM/tree/master/Extension/webext-instrumentation",
+  "homepage": "https://github.com/openwpm/OpenWPM/tree/master/Extension/webext-instrumentation",
   "keywords": [],
   "scripts": {
     "info": "npm-scripts-info",
@@ -36,6 +36,7 @@
     "reset": "git clean -dfx && git reset --hard && npm i",
     "clean": "trash build test",
     "all": "run-s reset test cov:check doc:html",
+    "preinstall": "npx npm-force-resolutions",
     "prepare": "run-s build test",
     "prepare-release": "run-s all version doc:publish",
     "publish-please": "publish-please",
@@ -82,6 +83,9 @@
     "typedoc": "^0.21.9",
     "typescript": "^4.5.2"
   },
+  "resolutions": {
+    "lodash": "^4.17.21"
+  },
   "ava": {
     "failFast": true,
     "files": [

LICENSE

@@ -1,5 +1,5 @@
 OpenWPM:
-Copyright © 2015 Steven Englehardt
+Copyright © 2021 Steven Englehardt
 Licensed GPL v3
 
 CONTRIBUTORS AGREE TO FREE/OPEN SOURCE LICENSING

README.md

@@ -42,7 +42,7 @@ that this repo builds, which is also based on Ubuntu. Although we don't official
 other platforms, conda is a cross platform utility and the install script can be expected
 to work on OSX and other linux distributions.
 
-OpenWPM does not support windows: https://github.com/mozilla/OpenWPM/issues/503
+OpenWPM does not support windows: https://github.com/openwpm/OpenWPM/issues/503
 
 
 ### Pre-requisites
@@ -144,7 +144,7 @@ Troubleshooting
    try re-running the file with the environment variable
    `PYTHONNOUSERSITE` set. E.g., `PYTHONNOUSERSITE=True python demo.py`.
    If that fixes your issues, you are experiencing
-   [issue 689](https://github.com/mozilla/OpenWPM/issues/689), which can be
+   [issue 689](https://github.com/openwpm/OpenWPM/issues/689), which can be
    fixed by clearing your
    python [user site packages directory](https://www.python.org/dev/peps/pep-0370/),
    by prepending `PYTHONNOUSERSITE=True` to a specific command, or by setting
@@ -165,7 +165,7 @@ Advice for Measurement Researchers
 OpenWPM is [often used](https://webtap.princeton.edu/software/) for web
 measurement research. We recommend the following for researchers using the tool:
 
-**Use a versioned [release](https://github.com/mozilla/OpenWPM/releases).** We
+**Use a versioned [release](https://github.com/openwpm/OpenWPM/releases).** We
 aim to follow Firefox's release cadence, which is roughly once every four
 weeks. If we happen to fall behind on checking in new releases, please file an
 issue. Versions more than a few months out of date will use unsupported
@@ -202,7 +202,7 @@ For each of the data classes we offer a variety of storage providers, and you ar
 to implement your own, should the provided backends not be enough for you.
 
 We have an outstanding issue to enable saving content generated by commands, such as
-screenshots and page dumps to unstructured storage (see [#232](https://github.com/mozilla/OpenWPM/issues/232)).  
+screenshots and page dumps to unstructured storage (see [#232](https://github.com/openwpm/OpenWPM/issues/232)).  
 For now, they get saved to `manager_params.data_directory`.
 
 ### Local Storage
@@ -226,7 +226,7 @@ For storing unstructured data locally we also offer two solutions:
 ### Remote storage
 
 When running in the cloud, saving records to disk is not a reasonable thing to do.
-So we offer a remote StorageProviders for S3 (See [#823](https://github.com/mozilla/OpenWPM/issues/823)) and GCP.
+So we offer a remote StorageProviders for S3 (See [#823](https://github.com/openwpm/OpenWPM/issues/823)) and GCP.
 Currently, all remote StorageProviders write to the respective object storage service (S3/GCS).
 The structured providers use the Parquet format.
 

docs/conf.py

@@ -24,8 +24,8 @@ sys.path.insert(0, project_root)
 # -- Project information -----------------------------------------------------
 
 project = "OpenWPM"
-copyright = "2020, Mozilla"
+copyright = "2021, OpenWPM"
-author = "Mozilla"
+author = "OpenWPM Contributors"
 
 
 # -- General configuration ---------------------------------------------------

package-lock.json

@@ -1244,6 +1244,17 @@
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
         "readdirp": "~3.6.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
+        }
       }
     },
     "class-utils": {
@@ -1686,6 +1697,14 @@
             "trim-newlines": "^3.0.0",
             "type-fest": "^0.18.0",
             "yargs-parser": "^20.2.3"
+          },
+          "dependencies": {
+            "trim-newlines": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+              "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+              "dev": true
+            }
           }
         },
         "minimist-options": {
@@ -1851,8 +1870,7 @@
         "trim-newlines": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
-          "dev": true
         }
       }
     },
@@ -1948,6 +1966,14 @@
             "trim-newlines": "^3.0.0",
             "type-fest": "^0.18.0",
             "yargs-parser": "^20.2.3"
+          },
+          "dependencies": {
+            "trim-newlines": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+              "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+              "dev": true
+            }
           }
         },
         "minimist-options": {
@@ -2105,8 +2131,7 @@
         "trim-newlines": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
-          "dev": true
         }
       }
     },
@@ -2206,6 +2231,14 @@
             "trim-newlines": "^3.0.0",
             "type-fest": "^0.18.0",
             "yargs-parser": "^20.2.3"
+          },
+          "dependencies": {
+            "trim-newlines": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+              "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+              "dev": true
+            }
           }
         },
         "minimist-options": {
@@ -2354,8 +2387,7 @@
         "trim-newlines": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
-          "dev": true
         }
       }
     },
@@ -3497,6 +3529,14 @@
             "trim-newlines": "^3.0.0",
             "type-fest": "^0.18.0",
             "yargs-parser": "^20.2.3"
+          },
+          "dependencies": {
+            "trim-newlines": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+              "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+              "dev": true
+            }
           }
         },
         "minimist-options": {
@@ -3654,8 +3694,7 @@
         "trim-newlines": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
-          "dev": true
         }
       }
     },
@@ -3755,6 +3794,14 @@
             "trim-newlines": "^3.0.0",
             "type-fest": "^0.18.0",
             "yargs-parser": "^20.2.3"
+          },
+          "dependencies": {
+            "trim-newlines": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+              "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+              "dev": true
+            }
           }
         },
         "minimist-options": {
@@ -3900,8 +3947,7 @@
         "trim-newlines": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
-          "dev": true
         }
       }
     },
@@ -3953,15 +3999,6 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
     "glob-stream": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
@@ -3981,13 +4018,12 @@
       },
       "dependencies": {
         "glob-parent": {
-          "version": "3.1.0",
+          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
+            "is-glob": "^4.0.3"
-            "path-dirname": "^1.0.0"
           }
         },
         "is-glob": {
@@ -5173,6 +5209,14 @@
         "read-pkg-up": "^3.0.0",
         "redent": "^2.0.0",
         "trim-newlines": "^2.0.0"
+      },
+      "dependencies": {
+        "trim-newlines": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+          "dev": true
+        }
       }
     },
     "merge-stream": {
@@ -5870,12 +5914,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -7109,12 +7147,6 @@
         "through2": "^2.0.3"
       }
     },
-    "trim-newlines": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
-      "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
-      "dev": true
-    },
     "triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",

package.json

@@ -1,8 +1,9 @@
 {
   "name": "openwpm",
-  "author": "Mozilla",
+  "author": "OpenWPM Contributors",
   "description": "OpenWPM NodeJS Utilities",
   "scripts": {
+    "preinstall": "npx npm-force-resolutions",
     "info": "npm-scripts-info",
     "jsonschema2md": "jsonschema2md || true",
     "render_schema_docs": "jsonschema2md --input=schemas --out=docs/schemas --schema-out=-",
@@ -20,7 +21,7 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/mozilla/OpenWPM.git"
+    "url": "git+https://github.com/openwpm/OpenWPM.git"
   },
   "homepage": "",
   "devDependencies": {
@@ -31,5 +32,9 @@
     "markdown-link-check": "^3.9.0",
     "markdownlint-cli": "^0.27.1",
     "npm-scripts-info": "^0.3.9"
+  },
+  "resolutions": {
+    "glob-parent": "^6.0.2",
+    "trim-newlines": "^3.0.1"
   }
 }