From de75c7553ac3a80da24dee9a2722c369b74343bc Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 11:49:56 +0000 Subject: [PATCH 1/8] Update version to 2.0.0 --- .gitlab-ci.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5bf5c02..06c59a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive # Requires manually keeping up to date with package.json - TF_TFW_VERSION: 1.4.0 + TF_TFW_VERSION: 2.0.0 stages: - build diff --git a/package-lock.json b/package-lock.json index 9ee635d3..a70b1d65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "uuid": "^9.0.0" diff --git a/package.json b/package.json index a4470b2d..4b505109 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "description": "The web tooling library for Ultraleap's TouchFree solution.", "keywords": [ "touchfree", From 8a6f2a7d5ca23f3db1034d0bcd34abf7380a8829 Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 13:43:29 +0000 Subject: [PATCH 2/8] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9916e708..3c18bf48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to the TouchFree Web Tooling project are documented in this The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [2.0.0] - 2023-11-07 ### Added From 9e980c9573aedac7b1b52ba73ba69f0d89cfee1c Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 15:10:59 +0000 Subject: [PATCH 3/8] Update snapping example for 2.0.0 --- Plugins/SnappingPlugin/Snapping_Example.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Plugins/SnappingPlugin/Snapping_Example.js b/Plugins/SnappingPlugin/Snapping_Example.js index f53e1f1e..a55ad378 100644 --- a/Plugins/SnappingPlugin/Snapping_Example.js +++ b/Plugins/SnappingPlugin/Snapping_Example.js @@ -1,10 +1,11 @@ window.onload = function () { touchfree.init(); + console.log(touchfree); var plugins = [new SnappingPlugin.SnappingPlugin()]; - touchfree.InputActionManager.setPlugins(plugins); + touchfree.internal.InputActionManager.setPlugins(plugins); - touchfree.InputActionManager.plugins[0].setSnapModeToMagnet(); - touchfree.InputActionManager.plugins[0].setSnapDistance(25); - touchfree.InputActionManager.plugins[0].setSnapSoftness(0.3); + touchfree.internal.InputActionManager.plugins[0].setSnapModeToMagnet(); + touchfree.internal.InputActionManager.plugins[0].setSnapDistance(25); + touchfree.internal.InputActionManager.plugins[0].setSnapSoftness(0.3); }; From 0014bc6d544926d20b39bdb5e1bdd0c9590d51c0 Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 15:11:21 +0000 Subject: [PATCH 4/8] Remove console log --- Plugins/SnappingPlugin/Snapping_Example.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Plugins/SnappingPlugin/Snapping_Example.js b/Plugins/SnappingPlugin/Snapping_Example.js index a55ad378..00316083 100644 --- a/Plugins/SnappingPlugin/Snapping_Example.js +++ b/Plugins/SnappingPlugin/Snapping_Example.js @@ -1,6 +1,5 @@ window.onload = function () { touchfree.init(); - console.log(touchfree); var plugins = [new SnappingPlugin.SnappingPlugin()]; touchfree.internal.InputActionManager.setPlugins(plugins); From ab087f8b80715d997a463d10cb7608733f48ff79 Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 15:46:11 +0000 Subject: [PATCH 5/8] Add third party licenses --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06c59a58..d7a7e0ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,8 @@ build::bundle: - python ./Scripts/UpdateVersionFile.py --path ${CI_PROJECT_DIR}/Version.txt --swVer $TF_TFW_VERSION --apiVer $TF_API_VERSION --ref ${CI_COMMIT_SHORT_SHA} --branchName "$CI_COMMIT_REF_NAME" - Get-Content ${CI_PROJECT_DIR}/Version.txt + - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt + # Build Tooling - cd ${CI_PROJECT_DIR} - npm i @@ -44,6 +46,7 @@ build::bundle: } # Package Tooling - mkdir ./Tooling_Release + - cp $CI_PROJECT_DIR/ThirdPartyLicenses.txt ./Tooling_Release - cp ${CI_PROJECT_DIR}/Version.txt ./Tooling_Release - cp ${CI_PROJECT_DIR}/CHANGELOG.md ./Tooling_Release - cp -R ${CI_PROJECT_DIR}/dist ./Tooling_Release From 21b38119446c6429bf7a5f59d105789d22e90c33 Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 15:55:39 +0000 Subject: [PATCH 6/8] Fix CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7a7e0ce..e9b13d83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,10 +32,10 @@ build::bundle: - python ./Scripts/UpdateVersionFile.py --path ${CI_PROJECT_DIR}/Version.txt --swVer $TF_TFW_VERSION --apiVer $TF_API_VERSION --ref ${CI_COMMIT_SHORT_SHA} --branchName "$CI_COMMIT_REF_NAME" - Get-Content ${CI_PROJECT_DIR}/Version.txt - - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt # Build Tooling - cd ${CI_PROJECT_DIR} + - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt - npm i - npm run build:bundle # Clean last build From bc7b64bc08dfafdf971a71a148bfb299b47c8fbb Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Tue, 7 Nov 2023 16:04:16 +0000 Subject: [PATCH 7/8] Fix CI 2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9b13d83..58950e8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,9 @@ build::bundle: # Build Tooling - cd ${CI_PROJECT_DIR} - - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt - npm i - npm run build:bundle + - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt # Clean last build - cd ${CI_PROJECT_DIR} - if (Test-Path -Path "./Tooling_Release") { From 020530d7af28eb1e0e230659711c4a375d539bf0 Mon Sep 17 00:00:00 2001 From: Tom Cartwright Date: Thu, 9 Nov 2023 10:21:39 +0000 Subject: [PATCH 8/8] Update npm script CI restrictions --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58950e8d..176ea68f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,7 +140,7 @@ npm::publish: - docker-windows image: registry.ultrahaptics.com/ooh/infrastructure/windows-touchfree-toolchain:latest only: - - release + - /^release\/.+/ script: - npm config -L project set //registry.npmjs.org/:username=ul-touchfree - npm config -L project set //registry.npmjs.org/:_authToken=$NPM_TOKEN @@ -155,7 +155,7 @@ npm::pack: - docker-windows image: registry.ultrahaptics.com/ooh/infrastructure/windows-touchfree-toolchain:latest only: - - release + - /^release\/.+/ script: - npm i - npm run build:tsc