diff --git a/package-lock.json b/package-lock.json index 23eaa79..60b3208 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,16 @@ { "name": "psychojs", - "version": "2021.2.x", + "version": "2022.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "psychojs", - "version": "2021.2.x", + "version": "2022.1.1", "license": "MIT", "dependencies": { + "@pixi/filter-adjustment": "^4.1.3", + "esbuild-plugin-glsl": "^1.0.5", "howler": "^2.2.1", "log4javascript": "github:Ritzlgrmft/log4javascript", "pako": "^1.0.10", @@ -337,6 +339,15 @@ "@pixi/utils": "6.0.4" } }, + "node_modules/@pixi/filter-adjustment": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@pixi/filter-adjustment/-/filter-adjustment-4.1.3.tgz", + "integrity": "sha512-W+NhPiZRYKoRToa5+tkU95eOw8gnS5dfIp3ZP+pLv2mdER9RI+4xHxp1uLHMqUYZViTaMdZIIoVOuCgHFPYCbQ==", + "peerDependencies": { + "@pixi/constants": "^6.0.0", + "@pixi/core": "^6.0.0" + } + }, "node_modules/@pixi/filter-alpha": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/@pixi/filter-alpha/-/filter-alpha-6.0.4.tgz", @@ -957,12 +968,22 @@ "version": "0.12.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.5.tgz", "integrity": "sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==", - "dev": true, "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" } }, + "node_modules/esbuild-plugin-glsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-glsl/-/esbuild-plugin-glsl-1.1.0.tgz", + "integrity": "sha512-OBzCa/nRy/Vbm62DBzBnV25p1BfTpvFf2SP2Vv9Ls38sdEEuHzhYT5xTOh3Ghu+77VI4iZsOam19cmjwq5RcJQ==", + "engines": { + "node": ">= 0.10.18" + }, + "peerDependencies": { + "esbuild": "0.x.x" + } + }, "node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -2690,6 +2711,12 @@ "@pixi/utils": "6.0.4" } }, + "@pixi/filter-adjustment": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@pixi/filter-adjustment/-/filter-adjustment-4.1.3.tgz", + "integrity": "sha512-W+NhPiZRYKoRToa5+tkU95eOw8gnS5dfIp3ZP+pLv2mdER9RI+4xHxp1uLHMqUYZViTaMdZIIoVOuCgHFPYCbQ==", + "requires": {} + }, "@pixi/filter-alpha": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/@pixi/filter-alpha/-/filter-alpha-6.0.4.tgz", @@ -3230,8 +3257,13 @@ "esbuild": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.5.tgz", - "integrity": "sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==", - "dev": true + "integrity": "sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==" + }, + "esbuild-plugin-glsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-glsl/-/esbuild-plugin-glsl-1.1.0.tgz", + "integrity": "sha512-OBzCa/nRy/Vbm62DBzBnV25p1BfTpvFf2SP2Vv9Ls38sdEEuHzhYT5xTOh3Ghu+77VI4iZsOam19cmjwq5RcJQ==", + "requires": {} }, "escape-string-regexp": { "version": "1.0.5", diff --git a/src/core/PsychoJS.js b/src/core/PsychoJS.js index 954c82b..eb11dd0 100644 --- a/src/core/PsychoJS.js +++ b/src/core/PsychoJS.js @@ -176,7 +176,7 @@ export class PsychoJS } this.logger.info("[PsychoJS] Initialised."); - this.logger.info("[PsychoJS] @version 2022.1.1"); + this.logger.info("[PsychoJS] @version 2022.1.2"); // hide the initialisation message: jQuery("#root").addClass("is-ready"); diff --git a/src/data/ExperimentHandler.js b/src/data/ExperimentHandler.js index 10ecf91..70ce3ea 100644 --- a/src/data/ExperimentHandler.js +++ b/src/data/ExperimentHandler.js @@ -338,14 +338,14 @@ export class ExperimentHandler extends PsychObject else if (this._psychoJS.config.experiment.saveFormat === ExperimentHandler.SaveFormat.DATABASE) { const gitlabConfig = this._psychoJS.config.gitlab; - const projectId = (typeof gitlabConfig !== "undefined" && typeof gitlabConfig.projectId !== "undefined") ? gitlabConfig.projectId : undefined; + const __projectId = (typeof gitlabConfig !== "undefined" && typeof gitlabConfig.projectId !== "undefined") ? gitlabConfig.projectId : undefined; let documents = []; for (let r = 0; r < data.length; r++) { let doc = { - projectId, + __projectId, __experimentName: this._experimentName, __participant: this._participant, __session: this._session,