Browse Source

chore: removed snyk from anything and everything

Signed-off-by: Jonathan <theflametrooper@gmail.com>
Jonathan 4 năm trước cách đây
mục cha
commit
26556dd3a5
11 tập tin đã thay đổi với 55 bổ sung1596 xóa
  1. 1 2
      .env.example
  2. 3 13
      README.md
  3. 0 13
      backend/.snyk
  4. 0 1
      backend/Dockerfile
  5. 4 775
      backend/package-lock.json
  6. 3 7
      backend/package.json
  7. 6 4
      docker-compose.yml
  8. 0 102
      frontend/.snyk
  9. 0 1
      frontend/Dockerfile
  10. 36 671
      frontend/package-lock.json
  11. 2 7
      frontend/package.json

+ 1 - 2
.env.example

@@ -14,5 +14,4 @@ REDIS_PORT=6379
 
 COMPOSE_PROJECT_NAME=musare
 
-FRONTEND_MODE=dev
-SNYK_TOKEN=
+FRONTEND_MODE=dev

+ 3 - 13
README.md

@@ -1,5 +1,3 @@
-# Musare is no longer being maintained
-
 # MusareNode
 
 Based off of the original [Musare](https://github.com/Musare/MusareMeteor), which utilized Meteor.
@@ -80,14 +78,6 @@ We currently only utilize 1 backend, 1 MongoDB server and 1 Redis server running
 
 5. Simply `cp .env.example .env` to setup your environment variables.
 
-6. To setup [snyk](https://snyk.io/) (which is what we use for our precommit git-hooks), you will need to:
-
-    - Setup an account
-    - Go to [settings](https://app.snyk.io/account)
-    - Copy the API token and set it as your `SNYK_TOKEN` environment variable.
-    
-    We use snyk to test our dependencies / dev-dependencies for vulnerabilities.
-
 <br />
 
 ## Installation
@@ -266,10 +256,10 @@ Run this command in your shell. You will have to do this command for every shell
 
 ### Calling Toasts
 
-You can call Toasts using our custom package, [`vue-roaster`](https://github.com/atjonathan/vue-roaster), using the following code:
+You can create Toast notifications using our custom package, [`toasters`](https://github.com/jonathan-grah/vue-roaster), using the following code:
 
 ```js
-import Toast from "vue-roaster";
+import Toast from "toasters";
 new Toast({ content: "Hi!", persistant: true });
 ```
 
@@ -291,4 +281,4 @@ db.users.update({username: "USERNAME"}, {$set: {role: "admin"}})
 
 Get in touch with us via email at [core@musare.com](mailto:core@musare.com) or join our [Discord Guild](https://discord.gg/Y5NxYGP).
 
-You can also find us on [Facebook](https://www.facebook.com/MusareMusic) and [Twitter](https://twitter.com/MusareApp).
+You can also find us on [Facebook](https://www.facebook.com/MusareMusic) and [Twitter](https://twitter.com/MusareApp).

+ 0 - 13
backend/.snyk

@@ -1,13 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
-ignore: {}
-# patches apply the minimum changes required to fix a vulnerability
-patch:
-  SNYK-JS-HTTPSPROXYAGENT-469131:
-    - mailgun-js > proxy-agent > https-proxy-agent:
-        patched: '2019-10-03T21:28:13.725Z'
-    - mailgun-js > proxy-agent > pac-proxy-agent > https-proxy-agent:
-        patched: '2019-10-03T21:28:13.725Z'
-  SNYK-JS-LODASH-567746:
-    - mailgun-js > async > lodash:
-        patched: '2020-04-30T21:29:23.212Z'

+ 0 - 1
backend/Dockerfile

@@ -3,7 +3,6 @@ FROM node
 RUN apt-get update
 
 RUN npm install -g nodemon
-RUN npm install -g snyk
 
 RUN mkdir -p /opt
 WORKDIR /opt

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 4 - 775
backend/package-lock.json


+ 3 - 7
backend/package.json

@@ -10,9 +10,7 @@
   "scripts": {
     "dev": "nodemon",
     "docker:dev": "nodemon -L /opt/app",
-    "docker:prod": "node /opt/app",
-    "snyk-protect": "snyk protect",
-    "prepublish": "npm run snyk-protect"
+    "docker:prod": "node /opt/app"
   },
   "dependencies": {
     "async": "3.1.0",
@@ -32,8 +30,6 @@
     "request": "^2.88.0",
     "sha256": "^0.2.0",
     "socket.io": "^2.2.0",
-    "underscore": "^1.10.2",
-    "snyk": "^1.316.1"
-  },
-  "snyk": true
+    "underscore": "^1.10.2"
+  }
 }

+ 6 - 4
docker-compose.yml

@@ -1,5 +1,6 @@
-version: '2'
+version: '3'
 services:
+
   backend:
     build: ./backend
     ports:
@@ -10,10 +11,9 @@ services:
     links:
       - mongo
       - redis
-    environment:
-      - SNYK_TOKEN=${SNYK_TOKEN}
     stdin_open: true
     tty: true
+
   frontend:
     build: ./frontend
     ports:
@@ -23,7 +23,7 @@ services:
       - /opt/app/node_modules/
     environment:
       - FRONTEND_MODE=${FRONTEND_MODE}
-      - SNYK_TOKEN=${SNYK_TOKEN}
+
   mongo:
     image: mongo:4.0
     ports:
@@ -38,12 +38,14 @@ services:
       - MONGO_USER_PASSWORD=${MONGO_USER_PASSWORD}
     volumes:
       - ./tools/docker/setup-mongo.sh:/docker-entrypoint-initdb.d/setup-mongo.sh
+
   mongoclient:
     image: mongoclient/mongoclient
     ports:
       - "${MONGOCLIENT_PORT}:3000"
     environment:
       - MONGOCLIENT_DEFAULT_CONNECTION_URL=mongodb://${MONGO_USER_USERNAME}:${MONGO_USER_PASSWORD}@mongo:27017/musare
+
   redis:
     image: redis
     command: "--notify-keyspace-events Ex --requirepass ${REDIS_PASSWORD}"

+ 0 - 102
frontend/.snyk

@@ -1,102 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
-ignore: {}
-# patches apply the minimum changes required to fix a vulnerability
-patch:
-  SNYK-JS-LODASH-567746:
-    - html-webpack-plugin > lodash:
-        patched: '2020-05-01T08:37:15.509Z'
-    - webpack-merge > lodash:
-        patched: '2020-05-01T08:37:15.509Z'
-    - snyk > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/ruby-semver > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > inquirer > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-config > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-mvn-plugin > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-nodejs-lockfile-parser > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-nuget-plugin > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-go-plugin > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-nodejs-lockfile-parser > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-nodejs-lockfile-parser > snyk-config > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-nuget-plugin > dotnet-deps-parser > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-php-plugin > @snyk/composer-lockfile-parser > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/ruby-semver > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > snyk-config > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-01T11:34:18.550Z'
-    - html-webpack-plugin > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - webpack-merge > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/dep-graph > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/ruby-semver > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > inquirer > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-config > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-mvn-plugin > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-nodejs-lockfile-parser > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-nuget-plugin > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-go-plugin > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-nodejs-lockfile-parser > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-nodejs-lockfile-parser > snyk-config > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-nuget-plugin > dotnet-deps-parser > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-php-plugin > @snyk/composer-lockfile-parser > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/ruby-semver > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > snyk-mvn-plugin > @snyk/java-call-graph-builder > snyk-config > lodash:
-        patched: '2020-05-16T18:33:43.925Z'
-    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
-        patched: '2020-05-16T18:33:43.925Z'

+ 0 - 1
frontend/Dockerfile

@@ -3,7 +3,6 @@ FROM node:12
 RUN apt-get update
 RUN apt-get install nginx -y
 
-RUN npm install -g snyk
 RUN npm install -g webpack@4.35.3
 RUN npm install -g webpack-cli@3.3.5
 RUN npm install -g webpack-dev-server@3.7.2

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 36 - 671
frontend/package-lock.json


+ 2 - 7
frontend/package.json

@@ -11,10 +11,7 @@
     "lint": "npx eslint . --ext .js,.vue",
     "bundle-analyse": "webpack --config webpack.prod.js --profile --json > bundle-stats.json && npx webpack-bundle-analyzer bundle-stats.json --mode static --report bundle-report.html --no-open",
     "dev": "webpack-dev-server --config webpack.dev.js",
-    "prod": "webpack --config webpack.prod.js",
-    "test": "",
-    "snyk-protect": "snyk protect",
-    "prepare": "npm run snyk-protect"
+    "prod": "webpack --config webpack.prod.js"
   },
   "devDependencies": {
     "@babel/core": "^7.5.4",
@@ -51,7 +48,6 @@
     "date-fns": "^2.0.1",
     "eslint-config-airbnb-base": "^13.2.0",
     "html-webpack-plugin": "^3.2.0",
-    "snyk": "^1.321.0",
     "toasters": "^2.1.0",
     "vue": "^2.6.10",
     "vue-loader": "^15.7.0",
@@ -59,6 +55,5 @@
     "vuex": "^3.1.1",
     "webpack-md5-hash": "0.0.6",
     "webpack-merge": "^4.2.1"
-  },
-  "snyk": true
+  }
 }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác