From 46ab65e56b94ca803fcfe416681034fb4aee6ec7 Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 14 Apr 2023 11:31:21 +0200 Subject: [PATCH 1/4] chore: update packages to branch feature/TR-5209/cleanup-calculator-engine --- package-lock.json | 15 ++++++--------- package.json | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2f7d573..23ec1de3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1420,15 +1420,13 @@ } }, "@oat-sa/tao-core-libs": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-libs/-/tao-core-libs-0.5.1.tgz", - "integrity": "sha512-1fAwH0INmP/Xmqn/lvD5Amcpncm8KSMk1IOS2/SZehkspQQnTq4zCOiUwBKttGr18nzzflySX3CUVY4xMuA/LA==", + "version": "git+https://github.com/oat-sa/tao-core-libs-fe.git#f225ba6bebb3f4e037ece8d59e64485431edff03", + "from": "git+https://github.com/oat-sa/tao-core-libs-fe.git#feature/TR-5209/cleanup-calculator-engine", "dev": true }, "@oat-sa/tao-core-sdk": { - "version": "1.21.1", - "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-sdk/-/tao-core-sdk-1.21.1.tgz", - "integrity": "sha512-VI1JK8Qxn3dxTS0TfYdYVVtF6nriBf1ra2lFY+jhrnbmn6oPrODqW0eeTdYiFohL0Lit44YeUGxTQfcQHuTwkw==", + "version": "git+https://github.com/oat-sa/tao-core-sdk-fe.git#58c3594b6b8b6be8cfad0c84091bc4270ead9a86", + "from": "git+https://github.com/oat-sa/tao-core-sdk-fe.git#feature/TR-5209/cleanup-calculator-engine", "dev": true, "requires": { "fastestsmallesttextencoderdecoder": "1.0.14", @@ -1437,9 +1435,8 @@ } }, "@oat-sa/tao-core-ui": { - "version": "1.64.1", - "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-ui/-/tao-core-ui-1.64.1.tgz", - "integrity": "sha512-1afP5rYSai6SnptzVRfaDfSqfvtO9UruCXA5b2jAINfqJzrhNO5Ax7UispdsY7GTwtGgiUwo9SQ4XvwqgRX5Eg==", + "version": "git+https://github.com/oat-sa/tao-core-ui-fe.git#1410e8b9e361b69b3184b0ad993567f71d92ac01", + "from": "git+https://github.com/oat-sa/tao-core-ui-fe.git#integration/TR-5209/replace-calculator-engine", "dev": true }, "@oat-sa/tao-item-runner": { diff --git a/package.json b/package.json index 803fea16..b6d3fcb8 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,9 @@ "@oat-sa/expr-eval": "1.3.1", "@oat-sa/prettier-config": "^0.1.1", "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0", - "@oat-sa/tao-core-libs": "^0.5.1", - "@oat-sa/tao-core-sdk": "^1.21.1", - "@oat-sa/tao-core-ui": "^1.64.1", + "@oat-sa/tao-core-libs": "https://github.com/oat-sa/tao-core-libs-fe.git#feature/TR-5209/cleanup-calculator-engine", + "@oat-sa/tao-core-sdk": "https://github.com/oat-sa/tao-core-sdk-fe.git#feature/TR-5209/cleanup-calculator-engine", + "@oat-sa/tao-core-ui": "https://github.com/oat-sa/tao-core-ui-fe.git#integration/TR-5209/replace-calculator-engine", "@oat-sa/tao-item-runner": "^0.8.1", "@oat-sa/tao-item-runner-qti": "^1.7.2", "@oat-sa/tao-qunit-testrunner": "^1.0.3", From b8bcbf4a9dcf440a46319099abd857fbc593070d Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 14 Apr 2023 11:32:28 +0200 Subject: [PATCH 2/4] chore: remove unused dependencies expr-eval and decimal.js --- package-lock.json | 12 ------------ package.json | 2 -- 2 files changed, 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23ec1de3..7ad4e330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1398,12 +1398,6 @@ } } }, - "@oat-sa/expr-eval": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@oat-sa/expr-eval/-/expr-eval-1.3.1.tgz", - "integrity": "sha512-pUVOvkgWiydBmrxOEcmuLOWU9/1ZJZZ4Iped07Qf6P/E0mYVaEaKkBLRBfSyL1NuwX9VZPjxZ7qzfAi7zGJ88Q==", - "dev": true - }, "@oat-sa/prettier-config": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@oat-sa/prettier-config/-/prettier-config-0.1.1.tgz", @@ -2528,12 +2522,6 @@ } } }, - "decimal.js": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.1.1.tgz", - "integrity": "sha512-vEEgyk1fWVEnv7lPjkNedAIjzxQDue5Iw4FeX4UkNUDSVyD/jZTD0Bw2kAO7k6iyyJRAhM9oxxI0D1ET6k0Mmg==", - "dev": true - }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", diff --git a/package.json b/package.json index b6d3fcb8..0a83e475 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "@babel/preset-env": "^7.19.4", "@oat-sa/browserslist-config-tao": "^1.0.1", "@oat-sa/eslint-config-tao": "^1.2.0", - "@oat-sa/expr-eval": "1.3.1", "@oat-sa/prettier-config": "^0.1.1", "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0", "@oat-sa/tao-core-libs": "https://github.com/oat-sa/tao-core-libs-fe.git#feature/TR-5209/cleanup-calculator-engine", @@ -65,7 +64,6 @@ "@oat-sa/tao-test-runner": "^0.9.0", "async": "0.2.10", "autoprefixer": "^9.6.1", - "decimal.js": "10.1.1", "dompurify": "^2.4.0", "eslint": "^8.25.0", "eslint-plugin-es": "^4.1.0", From 758610aefc82cd4f744648ab27777e7ec1ec074b Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 21 Apr 2023 12:29:39 +0200 Subject: [PATCH 3/4] chore: update dependencies --- package-lock.json | 15 +++++++++------ package.json | 6 +++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ad4e330..aae1131b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1414,13 +1414,15 @@ } }, "@oat-sa/tao-core-libs": { - "version": "git+https://github.com/oat-sa/tao-core-libs-fe.git#f225ba6bebb3f4e037ece8d59e64485431edff03", - "from": "git+https://github.com/oat-sa/tao-core-libs-fe.git#feature/TR-5209/cleanup-calculator-engine", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-libs/-/tao-core-libs-0.5.2.tgz", + "integrity": "sha512-bDrjNDAU8RJS3D5ZHHVZX5B5EtiuPXRqaU+We2fK0G4GKOpsTepuiCR69C/TamACw+yiaY+mCvM9MqMCvHv4tg==", "dev": true }, "@oat-sa/tao-core-sdk": { - "version": "git+https://github.com/oat-sa/tao-core-sdk-fe.git#58c3594b6b8b6be8cfad0c84091bc4270ead9a86", - "from": "git+https://github.com/oat-sa/tao-core-sdk-fe.git#feature/TR-5209/cleanup-calculator-engine", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-sdk/-/tao-core-sdk-2.0.0.tgz", + "integrity": "sha512-GXpcruKkJ23gb3KD23T5LSkrP/StaToAgkTK38Sr0mMYXwBRRA2z/KLSjCEfOyYxWSNMuQ/dsSMhVYykvv2nVg==", "dev": true, "requires": { "fastestsmallesttextencoderdecoder": "1.0.14", @@ -1429,8 +1431,9 @@ } }, "@oat-sa/tao-core-ui": { - "version": "git+https://github.com/oat-sa/tao-core-ui-fe.git#1410e8b9e361b69b3184b0ad993567f71d92ac01", - "from": "git+https://github.com/oat-sa/tao-core-ui-fe.git#integration/TR-5209/replace-calculator-engine", + "version": "1.68.0", + "resolved": "https://registry.npmjs.org/@oat-sa/tao-core-ui/-/tao-core-ui-1.68.0.tgz", + "integrity": "sha512-xn4H4kYJDfpvTOr/OGK1/mmYnKJdzOOePZcbePEKhpaBJ3+n6ou1qjvCjcpUpGy5urVqS1HXjPGTPxqyukf32Q==", "dev": true }, "@oat-sa/tao-item-runner": { diff --git a/package.json b/package.json index 0a83e475..c07a9044 100644 --- a/package.json +++ b/package.json @@ -55,9 +55,9 @@ "@oat-sa/eslint-config-tao": "^1.2.0", "@oat-sa/prettier-config": "^0.1.1", "@oat-sa/rollup-plugin-wildcard-external": "^0.1.0", - "@oat-sa/tao-core-libs": "https://github.com/oat-sa/tao-core-libs-fe.git#feature/TR-5209/cleanup-calculator-engine", - "@oat-sa/tao-core-sdk": "https://github.com/oat-sa/tao-core-sdk-fe.git#feature/TR-5209/cleanup-calculator-engine", - "@oat-sa/tao-core-ui": "https://github.com/oat-sa/tao-core-ui-fe.git#integration/TR-5209/replace-calculator-engine", + "@oat-sa/tao-core-libs": "^0.5.2", + "@oat-sa/tao-core-sdk": "^2.0.0", + "@oat-sa/tao-core-ui": "^1.68.0", "@oat-sa/tao-item-runner": "^0.8.1", "@oat-sa/tao-item-runner-qti": "^1.7.2", "@oat-sa/tao-qunit-testrunner": "^1.0.3", From 74de41c0f0928861e7e8c90860619f44db79b701 Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 21 Apr 2023 12:43:30 +0200 Subject: [PATCH 4/4] chore: bump version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index aae1131b..0b850eaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-test-runner-qti", - "version": "2.33.2", + "version": "2.34.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c07a9044..e282365d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-test-runner-qti", - "version": "2.33.2", + "version": "2.34.0", "description": "TAO Test Runner QTI implementation", "files": [ "dist",