capacitor-standard-version 1.0.16 → 1.0.17

package/dist/index.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-(()=>{"use strict";var e={572:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0,t.readVersion=e=>e.split('versionName "')[1].split('"')[0],t.writeVersion=(e,t)=>{const[r,n]=t.split("-"),i=e.replace(/(.*(?:versionName[ \t]+).*)/g,`\t\tversionName "${r}"`);let o=Number(r.split(".").map((e=>1===e.length?`0${e}`:e)).join(""));if(n){const e=Number(n.split(".")[1]);e<100?o=100*o+e:o+=e}else o=100*o+99;return i.replace(/(.*(?:versionCode[ \t]+).*)/g,`\t\tversionCode ${o}`)}},91:function(e,t,r){var n=this&&this.__createBinding||(Object.create?function(e,t,r,n){void 0===n&&(n=r);var i=Object.getOwnPropertyDescriptor(t,r);i&&!("get"in i?!t.__esModule:i.writable||i.configurable)||(i={enumerable:!0,get:function(){return t[r]}}),Object.defineProperty(e,n,i)}:function(e,t,r,n){void 0===n&&(n=r),e[n]=t[r]}),i=this&&this.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),o=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&n(t,e,r);return i(t,e),t},a=this&&this.__awaiter||function(e,t,r,n){return new(r||(r=Promise))((function(i,o){function a(e){try{l(n.next(e))}catch(e){o(e)}}function s(e){try{l(n.throw(e))}catch(e){o(e)}}function l(e){var t;e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,s)}l((n=n.apply(e,t||[])).next())}))},s=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0});const l=s(r(322)),u=s(r(731)),c=s(r(389)),p=o(r(489)),d={noVerify:!0,tagPrefix:"",packageFiles:[{filename:"./package.json",type:"json"}],bumpFiles:[{filename:"./android/app/build.gradle",updater:o(r(572))},{filename:"./package.json",type:"json"},{filename:"./package-lock.json",type:"json"},{filename:"./ios/App/App.xcodeproj/project.pbxproj",updater:p}]};!function(){a(this,void 0,void 0,(function*(){try{const e=(0,c.default)(u.default.argv,d);yield(0,l.default)(e)}catch(e){throw console.error(e),e}}))}()},489:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0,t.readVersion=e=>e.match(/MARKETING_VERSION = [0-9]*.[0-9]*.[0-9]*/).toString().split("=")[1].trim(),t.writeVersion=(e,t)=>{const[r,n]=t.split("-"),i=e.replace(/(.*(?:MARKETING_VERSION[ \t]+).*)/g,`\t\t\t\tMARKETING_VERSION = "${r}";`);let o=Number(r.split(".").map((e=>1===e.length?`0${e}`:e)).join(""));if(n){const e=Number(n.split(".")[1]);e<100?o=100*o+e:o+=e}else o=100*o+99;return i.replace(/(.*(?:CURRENT_PROJECT_VERSION[ \t]+).*)/g,`\t\t\t\tCURRENT_PROJECT_VERSION = "${o}";`)}},389:e=>{e.exports=require("merge-deep")},322:e=>{e.exports=require("standard-version")},731:e=>{e.exports=require("standard-version/command")}},t={};!function r(n){var i=t[n];if(void 0!==i)return i.exports;var o=t[n]={exports:{}};return e[n].call(o.exports,o,o.exports,r),o.exports}(91)})();
+(()=>{"use strict";var e={572:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(800);t.readVersion=e=>e.split('versionName "')[1].split('"')[0],t.writeVersion=(e,t)=>{const[r,n]=t.split("-"),i=e.replace(/(.*(?:versionName[ \t]+).*)/g,`\t\tversionName "${r}"`);let s=(0,o.versionPureToCode)(r),a=(0,o.versionBetaToCode)(n);const u=(0,o.versionCodeToCodeBeta)(s,a);return i.replace(/(.*(?:versionCode[ \t]+).*)/g,`\t\tversionCode ${u}`)}},91:function(e,t,r){var o=this&&this.__createBinding||(Object.create?function(e,t,r,o){void 0===o&&(o=r);var n=Object.getOwnPropertyDescriptor(t,r);n&&!("get"in n?!t.__esModule:n.writable||n.configurable)||(n={enumerable:!0,get:function(){return t[r]}}),Object.defineProperty(e,o,n)}:function(e,t,r,o){void 0===o&&(o=r),e[o]=t[r]}),n=this&&this.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),i=this&&this.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&o(t,e,r);return n(t,e),t},s=this&&this.__awaiter||function(e,t,r,o){return new(r||(r=Promise))((function(n,i){function s(e){try{u(o.next(e))}catch(e){i(e)}}function a(e){try{u(o.throw(e))}catch(e){i(e)}}function u(e){var t;e.done?n(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(s,a)}u((o=o.apply(e,t||[])).next())}))},a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0});const u=i(r(572)),d=i(r(489)),c=a(r(389)),l=a(r(322)),p=a(r(731)),f={noVerify:!0,tagPrefix:"",packageFiles:[{filename:"./package.json",type:"json"}],bumpFiles:[{filename:"./android/app/build.gradle",updater:u},{filename:"./package.json",type:"json"},{filename:"./package-lock.json",type:"json"},{filename:"./ios/App/App.xcodeproj/project.pbxproj",updater:d}]};!function(){s(this,void 0,void 0,(function*(){try{const e=(0,c.default)(p.default.argv,f);yield(0,l.default)(e)}catch(e){throw console.error(e),e}}))}()},489:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(800);t.readVersion=e=>e.match(/MARKETING_VERSION = [0-9]*.[0-9]*.[0-9]*/).toString().split("=")[1].trim(),t.writeVersion=(e,t)=>{const[r,n]=t.split("-"),i=e.replace(/(.*(?:MARKETING_VERSION[ \t]+).*)/g,`\t\t\t\tMARKETING_VERSION = ${r};`);let s=(0,o.versionPureToCode)(r),a=(0,o.versionBetaToCode)(n);const u=(0,o.versionCodeToCodeBeta)(s,a);return i.replace(/(.*(?:CURRENT_PROJECT_VERSION[ \t]+).*)/g,`\t\t\t\tCURRENT_PROJECT_VERSION = ${u};`)}},800:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.versionCodeToCodeBeta=t.versionBetaToCode=t.versionPureToCode=void 0,t.versionPureToCode=e=>Number(e.split(".").map((e=>1===e.length?`0${e}`:e)).join("")),t.versionBetaToCode=e=>{if(!e)return 999;let t=Number(e.split(".")[1]||0);if(t>100)throw new Error("versionCodeBeta should be less than 100");return e.startsWith("rc.")?t=800+t:e.startsWith("beta.")?t=700+t:e.startsWith("alpha.")&&(t=600+t),t},t.versionCodeToCodeBeta=(e,t)=>1e3*e+t},389:e=>{e.exports=require("merge-deep")},322:e=>{e.exports=require("standard-version")},731:e=>{e.exports=require("standard-version/command")}},t={};!function r(o){var n=t[o];if(void 0!==n)return n.exports;var i=t[o]={exports:{}};return e[o].call(i.exports,i,i.exports,r),i.exports}(91)})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-standard-version",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Default standard-version config for capacitor app",
   "main": "dist/index.js",
   "bin": {

package/src/bin/android.ts

@@ -1,34 +1,22 @@
+import { versionBetaToCode, versionCodeToCodeBeta, versionPureToCode } from './utils';
+
 export const readVersion = contents => {
   const version = contents.split('versionName "')[1].split('"')[0];
   return version;
 };
 
 export const writeVersion = (contents, version) => {
-  const [versionPure, versionBata] = version.split('-');
+  const [versionPure, versionBeta] = version.split('-');
   const newContent = contents.replace(
     /(.*(?:versionName[ \t]+).*)/g,
     `\t\tversionName "${versionPure}"`
   );
-  let versionCode = Number(
-    versionPure
-      .split('.')
-      .map(v => (v.length === 1 ? `0${v}` : v))
-      .join('')
-  );
-  if (versionBata) {
-    const versionCodeBeta = Number(versionBata.split('.')[1]);
-    if (versionCodeBeta < 100) {
-      versionCode = versionCode * 100 + versionCodeBeta;
-    } else {
-      versionCode += versionCodeBeta;
-    }
-  } else {
-    // keep the order of the versionCode main version should be bigger than beta version
-    versionCode = versionCode * 100 + 99;
-  }
+  let versionCode = versionPureToCode(versionPure);
+  let versionCodeBeta = versionBetaToCode(versionBeta);
+  const versionCodeFinal = versionCodeToCodeBeta(versionCode, versionCodeBeta);
   const finalContent = newContent.replace(
     /(.*(?:versionCode[ \t]+).*)/g,
-    `\t\tversionCode ${versionCode}`
+    `\t\tversionCode ${versionCodeFinal}`
   );
   return finalContent;
 };

package/src/bin/index.ts

@@ -1,37 +1,38 @@
+import * as android from './android';
+import * as ios from './ios';
+
+import merge from 'merge-deep';
 import standardVersion from 'standard-version';
 import command from 'standard-version/command';
-import merge from 'merge-deep';
-import * as ios from './ios';
-import * as android from './android';
 
 const baseConfig = {
   noVerify: true,
   tagPrefix: '',
   packageFiles: [
     {
-      filename: "./package.json",
-      type: "json"
+      filename: './package.json',
+      type: 'json',
     },
   ],
   bumpFiles: [
     {
-      filename: "./android/app/build.gradle",
-      updater: android
+      filename: './android/app/build.gradle',
+      updater: android,
     },
     {
-      filename: "./package.json",
-      type: "json"
+      filename: './package.json',
+      type: 'json',
     },
     {
-      filename: "./package-lock.json",
-      type: "json"
+      filename: './package-lock.json',
+      type: 'json',
     },
     {
-      filename: "./ios/App/App.xcodeproj/project.pbxproj",
-      updater: ios
-    }
-  ]
-}
+      filename: './ios/App/App.xcodeproj/project.pbxproj',
+      updater: ios,
+    },
+  ],
+};
 
 async function run() {
   try {
@@ -44,4 +45,4 @@ async function run() {
   }
 }
 
-run();
+run();

package/src/bin/ios.ts

@@ -1,3 +1,5 @@
+import { versionBetaToCode, versionCodeToCodeBeta, versionPureToCode } from './utils';
+
 export const readVersion = contents => {
   const marketingVersionString = contents.match(/MARKETING_VERSION = [0-9]*.[0-9]*.[0-9]*/);
   const version = marketingVersionString.toString().split('=')[1].trim();
@@ -5,31 +7,17 @@ export const readVersion = contents => {
 };
 
 export const writeVersion = (contents, version) => {
-  const [versionPure, versionBata] = version.split('-');
+  const [versionPure, versionBeta] = version.split('-');
   const newContent = contents.replace(
     /(.*(?:MARKETING_VERSION[ \t]+).*)/g,
-    `\t\t\t\tMARKETING_VERSION = "${versionPure}";`
-  );
-  let versionCode = Number(
-    versionPure
-      .split('.')
-      .map(v => (v.length === 1 ? `0${v}` : v))
-      .join('')
+    `\t\t\t\tMARKETING_VERSION = ${versionPure};`
   );
-  if (versionBata) {
-    const versionCodeBeta = Number(versionBata.split('.')[1]);
-    if (versionCodeBeta < 100) {
-      versionCode = versionCode * 100 + versionCodeBeta;
-    } else {
-      versionCode += versionCodeBeta;
-    }
-  } else {
-    // keep the order of the versionCode main version should be bigger than beta version
-    versionCode = versionCode * 100 + 99;
-  }
+  let versionCode = versionPureToCode(versionPure);
+  let versionCodeBeta = versionBetaToCode(versionBeta);
+  const versionCodeFinal = versionCodeToCodeBeta(versionCode, versionCodeBeta);
   const finalContent = newContent.replace(
     /(.*(?:CURRENT_PROJECT_VERSION[ \t]+).*)/g,
-    `\t\t\t\tCURRENT_PROJECT_VERSION = "${versionCode}";`
+    `\t\t\t\tCURRENT_PROJECT_VERSION = ${versionCodeFinal};`
   );
   return finalContent;
 };

package/src/bin/utils.ts

@@ -0,0 +1,33 @@
+export const versionPureToCode = (versionPure: string): number => {
+  let versionCode = Number(
+    versionPure
+      .split('.')
+      .map(v => (v.length === 1 ? `0${v}` : v))
+      .join('')
+  );
+  return versionCode;
+};
+
+export const versionBetaToCode = (versionBeta: string): number => {
+  // Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.2 < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
+  //  Become  600 < 601 < 602 < 700 < 702 < 711 < 801 < 900
+  if (!versionBeta) {
+    return 999;
+  }
+  let versionCodeBeta = Number(versionBeta.split('.')[1] || 0);
+  if (versionCodeBeta > 100) {
+    throw new Error('versionCodeBeta should be less than 100');
+  }
+  if (versionBeta.startsWith('rc.')) {
+    versionCodeBeta = 800 + versionCodeBeta;
+  } else if (versionBeta.startsWith('beta.')) {
+    versionCodeBeta = 700 + versionCodeBeta;
+  } else if (versionBeta.startsWith('alpha.')) {
+    versionCodeBeta = 600 + versionCodeBeta;
+  }
+  return versionCodeBeta;
+};
+
+export const versionCodeToCodeBeta = (versionCode: number, versionCodeBeta: number): number => {
+  return versionCode * 1000 + versionCodeBeta;
+};