capacitor-standard-version 1.1.7 → 1.1.9

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.1.9](https://github.com/Cap-go/capacitor-standard-version/compare/v1.1.8...v1.1.9) (2023-01-15)
+
+
+### Bug Fixes
+
+* trigger ci ([1661894](https://github.com/Cap-go/capacitor-standard-version/commit/1661894a11578c8423408d1cf1491aa331dec9d9))
+
+### [1.1.8](https://github.com/Cap-go/capacitor-standard-version/compare/v1.1.7...v1.1.8) (2023-01-12)
+
+
+### Bug Fixes
+
+* iisue build ([fed33cf](https://github.com/Cap-go/capacitor-standard-version/commit/fed33cf808a65a7b7a405186d3cd83f0b8dcb650))
+* upgrade script for standar version ([e164b26](https://github.com/Cap-go/capacitor-standard-version/commit/e164b261a822504d4d2c7e6b4917bbe3281e7884))
+* use fork ([a7e9621](https://github.com/Cap-go/capacitor-standard-version/commit/a7e9621b9cc54dc3b9dd4f17b05b1e6882abbb96))
+
+### [1.1.8](https://github.com/Cap-go/capacitor-standard-version/compare/v1.1.7...v1.1.8) (2023-01-12)
+
+
+### Bug Fixes
+
+* upgrade script for standar version ([e164b26](https://github.com/Cap-go/capacitor-standard-version/commit/e164b261a822504d4d2c7e6b4917bbe3281e7884))
+
 ### [1.1.7](https://github.com/Cap-go/capacitor-standard-version/compare/v1.1.6...v1.1.7) (2023-01-12)
 
 ### [1.1.6](https://github.com/Cap-go/capacitor-standard-version/compare/v1.1.5...v1.1.6) (2023-01-12)

package/dist/index.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-(()=>{"use strict";var e={360:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(245);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}`)}},93: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(360)),d=i(r(290)),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}}))}()},290:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(245);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};`)}},245:(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}(93)})();
+(()=>{"use strict";var e={360:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(245),n=/versionName\s"(.*)"$/g,i=/versionCode\s(.*)$/g;t.readVersion=e=>{const t=e.match(n);return t&&t[0]?t.replace(n,"$1"):null},t.writeVersion=(e,t)=>{const[r,s]=t.split("-"),a=e.replace(n,`versionName "${r}"`);let u=(0,o.versionPureToCode)(r),c=(0,o.versionBetaToCode)(s);const d=(0,o.versionCodeToCodeBeta)(u,c);return a.replace(i,`versionCode ${d}`)}},93: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(360)),c=i(r(290)),d=a(r(667)),l=a(r(870)),p=a(r(389)),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:c}]};!function(){s(this,void 0,void 0,(function*(){try{const e=(0,p.default)(l.default.argv,f);yield(0,d.default)(e)}catch(e){throw console.error(e),e}}))}()},290:(e,t,r)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.writeVersion=t.readVersion=void 0;const o=r(245),n=/MARKETING_VERSION\s=\s(.*);/g,i=/CURRENT_PROJECT_VERSION\s=\s(.*);/g;t.readVersion=function(e){const t=e.match(n);return t&&t[0]?t.replace(n,"$1"):null},t.writeVersion=function(e,t){const[r,s]=t.split("-"),a=e.replace(n,`MARKETING_VERSION = ${r};`);let u=(0,o.versionPureToCode)(r),c=(0,o.versionBetaToCode)(s);const d=(0,o.versionCodeToCodeBeta)(u,c);return a.replace(i,`CURRENT_PROJECT_VERSION = ${d};`)}},245:(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},667:e=>{e.exports=require("@capgo/standard-version")},870:e=>{e.exports=require("@capgo/standard-version/command")},389:e=>{e.exports=require("merge-deep")}},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}(93)})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-standard-version",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Default standard-version config for capacitor app",
   "main": "dist/index.js",
   "bin": {
@@ -31,8 +31,8 @@
   },
   "homepage": "https://github.com/Cap-go/capacitor-standard-version#readme",
   "dependencies": {
-    "merge-deep": "^3.0.3",
-    "standard-version": "^9.5.0"
+    "@capgo/standard-version": "^1.0.6",
+    "merge-deep": "^3.0.3"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.0",

package/src/bin/android.ts

@@ -1,22 +1,19 @@
 import { versionBetaToCode, versionCodeToCodeBeta, versionPureToCode } from './utils';
 
+const regexM = /versionName\s"(.*)"$/g;
+const regexC = /versionCode\s(.*)$/g;
 export const readVersion = contents => {
-  const version = contents.split('versionName "')[1].split('"')[0];
+  const vString = contents.match(regexM);
+  const version = vString && vString[0] ? vString.replace(regexM, '$1') : null;
   return version;
 };
 
 export const writeVersion = (contents, version) => {
   const [versionPure, versionBeta] = version.split('-');
-  const newContent = contents.replace(
-    /(.*(?:versionName[ \t]+).*)/g,
-    `\t\tversionName "${versionPure}"`
-  );
+  const newContent = contents.replace(regexM, `versionName "${versionPure}"`);
   let versionCode = versionPureToCode(versionPure);
   let versionCodeBeta = versionBetaToCode(versionBeta);
   const versionCodeFinal = versionCodeToCodeBeta(versionCode, versionCodeBeta);
-  const finalContent = newContent.replace(
-    /(.*(?:versionCode[ \t]+).*)/g,
-    `\t\tversionCode ${versionCodeFinal}`
-  );
+  const finalContent = newContent.replace(regexC, `versionCode ${versionCodeFinal}`);
   return finalContent;
 };

package/src/bin/index.ts

@@ -1,9 +1,9 @@
 import * as android from './android';
 import * as ios from './ios';
 
+import standardVersion from '@capgo/standard-version';
+import command from '@capgo/standard-version/command';
 import merge from 'merge-deep';
-import standardVersion from 'standard-version';
-import command from 'standard-version/command';
 
 const baseConfig = {
   noVerify: true,

package/src/bin/ios.ts

@@ -1,23 +1,19 @@
 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();
+const regexM = /MARKETING_VERSION\s=\s(.*);/g;
+const regexC = /CURRENT_PROJECT_VERSION\s=\s(.*);/g;
+export function readVersion(contents) {
+  const vString = contents.match(regexM);
+  const version = vString && vString[0] ? vString.replace(regexM, '$1') : null;
   return version;
-};
+}
 
-export const writeVersion = (contents, version) => {
+export function writeVersion(contents, version) {
   const [versionPure, versionBeta] = version.split('-');
-  const newContent = contents.replace(
-    /(.*(?:MARKETING_VERSION[ \t]+).*)/g,
-    `\t\t\t\tMARKETING_VERSION = ${versionPure};`
-  );
+  const newContent = contents.replace(regexM, `MARKETING_VERSION = ${versionPure};`);
   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 = ${versionCodeFinal};`
-  );
+  const finalContent = newContent.replace(regexC, `CURRENT_PROJECT_VERSION = ${versionCodeFinal};`);
   return finalContent;
-};
+}