From 9ca4cd6e1476adf17436da8ebe25ebec59b52777 Mon Sep 17 00:00:00 2001 From: m1ga Date: Sat, 18 May 2024 22:48:00 +0200 Subject: [PATCH 1/3] feat: reduce empty lines in controllers --- Alloy/commands/compile/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Alloy/commands/compile/index.js b/Alloy/commands/compile/index.js index 36f3d12a2..e0ed11a1d 100755 --- a/Alloy/commands/compile/index.js +++ b/Alloy/commands/compile/index.js @@ -836,7 +836,7 @@ function parseAlloyComponent(view, dir, manifest, noView, fileRestriction) { cCode.parentControllerName : CU[CONST.DOCROOT_BASECONTROLLER_PROPERTY] || "'BaseController'"; template.__MAPMARKER_CONTROLLER_CODE__ += cCode.controller; template.preCode += cCode.pre; - template.ES6Mod += cCode.es6mods; + template.ES6Mod += cCode.es6mods.trim(); // for each model variable in the bindings map... _.each(styler.bindingsMap, function(mapping, modelVar) { From 30effaf9a0f148dec8d5c32e922785188fcb1772 Mon Sep 17 00:00:00 2001 From: m1ga Date: Sat, 18 May 2024 23:26:29 +0200 Subject: [PATCH 2/3] workflow --- .github/workflows/build.yml | 5 ++--- .github/workflows/publish.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c8fa986b..f3b1315da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v1 with: - node-version: '16.x' + node-version: '18.x' - name: Install dependencies run: npm ci - name: Lint @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - nodeVersion: [ '16.x' ] + nodeVersion: [ '18.x' ] os: [ macos-latest ] tiSDK: [ latest ] steps: @@ -47,4 +47,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run tests run: npm test - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ed15caa2..e6ead8aa3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - name: Setup node uses: actions/setup-node@v2 with: - node-version: '16' + node-version: '18' registry-url: 'https://registry.npmjs.org' - name: Install dependencies From 0f044449d7a0fe7ebc37d2abea20022374918927 Mon Sep 17 00:00:00 2001 From: m1ga Date: Sat, 18 May 2024 23:29:05 +0200 Subject: [PATCH 3/3] workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3b1315da..fff1c09dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: run: | npm ci npm i titanium -g - ti sdk install ${{ matrix.tiSDK }} -d + ti sdk install ${{ matrix.tiSDK }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run tests