From cd91440e47549a868252cd796faa1c0a33e042a1 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Fri, 18 Jan 2019 12:46:16 -0800 Subject: [PATCH] Revert "Bump v5.0.0-nightly.20190118" This reverts commit 5e5c71e1d7d4e57f06a1c991684130ae47459fe8. --- ELECTRON_VERSION | 2 +- atom/browser/resources/mac/Info.plist | 4 ++-- atom/browser/resources/win/atom.rc | 4 ++-- atom/common/atom_version.h | 2 +- package-lock.json | 23 ++++++++++++++++++++++- package.json | 4 ++-- 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION index 4932f83293..f30022d278 100644 --- a/ELECTRON_VERSION +++ b/ELECTRON_VERSION @@ -1 +1 @@ -5.0.0-nightly.20190118 \ No newline at end of file +5.0.0-nightly.20190110 \ No newline at end of file diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index 47c3c5ab54..44384a4303 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -17,9 +17,9 @@ CFBundleIconFile electron.icns CFBundleVersion - 5.0.0-nightly.20190118 + 5.0.0-nightly.20190110 CFBundleShortVersionString - 5.0.0-nightly.20190118 + 5.0.0-nightly.20190110 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc index bca74752c2..fc3f2e169d 100644 --- a/atom/browser/resources/win/atom.rc +++ b/atom/browser/resources/win/atom.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,0,20190118 - PRODUCTVERSION 5,0,0,20190118 + FILEVERSION 5,0,0,20190110 + PRODUCTVERSION 5,0,0,20190110 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h index e5b6f9b857..ff1aec1e6d 100644 --- a/atom/common/atom_version.h +++ b/atom/common/atom_version.h @@ -9,7 +9,7 @@ #define ATOM_MINOR_VERSION 0 #define ATOM_PATCH_VERSION 0 // clang-format off -#define ATOM_PRE_RELEASE_VERSION -nightly.20190118 +#define ATOM_PRE_RELEASE_VERSION -nightly.20190110 // clang-format on #ifndef ATOM_STRINGIFY diff --git a/package-lock.json b/package-lock.json index 9a7f9f8602..d3acb403ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "5.0.0-nightly.20190118", + "version": "5.0.0-nightly.20190110", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5297,6 +5297,12 @@ "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "dev": true }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", + "dev": true + }, "htmlescape": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", @@ -7267,6 +7273,12 @@ "minimatch": "^3.0.2" } }, + "node-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=", + "dev": true + }, "node-version": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz", @@ -8403,6 +8415,15 @@ } } }, + "recursive-readdir": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", + "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, "redent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", diff --git a/package.json b/package.json index 18c7a875b4..f8ca95d060 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "5.0.0-nightly.20190118", + "version": "5.0.0-nightly.20190110", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { @@ -70,4 +70,4 @@ "@electron/internal/(.+)": "./lib/$1" } } -} \ No newline at end of file +}