Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review create default values and small rework #1100

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Review create default values and small rework #1100

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9be11bc
fix: correct mixed default value for project name
ath0mas Apr 17, 2021
ac77109
fix: correct mixed default value for package name
ath0mas Apr 17, 2021
eb24607
feat(create): init opts and project_path relative same as cdv-android
ath0mas Apr 17, 2021
84a2eea
feat(create): remove check on parent directory, ensureDirSync does it…
ath0mas Apr 17, 2021
f7f84aa
Merge branch 'master' into feature/create-defaults-ios
ath0mas Nov 6, 2023
5492818
fix: redo correct package and project name
ath0mas Nov 6, 2023
88d3d00
feat(create): redo init opts and project_path relative same as cdv-an…
ath0mas Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions bin/lib/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,25 +194,23 @@ function relpath (_path, start) {
*
*/
exports.createProject = (project_path, package_name, project_name, opts, config) => {
package_name = package_name || 'my.cordova.project';
project_name = project_name || 'CordovaExample';
const use_shared = !!opts.link;
const bin_dir = path.join(ROOT, 'bin');
const project_parent = path.dirname(project_path);
const project_template_dir = opts.customTemplate || path.join(bin_dir, 'templates', 'project');
opts = opts || {};

// check that project path doesn't exist
// Set default values for path, package and name
project_path = path.relative(process.cwd(), project_path);
// Check if project already exists
if (fs.existsSync(project_path)) {
return Promise.reject(new CordovaError('Project already exists'));
return Promise.reject(new CordovaError('Project already exists! Delete and recreate'));
}

// check that parent directory does exist so cp -r will not fail
if (!fs.existsSync(project_parent)) {
return Promise.reject(new CordovaError(`Parent directory "${project_parent}" of given project path does not exist`));
}
package_name = package_name || 'io.cordova.helloCordova';
project_name = project_name || 'Hello Cordova';
const use_shared = !!opts.link;
const bin_dir = path.join(ROOT, 'bin');
const project_template_dir = opts.customTemplate || path.join(bin_dir, 'templates', 'project');

events.emit('log', 'Creating Cordova project for the iOS platform:');
events.emit('log', `\tPath: ${path.relative(process.cwd(), project_path)}`);
events.emit('log', `\tPath: ${project_path}`);
events.emit('log', `\tPackage: ${package_name}`);
events.emit('log', `\tName: ${project_name}`);

Expand Down
2 changes: 1 addition & 1 deletion bin/templates/project/__PROJECT_NAME__/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<widget xmlns = "http://www.w3.org/ns/widgets"
id = "io.cordova.helloCordova"
version = "2.0.0">
<name>HelloCordova</name>
<name>Hello Cordova</name>

<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion bin/templates/scripts/cordova/lib/Podfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Podfile.prototype.__parseForDeclarations = function (text) {
// split by \n
const arr = text.split('\n');

// getting lines between "platform :ios, '11.0'"" and "target 'HelloCordova'" do
// getting lines between "platform :ios, '11.0'"" and "target 'Hello Cordova'" do
const declarationsPreRE = new RegExp('platform :ios,\\s+\'[^\']+\'');
const declarationsPostRE = new RegExp('target\\s+\'[^\']+\'\\s+do');
const declarationRE = new RegExp('^\\s*[^#]');
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/dummyProj/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.cordova.hellocordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/legacy-only.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-and-legacy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/modern-only.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/launch-storyboard-support/configs/none.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-arbitrary-loads-for-media-false.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-for-media="false" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-arbitrary-loads-for-media-true.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-for-media="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-arbitrary-loads-in-media-false.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-in-media="false" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-arbitrary-loads-in-media-true.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-in-media="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-arbitrary-loads-in-web-content-true.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-in-web-content="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/allows-local-networking-true.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-local-networking="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/set-origin-with-mixed-nsallows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="http://cordova.apache.org" allows-arbitrary-loads-in-web-content="true" allows-arbitrary-loads-in-media="true" allows-local-networking="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/wildcard-navigation-with-mixed-nsallows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<allow-navigation href="http://cordova.apache.org" allows-arbitrary-loads-in-web-content="true" allows-arbitrary-loads-in-media="true" allows-local-networking="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/wildcard-navigation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<allow-navigation href="*" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/prepare/wildcard-with-mixed-nsallows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
under the License.
-->

<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SampleApp</name>
<access origin="*" allows-arbitrary-loads-in-web-content="true" allows-arbitrary-loads-in-media="true" allows-local-networking="true" />
</widget>
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/resource-file-support/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config-3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-packageName="io.cordova.helloCordova.android" id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down
2 changes: 1 addition & 1 deletion tests/spec/unit/fixtures/test-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.cordova.helloCordova" ios-CFBundleIdentifier="io.cordova.helloCordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Hello Cordova</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
Expand Down