Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: atom/atom
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Jeremip11/atom
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 7, 2018

  1. Copy the full SHA
    619ee27 View commit details
  2. Merge pull request #1 from Jeremip11/snyk-fix-6maohj

    [Snyk] Fix for 4 vulnerable dependencies
    Jeremip11 authored Aug 7, 2018
    Copy the full SHA
    c2682de View commit details
  3. Copy the full SHA
    9cb88c6 View commit details
  4. Merge pull request #2 from Jeremip11/snyk-fix-o12r7w

    [Snyk] Fix for 17 vulnerable dependencies
    Jeremip11 authored Aug 7, 2018
    Copy the full SHA
    83a07ee View commit details
  5. Copy the full SHA
    44f21f9 View commit details
  6. Merge pull request #3 from Jeremip11/snyk-fix-k30hpt

    [Snyk] Fix for 3 vulnerable dependencies
    Jeremip11 authored Aug 7, 2018
    Copy the full SHA
    1e92b9e View commit details
Showing with 77 additions and 9 deletions.
  1. +1 −1 apm/package.json
  2. +62 −0 script/.snyk
  3. +14 −8 script/package.json
2 changes: 1 addition & 1 deletion apm/package.json
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "1.19.0"
"atom-package-manager": "2.0.0"
}
}
62 changes: 62 additions & 0 deletions script/.snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.12.0
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:debug:20170905':
- fs-admin > mocha > debug:
patched: '2018-08-07T04:12:54.076Z'
- fs-admin > mocha > debug:
patched: '2018-08-07T04:13:58.069Z'
'npm:hoek:20180212':
- npm > node-gyp > request > hawk > hoek:
patched: '2018-08-07T04:12:54.076Z'
- npm > node-gyp > request > hawk > boom > hoek:
patched: '2018-08-07T04:12:54.076Z'
- npm > node-gyp > request > hawk > sntp > hoek:
patched: '2018-08-07T04:12:54.076Z'
- npm > node-gyp > request > hawk > cryptiles > boom > hoek:
patched: '2018-08-07T04:12:54.076Z'
- npm > node-gyp > request > hawk > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > node-gyp > request > hawk > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > node-gyp > request > hawk > sntp > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > npm-lifecycle > node-gyp > request > hawk > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > node-gyp > request > hawk > cryptiles > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > libcipm > npm-lifecycle > node-gyp > request > hawk > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > libcipm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > libcipm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
patched: '2018-08-07T04:13:58.069Z'
- npm > libcipm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
patched: '2018-08-07T04:13:58.069Z'
'npm:lodash:20180130':
- babel-core > babel-plugin-proto-to-assign > lodash:
patched: '2018-08-07T04:12:54.076Z'
- electron-packager > plist > xmlbuilder > lodash:
patched: '2018-08-07T04:12:54.076Z'
- npm > cli-table2 > lodash:
patched: '2018-08-07T04:13:58.069Z'
- electron-packager > plist > xmlbuilder > lodash:
patched: '2018-08-07T04:13:58.069Z'
'npm:mime:20170907':
- webdriverio > request > mime:
patched: '2018-08-07T04:12:54.076Z'
'npm:minimatch:20160620':
- webdriverio > archiver > file-utils > glob > minimatch:
patched: '2018-08-07T04:12:54.076Z'
- webdriverio > archiver > file-utils > findup-sync > glob > minimatch:
patched: '2018-08-07T04:12:54.076Z'
- webdriverio > archiver > file-utils > minimatch:
patched: '2018-08-07T04:12:54.076Z'
22 changes: 14 additions & 8 deletions script/package.json
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
"description": "Atom build scripts",
"dependencies": {
"async": "2.0.1",
"babel-core": "5.8.38",
"coffeelint": "1.15.7",
"babel-core": "6.10.4",
"coffeelint": "1.16.0",
"colors": "1.1.2",
"donna": "1.0.16",
"electron-chromedriver": "~1.7",
@@ -16,25 +16,31 @@
"fs-extra": "0.30.0",
"glob": "7.0.3",
"joanna": "0.0.10",
"klaw-sync": "^1.1.2",
"klaw-sync": "^2.0.0",
"legal-eagle": "0.14.0",
"lodash.startcase": "4.4.0",
"lodash.template": "4.4.0",
"minidump": "0.9.0",
"mkdirp": "0.5.1",
"normalize-package-data": "2.3.5",
"npm": "5.3.0",
"npm": "5.10.0",
"passwd-user": "2.1.0",
"pegjs": "0.9.0",
"random-seed": "^0.3.0",
"season": "5.3.0",
"semver": "5.3.0",
"standard": "8.4.0",
"standard": "11.0.0",
"stylelint": "^9.0.0",
"stylelint-config-standard": "^18.1.0",
"sync-request": "3.0.1",
"tello": "1.0.7",
"webdriverio": "2.4.5",
"yargs": "4.8.1"
}
"webdriverio": "4.13.0",
"yargs": "4.8.1",
"snyk": "^1.90.0"
},
"scripts": {
"snyk-protect": "snyk protect",
"prepare": "npm run snyk-protect"
},
"snyk": true
}