Skip to content

Commit

Permalink
Lock Slate versions to prevent missing dep issue in prod, add warning
Browse files Browse the repository at this point in the history
  • Loading branch information
bengotow committed Jan 21, 2018
1 parent f52ba7b commit c7e63bf
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 80 deletions.
106 changes: 41 additions & 65 deletions app/package-lock.json

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

11 changes: 7 additions & 4 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,14 @@
"rx-lite-testing": "^4.0.7",
"semver": "^4.2",
"slate": "bengotow/slate#77f6337",
"slate-auto-replace": "^0.9.0",
"slate-auto-replace": "0.9.0",
"slate-prop-types": "0.4.17",
"slate-edit-list": "bengotow/slate-edit-list#44701a7",
"slate-html-serializer": "^0.5.0",
"slate-react": "^0.11.0",
"slate-soft-break": "^0.6.0",
"slate-html-serializer": "0.5.0",
"slate-plain-serializer": "0.5.0",
"slate-base64-serializer": "0.2.19",
"slate-react": "0.11.0",
"slate-soft-break": "0.6.0",
"source-map-support": "^0.3.2",
"temp": "^0.8",
"tld": "^0.0.2",
Expand Down
19 changes: 11 additions & 8 deletions scripts/postinstall.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,17 @@ if (cacheElectronTarget !== npmElectronTarget) {
npm('install', { cwd: './app', env: 'electron' }).then(() => {
// run `npm dedupe` in ./app with Electron NPM config
npm('dedupe', { cwd: './app', env: 'electron' }).then(() => {
// write the marker with the electron version
fs.writeFileSync(cacheVersionPath, npmElectronTarget);
// run `npm ls` in ./app - detects missing peer dependencies, etc.
npm('ls', { cwd: './app', env: 'electron' }).then(() => {
// write the marker with the electron version
fs.writeFileSync(cacheVersionPath, npmElectronTarget);

// if the user hasn't cloned the private mailsync module, download
// the binary for their operating system that was shipped to S3.
if (!fs.existsSync('./mailsync/build.sh')) {
console.log(`\n-- Downloading the last released version of Mailspring mailsync --`);
downloadMailsync();
}
// if the user hasn't cloned the private mailsync module, download
// the binary for their operating system that was shipped to S3.
if (!fs.existsSync('./mailsync/build.sh')) {
console.log(`\n-- Downloading the last released version of Mailspring mailsync --`);
downloadMailsync();
}
});
});
});
21 changes: 18 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1791,9 +1791,9 @@ [email protected]:
lodash.template "^4.2.2"
temp "^0.8.3"

[email protected].8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.8.tgz#27b791a6895171a7d52991b99442cdbd10a3539d"
[email protected].10:
version "1.7.10"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.10.tgz#3a3e83d965fd7fafe473be8ddf8f472561b6253d"
dependencies:
"@types/node" "^7.0.18"
electron-download "^3.0.1"
Expand Down Expand Up @@ -6027,6 +6027,15 @@ tar-fs@^1.15.3:
pump "^1.0.0"
tar-stream "^1.1.2"

tar-fs@^1.8.1:
version "1.16.0"
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
dependencies:
chownr "^1.0.1"
mkdirp "^0.5.1"
pump "^1.0.0"
tar-stream "^1.1.2"

tar-pack@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
Expand Down Expand Up @@ -6057,6 +6066,12 @@ tar@^2.0.0, tar@^2.2.1, tar@~2.2.1:
fstream "^1.0.2"
inherits "2"

targz@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
dependencies:
tar-fs "^1.8.1"

tello@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/tello/-/tello-1.0.6.tgz#fbdb0b3d8d1c222adfb405b6a424355e6051d7b6"
Expand Down

0 comments on commit c7e63bf

Please sign in to comment.