From 70aa9b06eef549ea66f6b9242043c7be81f0d9d0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 7 Mar 2016 17:12:09 -0800 Subject: [PATCH 1/9] Move JavaScript to root lib/ folder --- {atom/browser/api/lib => lib/browser/api}/app.js | 0 {atom/browser/api/lib => lib/browser/api}/auto-updater.js | 0 .../lib => lib/browser/api}/auto-updater/auto-updater-native.js | 0 .../api/lib => lib/browser/api}/auto-updater/auto-updater-win.js | 0 .../lib => lib/browser/api}/auto-updater/squirrel-update-win.js | 0 {atom/browser/api/lib => lib/browser/api}/browser-window.js | 0 {atom/browser/api/lib => lib/browser/api}/content-tracing.js | 0 {atom/browser/api/lib => lib/browser/api}/dialog.js | 0 {atom/browser/api/lib => lib/browser/api}/exports/electron.js | 0 {atom/browser/api/lib => lib/browser/api}/global-shortcut.js | 0 {atom/browser/api/lib => lib/browser/api}/ipc-main.js | 0 {atom/browser/api/lib => lib/browser/api}/ipc.js | 0 {atom/browser/api/lib => lib/browser/api}/menu-item.js | 0 {atom/browser/api/lib => lib/browser/api}/menu.js | 0 .../browser/api/lib => lib/browser/api}/navigation-controller.js | 0 {atom/browser/api/lib => lib/browser/api}/power-monitor.js | 0 {atom/browser/api/lib => lib/browser/api}/power-save-blocker.js | 0 {atom/browser/api/lib => lib/browser/api}/protocol.js | 0 {atom/browser/api/lib => lib/browser/api}/screen.js | 0 {atom/browser/api/lib => lib/browser/api}/session.js | 0 {atom/browser/api/lib => lib/browser/api}/tray.js | 0 {atom/browser/api/lib => lib/browser/api}/web-contents.js | 0 {atom/browser/lib => lib/browser}/chrome-extension.js | 0 {atom/browser/lib => lib/browser}/desktop-capturer.js | 0 {atom/browser/lib => lib/browser}/guest-view-manager.js | 0 {atom/browser/lib => lib/browser}/guest-window-manager.js | 0 {atom/browser/lib => lib/browser}/init.js | 0 {atom/browser/lib => lib/browser}/objects-registry.js | 0 {atom/browser/lib => lib/browser}/rpc-server.js | 0 {atom/common/api/lib => lib/common/api}/callbacks-registry.js | 0 {atom/common/api/lib => lib/common/api}/clipboard.js | 0 {atom/common/api/lib => lib/common/api}/crash-reporter.js | 0 {atom/common/api/lib => lib/common/api}/deprecate.js | 0 {atom/common/api/lib => lib/common/api}/deprecations.js | 0 {atom/common/api/lib => lib/common/api}/exports/electron.js | 0 {atom/common/api/lib => lib/common/api}/native-image.js | 0 {atom/common/api/lib => lib/common/api}/shell.js | 0 {atom/common/lib => lib/common}/asar.js | 0 {atom/common/lib => lib/common}/asar_init.js | 0 {atom/common/lib => lib/common}/init.js | 0 {atom/common/lib => lib/common}/reset-search-paths.js | 0 {atom/renderer/api/lib => lib/renderer/api}/desktop-capturer.js | 0 {atom/renderer/api/lib => lib/renderer/api}/exports/electron.js | 0 {atom/renderer/api/lib => lib/renderer/api}/ipc-renderer.js | 0 {atom/renderer/api/lib => lib/renderer/api}/ipc.js | 0 {atom/renderer/api/lib => lib/renderer/api}/remote.js | 0 {atom/renderer/api/lib => lib/renderer/api}/screen.js | 0 {atom/renderer/api/lib => lib/renderer/api}/web-frame.js | 0 {atom/renderer/lib => lib/renderer}/chrome-api.js | 0 {atom/renderer/lib => lib/renderer}/init.js | 0 {atom/renderer/lib => lib/renderer}/inspector.js | 0 {atom/renderer/lib => lib/renderer}/override.js | 0 .../renderer/lib => lib/renderer}/web-view/guest-view-internal.js | 0 .../renderer/lib => lib/renderer}/web-view/web-view-attributes.js | 0 .../renderer/lib => lib/renderer}/web-view/web-view-constants.js | 0 {atom/renderer/lib => lib/renderer}/web-view/web-view.js | 0 56 files changed, 0 insertions(+), 0 deletions(-) rename {atom/browser/api/lib => lib/browser/api}/app.js (100%) rename {atom/browser/api/lib => lib/browser/api}/auto-updater.js (100%) rename {atom/browser/api/lib => lib/browser/api}/auto-updater/auto-updater-native.js (100%) rename {atom/browser/api/lib => lib/browser/api}/auto-updater/auto-updater-win.js (100%) rename {atom/browser/api/lib => lib/browser/api}/auto-updater/squirrel-update-win.js (100%) rename {atom/browser/api/lib => lib/browser/api}/browser-window.js (100%) rename {atom/browser/api/lib => lib/browser/api}/content-tracing.js (100%) rename {atom/browser/api/lib => lib/browser/api}/dialog.js (100%) rename {atom/browser/api/lib => lib/browser/api}/exports/electron.js (100%) rename {atom/browser/api/lib => lib/browser/api}/global-shortcut.js (100%) rename {atom/browser/api/lib => lib/browser/api}/ipc-main.js (100%) rename {atom/browser/api/lib => lib/browser/api}/ipc.js (100%) rename {atom/browser/api/lib => lib/browser/api}/menu-item.js (100%) rename {atom/browser/api/lib => lib/browser/api}/menu.js (100%) rename {atom/browser/api/lib => lib/browser/api}/navigation-controller.js (100%) rename {atom/browser/api/lib => lib/browser/api}/power-monitor.js (100%) rename {atom/browser/api/lib => lib/browser/api}/power-save-blocker.js (100%) rename {atom/browser/api/lib => lib/browser/api}/protocol.js (100%) rename {atom/browser/api/lib => lib/browser/api}/screen.js (100%) rename {atom/browser/api/lib => lib/browser/api}/session.js (100%) rename {atom/browser/api/lib => lib/browser/api}/tray.js (100%) rename {atom/browser/api/lib => lib/browser/api}/web-contents.js (100%) rename {atom/browser/lib => lib/browser}/chrome-extension.js (100%) rename {atom/browser/lib => lib/browser}/desktop-capturer.js (100%) rename {atom/browser/lib => lib/browser}/guest-view-manager.js (100%) rename {atom/browser/lib => lib/browser}/guest-window-manager.js (100%) rename {atom/browser/lib => lib/browser}/init.js (100%) rename {atom/browser/lib => lib/browser}/objects-registry.js (100%) rename {atom/browser/lib => lib/browser}/rpc-server.js (100%) rename {atom/common/api/lib => lib/common/api}/callbacks-registry.js (100%) rename {atom/common/api/lib => lib/common/api}/clipboard.js (100%) rename {atom/common/api/lib => lib/common/api}/crash-reporter.js (100%) rename {atom/common/api/lib => lib/common/api}/deprecate.js (100%) rename {atom/common/api/lib => lib/common/api}/deprecations.js (100%) rename {atom/common/api/lib => lib/common/api}/exports/electron.js (100%) rename {atom/common/api/lib => lib/common/api}/native-image.js (100%) rename {atom/common/api/lib => lib/common/api}/shell.js (100%) rename {atom/common/lib => lib/common}/asar.js (100%) rename {atom/common/lib => lib/common}/asar_init.js (100%) rename {atom/common/lib => lib/common}/init.js (100%) rename {atom/common/lib => lib/common}/reset-search-paths.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/desktop-capturer.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/exports/electron.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/ipc-renderer.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/ipc.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/remote.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/screen.js (100%) rename {atom/renderer/api/lib => lib/renderer/api}/web-frame.js (100%) rename {atom/renderer/lib => lib/renderer}/chrome-api.js (100%) rename {atom/renderer/lib => lib/renderer}/init.js (100%) rename {atom/renderer/lib => lib/renderer}/inspector.js (100%) rename {atom/renderer/lib => lib/renderer}/override.js (100%) rename {atom/renderer/lib => lib/renderer}/web-view/guest-view-internal.js (100%) rename {atom/renderer/lib => lib/renderer}/web-view/web-view-attributes.js (100%) rename {atom/renderer/lib => lib/renderer}/web-view/web-view-constants.js (100%) rename {atom/renderer/lib => lib/renderer}/web-view/web-view.js (100%) diff --git a/atom/browser/api/lib/app.js b/lib/browser/api/app.js similarity index 100% rename from atom/browser/api/lib/app.js rename to lib/browser/api/app.js diff --git a/atom/browser/api/lib/auto-updater.js b/lib/browser/api/auto-updater.js similarity index 100% rename from atom/browser/api/lib/auto-updater.js rename to lib/browser/api/auto-updater.js diff --git a/atom/browser/api/lib/auto-updater/auto-updater-native.js b/lib/browser/api/auto-updater/auto-updater-native.js similarity index 100% rename from atom/browser/api/lib/auto-updater/auto-updater-native.js rename to lib/browser/api/auto-updater/auto-updater-native.js diff --git a/atom/browser/api/lib/auto-updater/auto-updater-win.js b/lib/browser/api/auto-updater/auto-updater-win.js similarity index 100% rename from atom/browser/api/lib/auto-updater/auto-updater-win.js rename to lib/browser/api/auto-updater/auto-updater-win.js diff --git a/atom/browser/api/lib/auto-updater/squirrel-update-win.js b/lib/browser/api/auto-updater/squirrel-update-win.js similarity index 100% rename from atom/browser/api/lib/auto-updater/squirrel-update-win.js rename to lib/browser/api/auto-updater/squirrel-update-win.js diff --git a/atom/browser/api/lib/browser-window.js b/lib/browser/api/browser-window.js similarity index 100% rename from atom/browser/api/lib/browser-window.js rename to lib/browser/api/browser-window.js diff --git a/atom/browser/api/lib/content-tracing.js b/lib/browser/api/content-tracing.js similarity index 100% rename from atom/browser/api/lib/content-tracing.js rename to lib/browser/api/content-tracing.js diff --git a/atom/browser/api/lib/dialog.js b/lib/browser/api/dialog.js similarity index 100% rename from atom/browser/api/lib/dialog.js rename to lib/browser/api/dialog.js diff --git a/atom/browser/api/lib/exports/electron.js b/lib/browser/api/exports/electron.js similarity index 100% rename from atom/browser/api/lib/exports/electron.js rename to lib/browser/api/exports/electron.js diff --git a/atom/browser/api/lib/global-shortcut.js b/lib/browser/api/global-shortcut.js similarity index 100% rename from atom/browser/api/lib/global-shortcut.js rename to lib/browser/api/global-shortcut.js diff --git a/atom/browser/api/lib/ipc-main.js b/lib/browser/api/ipc-main.js similarity index 100% rename from atom/browser/api/lib/ipc-main.js rename to lib/browser/api/ipc-main.js diff --git a/atom/browser/api/lib/ipc.js b/lib/browser/api/ipc.js similarity index 100% rename from atom/browser/api/lib/ipc.js rename to lib/browser/api/ipc.js diff --git a/atom/browser/api/lib/menu-item.js b/lib/browser/api/menu-item.js similarity index 100% rename from atom/browser/api/lib/menu-item.js rename to lib/browser/api/menu-item.js diff --git a/atom/browser/api/lib/menu.js b/lib/browser/api/menu.js similarity index 100% rename from atom/browser/api/lib/menu.js rename to lib/browser/api/menu.js diff --git a/atom/browser/api/lib/navigation-controller.js b/lib/browser/api/navigation-controller.js similarity index 100% rename from atom/browser/api/lib/navigation-controller.js rename to lib/browser/api/navigation-controller.js diff --git a/atom/browser/api/lib/power-monitor.js b/lib/browser/api/power-monitor.js similarity index 100% rename from atom/browser/api/lib/power-monitor.js rename to lib/browser/api/power-monitor.js diff --git a/atom/browser/api/lib/power-save-blocker.js b/lib/browser/api/power-save-blocker.js similarity index 100% rename from atom/browser/api/lib/power-save-blocker.js rename to lib/browser/api/power-save-blocker.js diff --git a/atom/browser/api/lib/protocol.js b/lib/browser/api/protocol.js similarity index 100% rename from atom/browser/api/lib/protocol.js rename to lib/browser/api/protocol.js diff --git a/atom/browser/api/lib/screen.js b/lib/browser/api/screen.js similarity index 100% rename from atom/browser/api/lib/screen.js rename to lib/browser/api/screen.js diff --git a/atom/browser/api/lib/session.js b/lib/browser/api/session.js similarity index 100% rename from atom/browser/api/lib/session.js rename to lib/browser/api/session.js diff --git a/atom/browser/api/lib/tray.js b/lib/browser/api/tray.js similarity index 100% rename from atom/browser/api/lib/tray.js rename to lib/browser/api/tray.js diff --git a/atom/browser/api/lib/web-contents.js b/lib/browser/api/web-contents.js similarity index 100% rename from atom/browser/api/lib/web-contents.js rename to lib/browser/api/web-contents.js diff --git a/atom/browser/lib/chrome-extension.js b/lib/browser/chrome-extension.js similarity index 100% rename from atom/browser/lib/chrome-extension.js rename to lib/browser/chrome-extension.js diff --git a/atom/browser/lib/desktop-capturer.js b/lib/browser/desktop-capturer.js similarity index 100% rename from atom/browser/lib/desktop-capturer.js rename to lib/browser/desktop-capturer.js diff --git a/atom/browser/lib/guest-view-manager.js b/lib/browser/guest-view-manager.js similarity index 100% rename from atom/browser/lib/guest-view-manager.js rename to lib/browser/guest-view-manager.js diff --git a/atom/browser/lib/guest-window-manager.js b/lib/browser/guest-window-manager.js similarity index 100% rename from atom/browser/lib/guest-window-manager.js rename to lib/browser/guest-window-manager.js diff --git a/atom/browser/lib/init.js b/lib/browser/init.js similarity index 100% rename from atom/browser/lib/init.js rename to lib/browser/init.js diff --git a/atom/browser/lib/objects-registry.js b/lib/browser/objects-registry.js similarity index 100% rename from atom/browser/lib/objects-registry.js rename to lib/browser/objects-registry.js diff --git a/atom/browser/lib/rpc-server.js b/lib/browser/rpc-server.js similarity index 100% rename from atom/browser/lib/rpc-server.js rename to lib/browser/rpc-server.js diff --git a/atom/common/api/lib/callbacks-registry.js b/lib/common/api/callbacks-registry.js similarity index 100% rename from atom/common/api/lib/callbacks-registry.js rename to lib/common/api/callbacks-registry.js diff --git a/atom/common/api/lib/clipboard.js b/lib/common/api/clipboard.js similarity index 100% rename from atom/common/api/lib/clipboard.js rename to lib/common/api/clipboard.js diff --git a/atom/common/api/lib/crash-reporter.js b/lib/common/api/crash-reporter.js similarity index 100% rename from atom/common/api/lib/crash-reporter.js rename to lib/common/api/crash-reporter.js diff --git a/atom/common/api/lib/deprecate.js b/lib/common/api/deprecate.js similarity index 100% rename from atom/common/api/lib/deprecate.js rename to lib/common/api/deprecate.js diff --git a/atom/common/api/lib/deprecations.js b/lib/common/api/deprecations.js similarity index 100% rename from atom/common/api/lib/deprecations.js rename to lib/common/api/deprecations.js diff --git a/atom/common/api/lib/exports/electron.js b/lib/common/api/exports/electron.js similarity index 100% rename from atom/common/api/lib/exports/electron.js rename to lib/common/api/exports/electron.js diff --git a/atom/common/api/lib/native-image.js b/lib/common/api/native-image.js similarity index 100% rename from atom/common/api/lib/native-image.js rename to lib/common/api/native-image.js diff --git a/atom/common/api/lib/shell.js b/lib/common/api/shell.js similarity index 100% rename from atom/common/api/lib/shell.js rename to lib/common/api/shell.js diff --git a/atom/common/lib/asar.js b/lib/common/asar.js similarity index 100% rename from atom/common/lib/asar.js rename to lib/common/asar.js diff --git a/atom/common/lib/asar_init.js b/lib/common/asar_init.js similarity index 100% rename from atom/common/lib/asar_init.js rename to lib/common/asar_init.js diff --git a/atom/common/lib/init.js b/lib/common/init.js similarity index 100% rename from atom/common/lib/init.js rename to lib/common/init.js diff --git a/atom/common/lib/reset-search-paths.js b/lib/common/reset-search-paths.js similarity index 100% rename from atom/common/lib/reset-search-paths.js rename to lib/common/reset-search-paths.js diff --git a/atom/renderer/api/lib/desktop-capturer.js b/lib/renderer/api/desktop-capturer.js similarity index 100% rename from atom/renderer/api/lib/desktop-capturer.js rename to lib/renderer/api/desktop-capturer.js diff --git a/atom/renderer/api/lib/exports/electron.js b/lib/renderer/api/exports/electron.js similarity index 100% rename from atom/renderer/api/lib/exports/electron.js rename to lib/renderer/api/exports/electron.js diff --git a/atom/renderer/api/lib/ipc-renderer.js b/lib/renderer/api/ipc-renderer.js similarity index 100% rename from atom/renderer/api/lib/ipc-renderer.js rename to lib/renderer/api/ipc-renderer.js diff --git a/atom/renderer/api/lib/ipc.js b/lib/renderer/api/ipc.js similarity index 100% rename from atom/renderer/api/lib/ipc.js rename to lib/renderer/api/ipc.js diff --git a/atom/renderer/api/lib/remote.js b/lib/renderer/api/remote.js similarity index 100% rename from atom/renderer/api/lib/remote.js rename to lib/renderer/api/remote.js diff --git a/atom/renderer/api/lib/screen.js b/lib/renderer/api/screen.js similarity index 100% rename from atom/renderer/api/lib/screen.js rename to lib/renderer/api/screen.js diff --git a/atom/renderer/api/lib/web-frame.js b/lib/renderer/api/web-frame.js similarity index 100% rename from atom/renderer/api/lib/web-frame.js rename to lib/renderer/api/web-frame.js diff --git a/atom/renderer/lib/chrome-api.js b/lib/renderer/chrome-api.js similarity index 100% rename from atom/renderer/lib/chrome-api.js rename to lib/renderer/chrome-api.js diff --git a/atom/renderer/lib/init.js b/lib/renderer/init.js similarity index 100% rename from atom/renderer/lib/init.js rename to lib/renderer/init.js diff --git a/atom/renderer/lib/inspector.js b/lib/renderer/inspector.js similarity index 100% rename from atom/renderer/lib/inspector.js rename to lib/renderer/inspector.js diff --git a/atom/renderer/lib/override.js b/lib/renderer/override.js similarity index 100% rename from atom/renderer/lib/override.js rename to lib/renderer/override.js diff --git a/atom/renderer/lib/web-view/guest-view-internal.js b/lib/renderer/web-view/guest-view-internal.js similarity index 100% rename from atom/renderer/lib/web-view/guest-view-internal.js rename to lib/renderer/web-view/guest-view-internal.js diff --git a/atom/renderer/lib/web-view/web-view-attributes.js b/lib/renderer/web-view/web-view-attributes.js similarity index 100% rename from atom/renderer/lib/web-view/web-view-attributes.js rename to lib/renderer/web-view/web-view-attributes.js diff --git a/atom/renderer/lib/web-view/web-view-constants.js b/lib/renderer/web-view/web-view-constants.js similarity index 100% rename from atom/renderer/lib/web-view/web-view-constants.js rename to lib/renderer/web-view/web-view-constants.js diff --git a/atom/renderer/lib/web-view/web-view.js b/lib/renderer/web-view/web-view.js similarity index 100% rename from atom/renderer/lib/web-view/web-view.js rename to lib/renderer/web-view/web-view.js From 6e3cb9e8eb71282b99b5fcc5ade1edb2f9712fe1 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 7 Mar 2016 17:22:38 -0800 Subject: [PATCH 2/9] Update paths for new JS location --- filenames.gypi | 112 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/filenames.gypi b/filenames.gypi index abb11453210..f9e19550c89 100644 --- a/filenames.gypi +++ b/filenames.gypi @@ -8,64 +8,64 @@ 'atom/browser/resources/mac/atom.icns', ], 'js_sources': [ - 'atom/browser/api/lib/app.js', - 'atom/browser/api/lib/auto-updater.js', - 'atom/browser/api/lib/auto-updater/auto-updater-native.js', - 'atom/browser/api/lib/auto-updater/auto-updater-win.js', - 'atom/browser/api/lib/auto-updater/squirrel-update-win.js', - 'atom/browser/api/lib/browser-window.js', - 'atom/browser/api/lib/content-tracing.js', - 'atom/browser/api/lib/dialog.js', - 'atom/browser/api/lib/exports/electron.js', - 'atom/browser/api/lib/global-shortcut.js', - 'atom/browser/api/lib/ipc.js', - 'atom/browser/api/lib/ipc-main.js', - 'atom/browser/api/lib/menu.js', - 'atom/browser/api/lib/menu-item.js', - 'atom/browser/api/lib/navigation-controller.js', - 'atom/browser/api/lib/power-monitor.js', - 'atom/browser/api/lib/power-save-blocker.js', - 'atom/browser/api/lib/protocol.js', - 'atom/browser/api/lib/session.js', - 'atom/browser/api/lib/screen.js', - 'atom/browser/api/lib/tray.js', - 'atom/browser/api/lib/web-contents.js', - 'atom/browser/lib/chrome-extension.js', - 'atom/browser/lib/desktop-capturer.js', - 'atom/browser/lib/guest-view-manager.js', - 'atom/browser/lib/guest-window-manager.js', - 'atom/browser/lib/init.js', - 'atom/browser/lib/objects-registry.js', - 'atom/browser/lib/rpc-server.js', - 'atom/common/api/lib/callbacks-registry.js', - 'atom/common/api/lib/clipboard.js', - 'atom/common/api/lib/crash-reporter.js', - 'atom/common/api/lib/deprecate.js', - 'atom/common/api/lib/deprecations.js', - 'atom/common/api/lib/exports/electron.js', - 'atom/common/api/lib/native-image.js', - 'atom/common/api/lib/shell.js', - 'atom/common/lib/init.js', - 'atom/common/lib/reset-search-paths.js', - 'atom/renderer/lib/chrome-api.js', - 'atom/renderer/lib/init.js', - 'atom/renderer/lib/inspector.js', - 'atom/renderer/lib/override.js', - 'atom/renderer/lib/web-view/guest-view-internal.js', - 'atom/renderer/lib/web-view/web-view.js', - 'atom/renderer/lib/web-view/web-view-attributes.js', - 'atom/renderer/lib/web-view/web-view-constants.js', - 'atom/renderer/api/lib/desktop-capturer.js', - 'atom/renderer/api/lib/exports/electron.js', - 'atom/renderer/api/lib/ipc.js', - 'atom/renderer/api/lib/ipc-renderer.js', - 'atom/renderer/api/lib/remote.js', - 'atom/renderer/api/lib/screen.js', - 'atom/renderer/api/lib/web-frame.js', + 'lib/browser/api/app.js', + 'lib/browser/api/auto-updater.js', + 'lib/browser/api/auto-updater/auto-updater-native.js', + 'lib/browser/api/auto-updater/auto-updater-win.js', + 'lib/browser/api/auto-updater/squirrel-update-win.js', + 'lib/browser/api/browser-window.js', + 'lib/browser/api/content-tracing.js', + 'lib/browser/api/dialog.js', + 'lib/browser/api/exports/electron.js', + 'lib/browser/api/global-shortcut.js', + 'lib/browser/api/ipc.js', + 'lib/browser/api/ipc-main.js', + 'lib/browser/api/menu.js', + 'lib/browser/api/menu-item.js', + 'lib/browser/api/navigation-controller.js', + 'lib/browser/api/power-monitor.js', + 'lib/browser/api/power-save-blocker.js', + 'lib/browser/api/protocol.js', + 'lib/browser/api/session.js', + 'lib/browser/api/screen.js', + 'lib/browser/api/tray.js', + 'lib/browser/api/web-contents.js', + 'lib/browser/chrome-extension.js', + 'lib/browser/desktop-capturer.js', + 'lib/browser/guest-view-manager.js', + 'lib/browser/guest-window-manager.js', + 'lib/browser/init.js', + 'lib/browser/objects-registry.js', + 'lib/browser/rpc-server.js', + 'lib/common/api/callbacks-registry.js', + 'lib/common/api/clipboard.js', + 'lib/common/api/crash-reporter.js', + 'lib/common/api/deprecate.js', + 'lib/common/api/deprecations.js', + 'lib/common/api/exports/electron.js', + 'lib/common/api/native-image.js', + 'lib/common/api/shell.js', + 'lib/common/init.js', + 'lib/common/reset-search-paths.js', + 'lib/renderer/chrome-api.js', + 'lib/renderer/init.js', + 'lib/renderer/inspector.js', + 'lib/renderer/override.js', + 'lib/renderer/web-view/guest-view-internal.js', + 'lib/renderer/web-view/web-view.js', + 'lib/renderer/web-view/web-view-attributes.js', + 'lib/renderer/web-view/web-view-constants.js', + 'lib/renderer/api/desktop-capturer.js', + 'lib/renderer/api/exports/electron.js', + 'lib/renderer/api/ipc.js', + 'lib/renderer/api/ipc-renderer.js', + 'lib/renderer/api/remote.js', + 'lib/renderer/api/screen.js', + 'lib/renderer/api/web-frame.js', ], 'js2c_sources': [ - 'atom/common/lib/asar.js', - 'atom/common/lib/asar_init.js', + 'lib/common/asar.js', + 'lib/common/asar_init.js', ], 'lib_sources': [ 'atom/app/atom_content_client.cc', From c47ad29124de46b6838e633b15510b10b29c700a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 7 Mar 2016 17:25:01 -0800 Subject: [PATCH 3/9] Move default_app to root of repo --- atom.gyp | 6 +++--- {atom/browser/default_app => default_app}/default_app.js | 0 {atom/browser/default_app => default_app}/index.html | 0 {atom/browser/default_app => default_app}/main.js | 0 {atom/browser/default_app => default_app}/package.json | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {atom/browser/default_app => default_app}/default_app.js (100%) rename {atom/browser/default_app => default_app}/index.html (100%) rename {atom/browser/default_app => default_app}/main.js (100%) rename {atom/browser/default_app => default_app}/package.json (100%) diff --git a/atom.gyp b/atom.gyp index 7f78bee91b1..b7075301894 100644 --- a/atom.gyp +++ b/atom.gyp @@ -69,7 +69,7 @@ { 'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources', 'files': [ - 'atom/browser/default_app', + 'default_app', ], }, ], @@ -171,7 +171,7 @@ { 'destination': '<(PRODUCT_DIR)/resources', 'files': [ - 'atom/browser/default_app', + 'default_app', ] }, ], @@ -212,7 +212,7 @@ { 'destination': '<(PRODUCT_DIR)/resources', 'files': [ - 'atom/browser/default_app', + 'default_app', ] }, ], diff --git a/atom/browser/default_app/default_app.js b/default_app/default_app.js similarity index 100% rename from atom/browser/default_app/default_app.js rename to default_app/default_app.js diff --git a/atom/browser/default_app/index.html b/default_app/index.html similarity index 100% rename from atom/browser/default_app/index.html rename to default_app/index.html diff --git a/atom/browser/default_app/main.js b/default_app/main.js similarity index 100% rename from atom/browser/default_app/main.js rename to default_app/main.js diff --git a/atom/browser/default_app/package.json b/default_app/package.json similarity index 100% rename from atom/browser/default_app/package.json rename to default_app/package.json From f109591d030801f96d33beb7c5e6bd3e1edb20a3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:03:25 -0800 Subject: [PATCH 4/9] Look for JS in lib dir --- tools/js2asar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/js2asar.py b/tools/js2asar.py index a17212419e1..cb02e33de65 100755 --- a/tools/js2asar.py +++ b/tools/js2asar.py @@ -29,7 +29,7 @@ def copy_js(js_source_files, output_dir): def call_asar(archive, output_dir): - js_dir = os.path.join(output_dir, 'atom') + js_dir = os.path.join(output_dir, 'lib') asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar') subprocess.check_call([find_node(), asar, 'pack', js_dir, archive]) From 006c77a00fb26572592af51e5201fc7a602e1e3c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:07:42 -0800 Subject: [PATCH 5/9] Update requires paths --- atom/common/node_bindings.cc | 1 - lib/browser/api/exports/electron.js | 2 +- lib/browser/init.js | 8 ++++---- lib/renderer/api/exports/electron.js | 2 +- lib/renderer/api/remote.js | 2 +- lib/renderer/init.js | 8 ++++---- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index 69e7906ffbb..608cc94b09a 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -165,7 +165,6 @@ node::Environment* NodeBindings::CreateEnvironment( base::FilePath script_path = resources_path.Append(FILE_PATH_LITERAL("atom.asar")) .Append(process_type) - .Append(FILE_PATH_LITERAL("lib")) .Append(FILE_PATH_LITERAL("init.js")); std::string script_path_str = script_path.AsUTF8Unsafe(); args.insert(args.begin() + 1, script_path_str.c_str()); diff --git a/lib/browser/api/exports/electron.js b/lib/browser/api/exports/electron.js index 7f97fcdbc4c..ea9dd6eb5a2 100644 --- a/lib/browser/api/exports/electron.js +++ b/lib/browser/api/exports/electron.js @@ -1,4 +1,4 @@ -const common = require('../../../../common/api/lib/exports/electron'); +const common = require('../../../common/api/exports/electron'); // Import common modules. diff --git a/lib/browser/init.js b/lib/browser/init.js index 4769faee0a3..d6a18361d69 100644 --- a/lib/browser/init.js +++ b/lib/browser/init.js @@ -11,19 +11,19 @@ var slice = [].slice; process.argv.splice(1, 1); // Clear search paths. -require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths')); +require(path.resolve(__dirname, '..', 'common', 'reset-search-paths')); // Import common settings. -require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')); +require(path.resolve(__dirname, '..', 'common', 'init')); var globalPaths = Module.globalPaths; if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) { - globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib')); + globalPaths.push(path.resolve(__dirname, 'api')); } // Expose public APIs. -globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports')); +globalPaths.push(path.resolve(__dirname, 'api', 'exports')); if (process.platform === 'win32') { // Redirect node's console to use our own implementations, since node can not diff --git a/lib/renderer/api/exports/electron.js b/lib/renderer/api/exports/electron.js index 3f0d3254cb8..34a498fcc06 100644 --- a/lib/renderer/api/exports/electron.js +++ b/lib/renderer/api/exports/electron.js @@ -1,4 +1,4 @@ -const common = require('../../../../common/api/lib/exports/electron'); +const common = require('../../../common/api/exports/electron'); // Import common modules. common.defineProperties(exports); diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js index 07aa2478293..42435d8304c 100644 --- a/lib/renderer/api/remote.js +++ b/lib/renderer/api/remote.js @@ -244,7 +244,7 @@ ipcRenderer.on('ATOM_RENDERER_RELEASE_CALLBACK', function(event, id) { }); // List all built-in modules in browser process. -const browserModules = require('../../../browser/api/lib/exports/electron'); +const browserModules = require('../../browser/api/exports/electron'); // And add a helper receiver for each one. var fn = function(name) { diff --git a/lib/renderer/init.js b/lib/renderer/init.js index 166e64237de..334aebda9cf 100644 --- a/lib/renderer/init.js +++ b/lib/renderer/init.js @@ -9,19 +9,19 @@ const Module = require('module'); process.argv.splice(1, 1); // Clear search paths. -require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths')); +require(path.resolve(__dirname, '..', 'common', 'reset-search-paths')); // Import common settings. -require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')); +require(path.resolve(__dirname, '..','common', 'init')); var globalPaths = Module.globalPaths; if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) { - globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib')); + globalPaths.push(path.resolve(__dirname, 'api')); } // Expose public APIs. -globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports')); +globalPaths.push(path.resolve(__dirname, 'api', 'exports')); // The global variable will be used by ipc for event dispatching var v8Util = process.atomBinding('v8_util'); From 418efbe6608ca3710a6edf684fb1d11eac74defa Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:10:31 -0800 Subject: [PATCH 6/9] Remove unneeded resolve calls --- lib/browser/init.js | 8 ++++---- lib/renderer/init.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/browser/init.js b/lib/browser/init.js index d6a18361d69..e1105df9b13 100644 --- a/lib/browser/init.js +++ b/lib/browser/init.js @@ -11,19 +11,19 @@ var slice = [].slice; process.argv.splice(1, 1); // Clear search paths. -require(path.resolve(__dirname, '..', 'common', 'reset-search-paths')); +require('../common/reset-search-paths'); // Import common settings. -require(path.resolve(__dirname, '..', 'common', 'init')); +require('../common/init'); var globalPaths = Module.globalPaths; if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) { - globalPaths.push(path.resolve(__dirname, 'api')); + globalPaths.push(path.join(__dirname, 'api')); } // Expose public APIs. -globalPaths.push(path.resolve(__dirname, 'api', 'exports')); +globalPaths.push(path.join(__dirname, 'api', 'exports')); if (process.platform === 'win32') { // Redirect node's console to use our own implementations, since node can not diff --git a/lib/renderer/init.js b/lib/renderer/init.js index 334aebda9cf..45ea2d45654 100644 --- a/lib/renderer/init.js +++ b/lib/renderer/init.js @@ -9,19 +9,19 @@ const Module = require('module'); process.argv.splice(1, 1); // Clear search paths. -require(path.resolve(__dirname, '..', 'common', 'reset-search-paths')); +require('../common/reset-search-paths'); // Import common settings. -require(path.resolve(__dirname, '..','common', 'init')); +require('../common/init'); var globalPaths = Module.globalPaths; if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) { - globalPaths.push(path.resolve(__dirname, 'api')); + globalPaths.push(path.join(__dirname, 'api')); } // Expose public APIs. -globalPaths.push(path.resolve(__dirname, 'api', 'exports')); +globalPaths.push(path.join(__dirname, 'api', 'exports')); // The global variable will be used by ipc for event dispatching var v8Util = process.atomBinding('v8_util'); From 4c9f5b71f7ecaea2436bc647f4491d3974b89e44 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:11:35 -0800 Subject: [PATCH 7/9] Run eslint over lib folder --- script/eslint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/eslint.py b/script/eslint.py index 7b912e0e1d6..4fbc5788570 100755 --- a/script/eslint.py +++ b/script/eslint.py @@ -24,7 +24,7 @@ def main(): settings = ['--quiet', '--config'] sourceConfig = os.path.join('script', 'eslintrc-base.json') - sourceFiles = ['atom'] + sourceFiles = ['lib'] execute([eslint] + settings + [sourceConfig] + sourceFiles) specConfig = os.path.join('script', 'eslintrc-spec.json') From 2e9fd7ce77faf451526464eaeb06521d31b9150d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:22:13 -0800 Subject: [PATCH 8/9] Update common api path --- lib/common/init.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common/init.js b/lib/common/init.js index a4766c4a7f9..923ef910886 100644 --- a/lib/common/init.js +++ b/lib/common/init.js @@ -14,7 +14,7 @@ process.atomBinding = function(name) { if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) { // Add common/api/lib to module search paths. - Module.globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib')); + Module.globalPaths.push(path.join(__dirname, 'api')); } From c3b058cea37eae064532ebac036eb67ed5db41e1 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 8 Mar 2016 11:22:58 -0800 Subject: [PATCH 9/9] Update path to ipc.js --- spec/asar-spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/asar-spec.js b/spec/asar-spec.js index f6f4bb71dbc..0e0a7f89f17 100644 --- a/spec/asar-spec.js +++ b/spec/asar-spec.js @@ -17,7 +17,7 @@ describe('asar package', function() { it('does not leak fd', function() { var readCalls = 1; while(readCalls <= 10000) { - fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'lib', 'ipc.js')); + fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'ipc.js')); readCalls++; } });