Merge pull request #2353 from oat-sa/feature/ADF-1417/upgrade-to-node18

Feature/ADF-1417/Upgrade to Node 18
oat-sa · May 12, 2023 · f2c3ccb · f2c3ccb
2 parents bee583f + 65f255a
commit f2c3ccb
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 141 deletions.
diff --git a/composer.json b/composer.json
@@ -66,9 +66,9 @@
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
         "naneau/semver": "~0.0.7",
         "oat-sa/generis": ">=15.22",
-        "oat-sa/tao-core": ">=50.28.0",
-        "oat-sa/extension-tao-item": ">=11.32.0",
-        "oat-sa/extension-tao-test": ">=6.6.0"
+        "oat-sa/tao-core": ">=53.0.0",
+        "oat-sa/extension-tao-item": ">=12.0.0",
+        "oat-sa/extension-tao-test": ">=16.0.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/views/css/item-creator.css b/views/css/item-creator.css
diff --git a/views/css/item-creator.css.map b/views/css/item-creator.css.map
diff --git a/views/css/qti-runner.css b/views/css/qti-runner.css
diff --git a/views/css/qti-runner.css.map b/views/css/qti-runner.css.map
diff --git a/views/css/themes/default.css b/views/css/themes/default.css
diff --git a/views/css/themes/default.css.map b/views/css/themes/default.css.map
diff --git a/views/js/loader/qtiLoader.min.js.map b/views/js/loader/qtiLoader.min.js.map
diff --git a/views/js/loader/taoQtiItem.min.js b/views/js/loader/taoQtiItem.min.js
diff --git a/views/js/loader/taoQtiItem.min.js.map b/views/js/loader/taoQtiItem.min.js.map
diff --git a/views/js/loader/taoQtiItemRunner.es5.min.js b/views/js/loader/taoQtiItemRunner.es5.min.js
diff --git a/views/js/loader/taoQtiItemRunner.es5.min.js.map b/views/js/loader/taoQtiItemRunner.es5.min.js.map
diff --git a/views/js/loader/taoQtiItemRunner.min.js b/views/js/loader/taoQtiItemRunner.min.js
diff --git a/views/js/loader/taoQtiItemRunner.min.js.map b/views/js/loader/taoQtiItemRunner.min.js.map
diff --git a/views/package-lock.json b/views/package-lock.json
diff --git a/views/package.json b/views/package.json
@@ -8,7 +8,7 @@
         "url": "git+https://github.com/oat-sa/extension-tao-itemqti.git"
     },
     "dependencies": {
-        "@oat-sa/tao-item-runner": "0.8.1",
-        "@oat-sa/tao-item-runner-qti": "1.11.0"
+        "@oat-sa/tao-item-runner": "^0.8.2",
+        "@oat-sa/tao-item-runner-qti": "^1.11.1"
     }
 }
diff --git a/views/scss/qti/_associate.scss b/views/scss/qti/_associate.scss
@@ -40,7 +40,7 @@
             position: relative;
             @extend .clearfix;
             &:before {
-                @extend .clearfix:before;
+                @extend %clearfix-before;
                 border-top: 1px solid whiten($info, 0.5);
                 display: block;
                 width: 80%;
@@ -51,7 +51,7 @@
                 top: 50%;
             }
             &:after {
-                @extend .clearfix:after;
+                @extend %clearfix-after;
             }
             & > .target {
                 background: white;

diff --git a/views/scss/qti/_qti-base.scss b/views/scss/qti/_qti-base.scss
@@ -206,10 +206,10 @@ $mainContainer : '.qti-item';
             padding-right: 3px;
             padding-left: 3px;
             &:after {
-                @extend .clearfix:after;
+                @extend %clearfix-after;
             }
             &:before {
-                @extend .clearfix:before;
+                @extend %clearfix-before;
             }
             & > li {
                 display: block;