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-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 35c7ece8 feat!: remove platform pinning (#894)
35c7ece8 is described below
commit 35c7ece8034af58e635ed515ac176be1fd476f96
Author: エリス <[email protected]>
AuthorDate: Sun Apr 23 13:30:06 2023 +0900
feat!: remove platform pinning (#894)
* feat!: remove platform pinning
* No longer manage the platform pinning information.
* Always fetch the latest version from npmjs registry when version not
supplied.
* test: update specs
* chore: update comment
---
spec/cordova/platform/addHelper.spec.js | 2 +-
spec/cordova/platform/listDeprecated.spec.js | 2 +-
src/cordova/platform/addHelper.js | 8 +++----
src/cordova/platform/list.js | 35 +++++++++++-----------------
src/platforms/platformsConfig.json | 4 ----
5 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/spec/cordova/platform/addHelper.spec.js
b/spec/cordova/platform/addHelper.spec.js
index 756060ff..3f2ae0a1 100644
--- a/spec/cordova/platform/addHelper.spec.js
+++ b/spec/cordova/platform/addHelper.spec.js
@@ -169,7 +169,7 @@ describe('cordova/platform/addHelper', function () {
it('should fall back to using pinned version if both package.json
and config.xml do not specify it', function () {
return platform_addHelper('add', hooks_mock, projectRoot,
['ios'], { restoring: true }).then(function () {
- expect(events.emit).toHaveBeenCalledWith('verbose',
'Grabbing pinned version.');
+ expect(events.emit).toHaveBeenCalledWith('verbose',
'Grabbing the latest released version from the npmjs registry.');
});
});
diff --git a/spec/cordova/platform/listDeprecated.spec.js
b/spec/cordova/platform/listDeprecated.spec.js
index 251bb90a..86fe357d 100644
--- a/spec/cordova/platform/listDeprecated.spec.js
+++ b/spec/cordova/platform/listDeprecated.spec.js
@@ -57,7 +57,7 @@ describe('cordova/platform/list show deprecated platforms
info', function () {
it('shows available platforms with deprecated info', () => {
return platform_list(hooks_mock, projectRoot, { save: true })
.then((result) => {
- expect(events.emit).toHaveBeenCalledWith('results',
jasmine.stringMatching(/Installed platforms:[\s\S]*Available.*:[\s]*android
1.2.3[\s]*wp7 4.5.6 \(deprecated\)/));
+ expect(events.emit).toHaveBeenCalledWith('results',
jasmine.stringMatching(/Available platforms:\n\s\sandroid\n\s\swp7
\(deprecated\)/));
});
});
diff --git a/src/cordova/platform/addHelper.js
b/src/cordova/platform/addHelper.js
index 3c5fb6c8..8a78d413 100644
--- a/src/cordova/platform/addHelper.js
+++ b/src/cordova/platform/addHelper.js
@@ -98,10 +98,10 @@ function addHelper (cmd, hooksRunner, projectRoot, targets,
opts) {
spec =
module.exports.getVersionFromConfigFile(platform, cfg);
}
- // If spec still doesn't exist, try to use pinned version
- if (!spec && platforms.info[platform]) {
- events.emit('verbose', 'Grabbing pinned version.');
- spec = platforms.info[platform].version;
+ // If spec still doesn't exist, grab latest released
version from the npmjs registry
+ if (!spec) {
+ events.emit('verbose', 'Grabbing the latest released
version from the npmjs registry.');
+ spec = 'latest';
}
// Handle local paths
diff --git a/src/cordova/platform/list.js b/src/cordova/platform/list.js
index 0c635f23..f110c393 100644
--- a/src/cordova/platform/list.js
+++ b/src/cordova/platform/list.js
@@ -27,27 +27,20 @@ function list (hooksRunner, projectRoot, opts) {
.then(function () {
return cordova_util.getInstalledPlatformsWithVersions(projectRoot);
}).then(function (platformMap) {
- let platformsText = [];
- for (const plat in platformMap) {
- platformsText.push(platformMap[plat] ? plat + ' ' +
platformMap[plat] : plat);
- }
-
- platformsText = addDeprecatedInformationToPlatforms(platformsText);
- let results = 'Installed platforms:\n ' +
platformsText.sort().join('\n ') + '\n';
- let available = platforms.list.filter(platforms.hostSupports);
-
- available = available.filter(function (p) {
- return !platformMap[p]; // Only those not already installed.
- });
-
- available = available.map(function (p) {
- return p.concat(' ', platforms.info[p].version);
- });
-
- available = addDeprecatedInformationToPlatforms(available);
- results += 'Available platforms: \n ' + available.sort().join('\n
');
-
- events.emit('results', results);
+ // Exrtacted the installed platforms
+ const installed = Object.keys(platformMap)
+ .map(p => platformMap[p] ? p + ' ' + platformMap[p] : p)
+ .sort();
+ const installedResult =
addDeprecatedInformationToPlatforms(installed).join('\n ');
+ events.emit('results', `Installed platforms:\n
${installedResult}`);
+
+ // Get the avaliable platforms excluding the installed ones
+ const available = platforms.list
+ .filter(platforms.hostSupports)
+ .filter(p => !platformMap[p])
+ .sort();
+ const availableResult =
addDeprecatedInformationToPlatforms(available).join('\n ');
+ events.emit('results', `Available platforms:\n
${availableResult}`);
}).then(function () {
return hooksRunner.fire('after_platform_ls', opts);
});
diff --git a/src/platforms/platformsConfig.json
b/src/platforms/platformsConfig.json
index 134be956..a238ec78 100644
--- a/src/platforms/platformsConfig.json
+++ b/src/platforms/platformsConfig.json
@@ -2,24 +2,20 @@
"ios": {
"hostos": ["darwin"],
"url": "https://github.com/apache/cordova-ios.git";,
- "version": "^6.2.0",
"deprecated": false
},
"android": {
"url": "https://github.com/apache/cordova-android.git";,
- "version": "^10.1.1",
"deprecated": false
},
"browser": {
"parser_file": "../cordova/metadata/browser_parser",
"handler_file": "../plugman/platforms/browser",
"url": "https://github.com/apache/cordova-browser.git";,
- "version": "^6.0.0",
"deprecated": false
},
"electron": {
"url": "https://github.com/apache/cordova-electron.git";,
- "version": "^3.0.0",
"deprecated": false
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
