You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2019/03/11 02:58:05 UTC
[cordova-electron] branch master updated: Rename Electron Main
Entry File (#36)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-electron.git
The following commit(s) were added to refs/heads/master by this push:
new 220e95d Rename Electron Main Entry File (#36)
220e95d is described below
commit 220e95d7239a518e8965612883eaf2d3de23717f
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Mon Mar 11 11:58:00 2019 +0900
Rename Electron Main Entry File (#36)
---
DOCUMENTATION.md | 2 +-
bin/lib/create.js | 4 ++--
bin/templates/cordova/lib/PackageJsonParser.js | 2 +-
bin/templates/cordova/lib/run.js | 2 +-
bin/templates/project/{main.js => cdv-electron-main.js} | 0
.../unit/templates/cordova/lib/PackageJsonParser.spec.js | 12 ++++++------
tests/spec/unit/templates/cordova/lib/run.spec.js | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index 0e3162a..bd6279c 100644
--- a/DOCUMENTATION.md
+++ b/DOCUMENTATION.md
@@ -160,7 +160,7 @@ If you want to support displays with different DPI densities at the same time, y
## Customizing the Application's Main Process
-In the `{PROJECT_ROOT_DIR}/platform/electron/platform_www/` directory, the file `main.js` defines the application's main process. We can customize the application's window appearance as well as defining or enabling additional features in this file.
+In the `{PROJECT_ROOT_DIR}/platform/electron/platform_www/` directory, the file `cdv-electron-main.js` defines the application's main process. We can customize the application's window appearance as well as defining or enabling additional features in this file.
### Window Appearance (BrowserWindow)
diff --git a/bin/lib/create.js b/bin/lib/create.js
index b028647..7d50ff4 100644
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -77,8 +77,8 @@ module.exports.createProject = (project_path, package_name, project_name, option
// copy cordova js file to platform_www
fs.copySync(path.join(ROOT, 'cordova-lib', 'cordova.js'), path.join(platform_www, 'cordova.js'), { overwrite: false });
- // copy main.js
- fs.copySync(path.join(ROOT, 'bin/templates/project/main.js'), path.join(platform_www, 'main.js'), { overwrite: false });
+ // copy cdv-electron-main.js
+ fs.copySync(path.join(ROOT, 'bin/templates/project/cdv-electron-main.js'), path.join(platform_www, 'cdv-electron-main.js'), { overwrite: false });
// copy cdv-electron-settings.json
fs.copySync(path.join(ROOT, 'bin/templates/project/cdv-electron-settings.json'), path.join(platform_www, 'cdv-electron-settings.json'), { overwrite: false });
diff --git a/bin/templates/cordova/lib/PackageJsonParser.js b/bin/templates/cordova/lib/PackageJsonParser.js
index 62ab0b8..557fd48 100644
--- a/bin/templates/cordova/lib/PackageJsonParser.js
+++ b/bin/templates/cordova/lib/PackageJsonParser.js
@@ -25,7 +25,7 @@ class PackageJsonParser {
this.path = path.join(wwwDir, 'package.json');
this.www = wwwDir;
this.package = {
- main: 'main.js'
+ main: 'cdv-electron-main.js'
};
}
diff --git a/bin/templates/cordova/lib/run.js b/bin/templates/cordova/lib/run.js
index 81b13f7..bd597f0 100644
--- a/bin/templates/cordova/lib/run.js
+++ b/bin/templates/cordova/lib/run.js
@@ -22,7 +22,7 @@ const proc = require('child_process');
const path = require('path');
module.exports.run = (args) => {
- const pathToMain = path.resolve(__dirname, '..', '..', 'www', 'main.js');
+ const pathToMain = path.resolve(__dirname, '..', '..', 'www', 'cdv-electron-main.js');
const child = proc.spawn(electron, [pathToMain]);
child.on('close', (code) => {
diff --git a/bin/templates/project/main.js b/bin/templates/project/cdv-electron-main.js
similarity index 100%
rename from bin/templates/project/main.js
rename to bin/templates/project/cdv-electron-main.js
diff --git a/tests/spec/unit/templates/cordova/lib/PackageJsonParser.spec.js b/tests/spec/unit/templates/cordova/lib/PackageJsonParser.spec.js
index 998d8cd..088ce21 100644
--- a/tests/spec/unit/templates/cordova/lib/PackageJsonParser.spec.js
+++ b/tests/spec/unit/templates/cordova/lib/PackageJsonParser.spec.js
@@ -56,7 +56,7 @@ describe('Testing PackageJsonParser.js:', () => {
packageJsonParser = new PackageJsonParser(locations.www);
// mock package JSON Object
- const packageJsonObj = { main: 'main.js' };
+ const packageJsonObj = { main: 'cdv-electron-main.js' };
expect(packageJsonParser.path).toEqual(path.join('mock', 'www', 'package.json'));
expect(packageJsonParser.www).toEqual(locations.www);
@@ -67,7 +67,7 @@ describe('Testing PackageJsonParser.js:', () => {
packageJsonParser = new PackageJsonParser(locations.www).configure(undefined);
// mock package JSON Object
- const packageJsonObj = { main: 'main.js' };
+ const packageJsonObj = { main: 'cdv-electron-main.js' };
expect(packageJsonParser.package).toEqual(packageJsonObj);
});
@@ -79,7 +79,7 @@ describe('Testing PackageJsonParser.js:', () => {
const packageJsonObj = {
package:
{
- main: 'main.js',
+ main: 'cdv-electron-main.js',
name: 'io.cordova.hellocordova',
displayName: 'HelloCordova',
version: '1.0.0',
@@ -100,7 +100,7 @@ describe('Testing PackageJsonParser.js:', () => {
const packageJsonObj = {
package:
{
- main: 'main.js',
+ main: 'cdv-electron-main.js',
name: 'whatever',
displayName: 'HelloWorld',
version: '1.1.1',
@@ -126,7 +126,7 @@ describe('Testing PackageJsonParser.js:', () => {
let packageJsonObj = {
package:
{
- main: 'main.js',
+ main: 'cdv-electron-main.js',
name: 'io.cordova.hellocordova',
displayName: 'HelloCordova',
version: '1.0.0',
@@ -164,7 +164,7 @@ describe('Testing PackageJsonParser.js:', () => {
let packageJsonObj = {
package:
{
- main: 'main.js',
+ main: 'cdv-electron-main.js',
name: 'whatever',
displayName: 'HelloWorld',
version: '1.1.1',
diff --git a/tests/spec/unit/templates/cordova/lib/run.spec.js b/tests/spec/unit/templates/cordova/lib/run.spec.js
index 46ac67b..8882d42 100644
--- a/tests/spec/unit/templates/cordova/lib/run.spec.js
+++ b/tests/spec/unit/templates/cordova/lib/run.spec.js
@@ -23,12 +23,12 @@ const run = rewire('../../../../../../bin/templates/cordova/lib/run');
describe('Run', () => {
describe('run export method', () => {
- it('should spawn electron with main.js.', () => {
+ it('should spawn electron with cdv-electron-main.js.', () => {
const _process = run.__get__('process');
const spawnSpy = jasmine.createSpy('spawn');
const onSpy = jasmine.createSpy('on');
const exitSpy = jasmine.createSpy('exit');
- const expectedPathToMain = path.resolve(__dirname, '..', '..', '..', '..', '..', '..', 'bin', 'templates', 'www', 'main.js');
+ const expectedPathToMain = path.resolve(__dirname, '..', '..', '..', '..', '..', '..', 'bin', 'templates', 'www', 'cdv-electron-main.js');
run.__set__('electron', 'electron-require');
run.__set__('process', {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org