From 3ce7445af001bbb8ace9a14bd4f9436bb3024b6b Mon Sep 17 00:00:00 2001 From: Pierre Ferreira Date: Fri, 10 Nov 2023 15:12:37 +0100 Subject: [PATCH] =?UTF-8?q?ajout=20de=20d=C3=A9pendances=20pour=20un=20swi?= =?UTF-8?q?tch=20et=20stub=20dans=20les=20params=20de=20jeu=20:package:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cryptide_project/package-lock.json | 9 + cryptide_project/package.json | 1 + cryptide_project/yarn.lock | 467 +++++++++++++++++++++++++++++ 3 files changed, 477 insertions(+) diff --git a/cryptide_project/package-lock.json b/cryptide_project/package-lock.json index ff80e3b..c3db481 100644 --- a/cryptide_project/package-lock.json +++ b/cryptide_project/package-lock.json @@ -27,9 +27,12 @@ "react-intl": "^6.5.2", "react-router-dom": "^6.18.0", "react-scripts": "5.0.1", +<<<<<<< HEAD <<<<<<< HEAD "react-switch": "^7.0.0", ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) <<<<<<< HEAD "socket.io": "^4.7.2", "socket.io-client": "^4.7.2", @@ -44,7 +47,13 @@ "socket.io": "^4.7.2", "socket.io-client": "^4.7.2", >>>>>>> 2ba7efc (Début du serveur) +<<<<<<< HEAD >>>>>>> 6399f16 (Début du serveur) +======= +======= + "react-switch": "^7.0.0", +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "typescript": "^5.2.2", "vis-network": "^9.1.9", "web-vitals": "^2.1.4" diff --git a/cryptide_project/package.json b/cryptide_project/package.json index 5bf5418..575e64c 100644 --- a/cryptide_project/package.json +++ b/cryptide_project/package.json @@ -26,6 +26,7 @@ "socket.io-client": "^4.7.2", "socket.io": "^4.7.2", "socket.io-client": "^4.7.2", + "react-switch": "^7.0.0", "typescript": "^5.2.2", "vis-network": "^9.1.9", "web-vitals": "^2.1.4" diff --git a/cryptide_project/yarn.lock b/cryptide_project/yarn.lock index 5e8f1ed..1fdb5c6 100644 --- a/cryptide_project/yarn.lock +++ b/cryptide_project/yarn.lock @@ -48,6 +48,7 @@ "version" "7.23.2" "@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.11.1", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.0", "@babel/core@^7.16.0", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0": +<<<<<<< HEAD <<<<<<< HEAD version "7.23.2" resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz" @@ -57,6 +58,16 @@ "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz" "version" "7.23.2" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==" + "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz" + "version" "7.23.2" +======= + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz" + integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.13" @@ -419,6 +430,7 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow@^7.14.5", "@babel/plugin-syntax-flow@^7.22.5": +<<<<<<< HEAD <<<<<<< HEAD version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz" @@ -428,6 +440,16 @@ "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz" "version" "7.22.5" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==" + "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz" + "version" "7.22.5" +======= + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz" + integrity sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@babel/helper-plugin-utils" "^7.22.5" @@ -873,6 +895,7 @@ "@babel/plugin-transform-react-jsx" "^7.22.5" "@babel/plugin-transform-react-jsx@^7.14.9", "@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5": +<<<<<<< HEAD <<<<<<< HEAD version "7.22.15" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz" @@ -882,6 +905,16 @@ "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz" "version" "7.22.15" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==" + "resolved" "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz" + "version" "7.22.15" +======= + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz" + integrity sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-module-imports" "^7.22.15" @@ -1298,6 +1331,13 @@ dependencies: "@types/hammerjs" "^2.0.36" +"@egjs/hammerjs@^2.0.0": + version "2.0.17" + resolved "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz" + integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A== + dependencies: + "@types/hammerjs" "^2.0.36" + "@eslint-community/eslint-utils@^4.2.0": "integrity" "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==" "resolved" "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -1406,6 +1446,7 @@ "version" "6.4.2" "@fortawesome/fontawesome-svg-core@^6.4.2", "@fortawesome/fontawesome-svg-core@~1 || ~6": +<<<<<<< HEAD <<<<<<< HEAD version "6.4.2" resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz" @@ -1415,6 +1456,16 @@ "resolved" "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz" "version" "6.4.2" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==" + "resolved" "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz" + "version" "6.4.2" +======= + version "6.4.2" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz" + integrity sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@fortawesome/fontawesome-common-types" "6.4.2" @@ -1799,6 +1850,7 @@ "source-map" "^0.7.3" "@popperjs/core@^2.11.6", "@popperjs/core@^2.11.8": +<<<<<<< HEAD <<<<<<< HEAD version "2.11.8" resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" @@ -1808,6 +1860,16 @@ "resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" "version" "2.11.8" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" + "resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" + "version" "2.11.8" +======= + version "2.11.8" + resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "@react-aria/ssr@^3.5.0": "integrity" "sha512-Y54xs483rglN5DxbwfCPHxnkvZ+gZ0LbSYmR72LyWPGft8hN/lrl1VRS1EW2SMjnkEWlj+Km2mwvA3kEHDUA0A==" @@ -2079,6 +2141,20 @@ "lz-string" "^1.5.0" "pretty-format" "^27.0.2" +"@testing-library/dom@>=7.21.4": + version "9.3.3" + resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.3.tgz" + integrity sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/runtime" "^7.12.5" + "@types/aria-query" "^5.0.1" + aria-query "5.1.3" + chalk "^4.1.0" + dom-accessibility-api "^0.5.9" + lz-string "^1.5.0" + pretty-format "^27.0.2" + "@testing-library/jest-dom@^5.17.0": "integrity" "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==" "resolved" "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz" @@ -2126,6 +2202,7 @@ "version" "5.0.4" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.9": +<<<<<<< HEAD <<<<<<< HEAD version "7.20.4" resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz" @@ -2135,6 +2212,16 @@ "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz" "version" "7.20.4" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==" + "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz" + "version" "7.20.4" +======= + version "7.20.4" + resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.4.tgz" + integrity sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" @@ -2260,6 +2347,7 @@ "@types/node" "*" "@types/hammerjs@^2.0.36": +<<<<<<< HEAD <<<<<<< HEAD version "2.0.44" resolved "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.44.tgz" @@ -2269,6 +2357,16 @@ "resolved" "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.44.tgz" "version" "2.0.44" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-pdGBkAh4ggfXAkiwgmTdROJe3mwvLWJYm6JiaAwCtskAU0Weh+JQyyMTbhvxjxD2n8sr8PrxVwyDzmpnK4pUrQ==" + "resolved" "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.44.tgz" + "version" "2.0.44" +======= + version "2.0.44" + resolved "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.44.tgz" + integrity sha512-pdGBkAh4ggfXAkiwgmTdROJe3mwvLWJYm6JiaAwCtskAU0Weh+JQyyMTbhvxjxD2n8sr8PrxVwyDzmpnK4pUrQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "@types/hoist-non-react-statics@^3.3.1": "integrity" "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==" @@ -2401,6 +2499,7 @@ "@types/react" "*" "@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@16 || 17 || 18": +<<<<<<< HEAD <<<<<<< HEAD version "18.2.36" resolved "https://registry.npmjs.org/@types/react/-/react-18.2.36.tgz" @@ -2410,6 +2509,16 @@ "resolved" "https://registry.npmjs.org/@types/react/-/react-18.2.36.tgz" "version" "18.2.36" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-o9XFsHYLLZ4+sb9CWUYwHqFVoG61SesydF353vFMMsQziiyRu8np4n2OYMUSDZ8XuImxDr9c5tR7gidlH29Vnw==" + "resolved" "https://registry.npmjs.org/@types/react/-/react-18.2.36.tgz" + "version" "18.2.36" +======= + version "18.2.36" + resolved "https://registry.npmjs.org/@types/react/-/react-18.2.36.tgz" + integrity sha512-o9XFsHYLLZ4+sb9CWUYwHqFVoG61SesydF353vFMMsQziiyRu8np4n2OYMUSDZ8XuImxDr9c5tR7gidlH29Vnw== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2517,6 +2626,7 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.0.0 || ^5.0.0", "@typescript-eslint/eslint-plugin@^5.5.0": +<<<<<<< HEAD <<<<<<< HEAD version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz" @@ -2526,6 +2636,16 @@ "resolved" "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz" "version" "5.62.0" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==" + "resolved" "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz" + "version" "5.62.0" +======= + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz" + integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@eslint-community/regexpp" "^4.4.0" "@typescript-eslint/scope-manager" "5.62.0" @@ -2546,6 +2666,7 @@ "@typescript-eslint/utils" "5.62.0" "@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.5.0": +<<<<<<< HEAD <<<<<<< HEAD version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz" @@ -2555,6 +2676,16 @@ "resolved" "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz" "version" "5.62.0" >>>>>>> af92727 (Début du serveur) +======= + "integrity" "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==" + "resolved" "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz" + "version" "5.62.0" +======= + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz" + integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@typescript-eslint/scope-manager" "5.62.0" "@typescript-eslint/types" "5.62.0" @@ -2791,6 +2922,7 @@ "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz" "version" "7.2.0" +<<<<<<< HEAD <<<<<<< HEAD "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8, acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: version "8.11.2" @@ -2807,6 +2939,8 @@ address@^1.0.1, address@^1.1.2: resolved "https://registry.npmjs.org/address/-/address-1.2.2.tgz" integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^8", "acorn@^8.2.4", "acorn@^8.7.1", "acorn@^8.8.2", "acorn@^8.9.0": "integrity" "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz" @@ -2821,7 +2955,26 @@ address@^1.0.1, address@^1.1.2: "integrity" "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==" "resolved" "https://registry.npmjs.org/address/-/address-1.2.2.tgz" "version" "1.2.2" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8, acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.11.2" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz" + integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== + +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +address@^1.0.1, address@^1.1.2: + version "1.2.2" + resolved "https://registry.npmjs.org/address/-/address-1.2.2.tgz" + integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "adjust-sourcemap-loader@^4.0.0": "integrity" "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==" @@ -2857,17 +3010,29 @@ address@^1.0.1, address@^1.1.2: dependencies: "fast-deep-equal" "^3.1.3" +<<<<<<< HEAD <<<<<<< HEAD ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "ajv@^6.12.2", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1": "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==" "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" "version" "6.12.6" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: + version "6.12.6" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "fast-deep-equal" "^3.1.1" "fast-json-stable-stringify" "^2.0.0" @@ -2884,34 +3049,58 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: "require-from-string" "^2.0.2" "uri-js" "^4.2.2" +<<<<<<< HEAD <<<<<<< HEAD ajv@^8.6.0, ajv@>=8: version "8.12.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "ajv@^8.6.0", "ajv@>=8": "integrity" "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==" "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" "version" "8.12.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +ajv@^8.6.0, ajv@>=8: + version "8.12.0" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "fast-deep-equal" "^3.1.1" "json-schema-traverse" "^1.0.0" "require-from-string" "^2.0.2" "uri-js" "^4.2.2" +<<<<<<< HEAD <<<<<<< HEAD ajv@^8.8.2, ajv@^8.9.0: version "8.12.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "ajv@^8.8.2", "ajv@^8.9.0": "integrity" "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==" "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" "version" "8.12.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +ajv@^8.8.2, ajv@^8.9.0: + version "8.12.0" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "fast-deep-equal" "^3.1.1" "json-schema-traverse" "^1.0.0" @@ -3406,17 +3595,29 @@ ajv@^8.8.2, ajv@^8.9.0: "resolved" "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz" "version" "1.0.0" +<<<<<<< HEAD <<<<<<< HEAD browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1, "browserslist@>= 4", "browserslist@>= 4.21.0", browserslist@>=4: version "4.22.1" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz" integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.18.1", "browserslist@^4.21.10", "browserslist@^4.21.4", "browserslist@^4.21.9", "browserslist@^4.22.1", "browserslist@>= 4", "browserslist@>= 4.21.0", "browserslist@>=4": "integrity" "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==" "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz" "version" "4.22.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1, "browserslist@>= 4", "browserslist@>= 4.21.0", browserslist@>=4: + version "4.22.1" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz" + integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "caniuse-lite" "^1.0.30001541" "electron-to-chromium" "^1.4.535" @@ -3702,6 +3903,7 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4 "resolved" "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" "version" "1.0.1" +<<<<<<< HEAD <<<<<<< HEAD component-emitter@^1.3.0: version "1.3.0" @@ -3713,6 +3915,8 @@ compressible@~2.0.16: resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "component-emitter@^1.3.0": "integrity" "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" "resolved" "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz" @@ -3722,7 +3926,21 @@ compressible@~2.0.16: "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==" "resolved" "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" "version" "2.0.18" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +component-emitter@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "mime-db" ">= 1.43.0 < 2" @@ -4827,17 +5045,29 @@ compressible@~2.0.16: "normalize-path" "^3.0.0" "schema-utils" "^4.0.0" +<<<<<<< HEAD <<<<<<< HEAD eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.0, eslint@^8.1.0, eslint@^8.3.0, "eslint@>= 6": version "8.53.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz" integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", "eslint@^8.0.0", "eslint@^8.1.0", "eslint@^8.3.0", "eslint@>= 6": "integrity" "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==" "resolved" "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz" "version" "8.53.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.0, eslint@^8.1.0, eslint@^8.3.0, "eslint@>= 6": + version "8.53.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz" + integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" @@ -6420,17 +6650,29 @@ eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 "jest-regex-util" "^27.5.1" "jest-snapshot" "^27.5.1" +<<<<<<< HEAD <<<<<<< HEAD jest-resolve@*, jest-resolve@^27.4.2, jest-resolve@^27.5.1: version "27.5.1" resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz" integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "jest-resolve@*", "jest-resolve@^27.4.2", "jest-resolve@^27.5.1": "integrity" "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==" "resolved" "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz" "version" "27.5.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +jest-resolve@*, jest-resolve@^27.4.2, jest-resolve@^27.5.1: + version "27.5.1" + resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz" + integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@jest/types" "^27.5.1" "chalk" "^4.0.0" @@ -6649,17 +6891,29 @@ jest-resolve@*, jest-resolve@^27.4.2, jest-resolve@^27.5.1: "merge-stream" "^2.0.0" "supports-color" "^8.0.0" +<<<<<<< HEAD <<<<<<< HEAD "jest@^27.0.0 || ^28.0.0", jest@^27.4.3: version "27.5.1" resolved "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz" integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "jest@^27.0.0 || ^28.0.0", "jest@^27.4.3": "integrity" "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==" "resolved" "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz" "version" "27.5.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"jest@^27.0.0 || ^28.0.0", jest@^27.4.3: + version "27.5.1" + resolved "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz" + integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@jest/core" "^27.5.1" "import-local" "^3.0.2" @@ -6809,6 +7063,7 @@ jest-resolve@*, jest-resolve@^27.4.2, jest-resolve@^27.5.1: "object.values" "^1.1.6" "keycharm@^0.2.0 || ^0.3.0 || ^0.4.0": +<<<<<<< HEAD <<<<<<< HEAD version "0.4.0" resolved "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz" @@ -6819,6 +7074,8 @@ keyv@^4.5.3: resolved "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz" integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "integrity" "sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ==" "resolved" "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz" "version" "0.4.0" @@ -6827,7 +7084,20 @@ keyv@^4.5.3: "integrity" "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==" "resolved" "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz" "version" "4.5.4" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= + version "0.4.0" + resolved "https://registry.npmjs.org/keycharm/-/keycharm-0.4.0.tgz" + integrity sha512-TyQTtsabOVv3MeOpR92sIKk/br9wxS+zGj4BG7CR8YbK4jM3tyIBaF0zhzeBUMx36/Q/iQLOKKOT+3jOQtemRQ== + +keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "json-buffer" "3.0.1" @@ -8135,12 +8405,15 @@ keyv@^4.5.3: "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" "version" "4.2.0" +<<<<<<< HEAD <<<<<<< HEAD "postcss@^7.0.0 || ^8.0.1", postcss@^8, postcss@^8.0.0, postcss@^8.0.3, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.1.4, postcss@^8.2, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.3, postcss@^8.3.5, postcss@^8.4, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.4, postcss@^8.4.6, "postcss@>= 8", postcss@>=8, postcss@>=8.0.9: version "8.4.31" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "postcss@^7.0.0 || ^8.0.1", "postcss@^8", "postcss@^8.0.0", "postcss@^8.0.3", "postcss@^8.0.9", "postcss@^8.1.0", "postcss@^8.1.4", "postcss@^8.2", "postcss@^8.2.14", "postcss@^8.2.15", "postcss@^8.2.2", "postcss@^8.3", "postcss@^8.3.5", "postcss@^8.4", "postcss@^8.4.21", "postcss@^8.4.23", "postcss@^8.4.4", "postcss@^8.4.6", "postcss@>= 8", "postcss@>=8", "postcss@>=8.0.9": "integrity" "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==" "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" @@ -8154,11 +8427,21 @@ keyv@^4.5.3: "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==" "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz" "version" "7.0.39" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"postcss@^7.0.0 || ^8.0.1", postcss@^8, postcss@^8.0.0, postcss@^8.0.3, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.1.4, postcss@^8.2, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.3, postcss@^8.3.5, postcss@^8.4, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.4, postcss@^8.4.6, "postcss@>= 8", postcss@>=8, postcss@>=8.0.9: + version "8.4.31" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "picocolors" "^0.2.1" "source-map" "^0.6.1" +<<<<<<< HEAD <<<<<<< HEAD postcss@^7.0.35: version "7.0.39" @@ -8173,11 +8456,30 @@ prelude-ls@^1.2.1: resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "prelude-ls@^1.2.1": "integrity" "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" "resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" "version" "1.2.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +postcss@^7.0.35: + version "7.0.39" + resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "prelude-ls@~1.1.2": "integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==" @@ -8262,6 +8564,7 @@ prelude-ls@^1.2.1: "react-is" "^16.3.2" "warning" "^4.0.0" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: @@ -8271,6 +8574,8 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: ======= ======= >>>>>>> 6399f16 (Début du serveur) +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "prop-types@^15.6.2", "prop-types@^15.8.1": ======= "prop-types@^15.6.2", "prop-types@^15.7.2", "prop-types@^15.8.1": @@ -8278,7 +8583,16 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: "integrity" "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==" "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" "version" "15.8.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "loose-envify" "^1.4.0" "object-assign" "^4.1.1" @@ -8413,6 +8727,7 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: "strip-ansi" "^6.0.1" "text-table" "^0.2.0" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "react-dom@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.14.0, react-dom@>=16.6.0, react-dom@>=16.8: @@ -8422,6 +8737,8 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: ======= ======= >>>>>>> 6399f16 (Début du serveur) +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "react-dom@^18.0.0", "react-dom@^18.2.0", "react-dom@>=16.14.0", "react-dom@>=16.6.0", "react-dom@>=16.8": ======= "react-dom@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^18.0.0", "react-dom@^18.2.0", "react-dom@>=16.14.0", "react-dom@>=16.6.0", "react-dom@>=16.8": @@ -8429,7 +8746,16 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: "integrity" "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==" "resolved" "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" "version" "18.2.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"react-dom@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.14.0, react-dom@>=16.6.0, react-dom@>=16.8: + version "18.2.0" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "loose-envify" "^1.1.0" "scheduler" "^0.23.0" @@ -8490,17 +8816,29 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: "resolved" "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" "version" "3.0.4" +<<<<<<< HEAD <<<<<<< HEAD react-refresh@^0.11.0, "react-refresh@>=0.10.0 <1.0.0": version "0.11.0" resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "react-refresh@^0.11.0", "react-refresh@>=0.10.0 <1.0.0": "integrity" "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" "resolved" "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" "version" "0.11.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +react-refresh@^0.11.0, "react-refresh@>=0.10.0 <1.0.0": + version "0.11.0" + resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" + integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "react-router-dom@^6.18.0": "integrity" "sha512-Ubrue4+Ercc/BoDkFQfc6og5zRQ4A8YxSO3Knsne+eRbZ+IepAsK249XBH/XaFuOYOYr3L3r13CXTLvYt5JDjw==" @@ -8572,6 +8910,7 @@ react-refresh@^0.11.0, "react-refresh@>=0.10.0 <1.0.0": optionalDependencies: "fsevents" "^2.3.2" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD react-switch@^7.0.0: @@ -8588,6 +8927,8 @@ react-transition-group@^4.4.5: ======= ======= ======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +======= "react-switch@^7.0.0": "integrity" "sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==" "resolved" "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz" @@ -8601,13 +8942,30 @@ react-transition-group@^4.4.5: "integrity" "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==" "resolved" "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" "version" "4.4.5" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +react-switch@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz" + integrity sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA== + dependencies: + prop-types "^15.7.2" + +react-transition-group@^4.4.5: + version "4.4.5" + resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" + integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@babel/runtime" "^7.5.5" "dom-helpers" "^5.0.1" "loose-envify" "^1.4.0" "prop-types" "^15.6.2" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", react@^18.0.0, react@^18.2.0, "react@>= 16", react@>=0.14.0, react@>=15.0.0, react@>=16.14.0, react@>=16.3, react@>=16.6.0, react@>=16.8, react@>=16.8.0: @@ -8617,6 +8975,8 @@ react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 ======= ======= >>>>>>> 6399f16 (Début du serveur) +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "react@*", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", "react@^18.0.0", "react@^18.2.0", "react@>= 16", "react@>=0.14.0", "react@>=15.0.0", "react@>=16.14.0", "react@>=16.3", "react@>=16.6.0", "react@>=16.8", "react@>=16.8.0": ======= "react@*", "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", "react@^18.0.0", "react@^18.2.0", "react@>= 16", "react@>=0.14.0", "react@>=15.0.0", "react@>=16.14.0", "react@>=16.3", "react@>=16.6.0", "react@>=16.8", "react@>=16.8.0": @@ -8624,7 +8984,16 @@ react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 "integrity" "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==" "resolved" "https://registry.npmjs.org/react/-/react-18.2.0.tgz" "version" "18.2.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", react@^18.0.0, react@^18.2.0, "react@>= 16", react@>=0.14.0, react@>=15.0.0, react@>=16.14.0, react@>=16.3, react@>=16.6.0, react@>=16.8, react@>=16.8.0: + version "18.2.0" + resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "loose-envify" "^1.1.0" @@ -8862,17 +9231,29 @@ react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 "serialize-javascript" "^4.0.0" "terser" "^5.0.0" +<<<<<<< HEAD <<<<<<< HEAD "rollup@^1.20.0 || ^2.0.0", rollup@^1.20.0||^2.0.0, rollup@^2.0.0, rollup@^2.43.1: version "2.79.1" resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz" integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "rollup@^1.20.0 || ^2.0.0", "rollup@^1.20.0||^2.0.0", "rollup@^2.0.0", "rollup@^2.43.1": "integrity" "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==" "resolved" "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz" "version" "2.79.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"rollup@^1.20.0 || ^2.0.0", rollup@^1.20.0||^2.0.0, rollup@^2.0.0, rollup@^2.43.1: + version "2.79.1" + resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) optionalDependencies: "fsevents" "~2.3.2" @@ -9812,17 +10193,29 @@ react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" "version" "0.20.2" +<<<<<<< HEAD <<<<<<< HEAD type-fest@^0.21.3, "type-fest@>=0.17.0 <5.0.0": version "0.21.3" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "type-fest@^0.21.3", "type-fest@>=0.17.0 <5.0.0": "integrity" "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" "version" "0.21.3" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +type-fest@^0.21.3, "type-fest@>=0.17.0 <5.0.0": + version "0.21.3" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "type-is@~1.6.18": "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" @@ -9878,17 +10271,29 @@ type-fest@^0.21.3, "type-fest@>=0.17.0 <5.0.0": dependencies: "is-typedarray" "^1.0.0" +<<<<<<< HEAD <<<<<<< HEAD "typescript@^3.2.1 || ^4", typescript@^5.2.2, "typescript@>= 2.7", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", typescript@5: version "5.2.2" resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "typescript@^3.2.1 || ^4", "typescript@^5.2.2", "typescript@>= 2.7", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", "typescript@5": "integrity" "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==" "resolved" "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz" "version" "5.2.2" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"typescript@^3.2.1 || ^4", typescript@^5.2.2, "typescript@>= 2.7", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", typescript@5: + version "5.2.2" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "unbox-primitive@^1.0.2": "integrity" "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==" @@ -10028,17 +10433,29 @@ type-fest@^0.21.3, "type-fest@>=0.17.0 <5.0.0": "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" "version" "1.0.1" +<<<<<<< HEAD <<<<<<< HEAD "uuid@^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", uuid@^8.3.2: version "8.3.2" resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "uuid@^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "uuid@^8.3.2": "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" "version" "8.3.2" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"uuid@^3.4.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "v8-to-istanbul@^8.1.0": "integrity" "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==" @@ -10055,6 +10472,7 @@ type-fest@^0.21.3, "type-fest@>=0.17.0 <5.0.0": "version" "1.1.2" "vis-data@^6.3.0 || ^7.0.0": +<<<<<<< HEAD <<<<<<< HEAD version "7.1.8" resolved "https://registry.npmjs.org/vis-data/-/vis-data-7.1.8.tgz" @@ -10075,6 +10493,8 @@ w3c-hr-time@^1.0.2: resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz" integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "integrity" "sha512-h/cxRDVqnpqqpTBqwUbbKIpWVovOQ+h5rbFS/kio8TUH1np98Lv9bHdWZxahJlyzBaBR9KGvwGHB00jn3MjLbQ==" "resolved" "https://registry.npmjs.org/vis-data/-/vis-data-7.1.8.tgz" "version" "7.1.8" @@ -10093,7 +10513,30 @@ w3c-hr-time@^1.0.2: "integrity" "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==" "resolved" "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz" "version" "1.0.2" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= + version "7.1.8" + resolved "https://registry.npmjs.org/vis-data/-/vis-data-7.1.8.tgz" + integrity sha512-h/cxRDVqnpqqpTBqwUbbKIpWVovOQ+h5rbFS/kio8TUH1np98Lv9bHdWZxahJlyzBaBR9KGvwGHB00jn3MjLbQ== + +vis-network@^9.1.9: + version "9.1.9" + resolved "https://registry.npmjs.org/vis-network/-/vis-network-9.1.9.tgz" + integrity sha512-Ft+hLBVyiLstVYSb69Q1OIQeh3FeUxHJn0WdFcq+BFPqs+Vq1ibMi2sb//cxgq1CP7PH4yOXnHxEH/B2VzpZYA== + +vis-util@^5.0.1: + version "5.0.6" + resolved "https://registry.npmjs.org/vis-util/-/vis-util-5.0.6.tgz" + integrity sha512-HyAZ+x3q6/Xh6OFPIQOGPOPgnHL9KVNvWW6+k3aTCbAG8Tq7vncgRat6oY8ywZ7j1Fq0mOfUb6fLrFvfI9nUKg== + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "browser-process-hrtime" "^1.0.0" @@ -10164,17 +10607,29 @@ w3c-hr-time@^1.0.2: "range-parser" "^1.2.1" "schema-utils" "^4.0.0" +<<<<<<< HEAD <<<<<<< HEAD webpack-dev-server@^4.6.0, "webpack-dev-server@3.x || 4.x": version "4.15.1" resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz" integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "webpack-dev-server@^4.6.0", "webpack-dev-server@3.x || 4.x": "integrity" "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==" "resolved" "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz" "version" "4.15.1" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +webpack-dev-server@^4.6.0, "webpack-dev-server@3.x || 4.x": + version "4.15.1" + resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz" + integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -10236,17 +10691,29 @@ webpack-dev-server@^4.6.0, "webpack-dev-server@3.x || 4.x": "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" "version" "3.2.3" +<<<<<<< HEAD <<<<<<< HEAD "webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.9.0", "webpack@^4.44.2 || ^5.47.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.64.4, "webpack@>= 4", webpack@>=2, "webpack@>=4.43.0 <6.0.0": version "5.89.0" resolved "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz" integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== ======= +======= +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) "webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.9.0", "webpack@^4.44.2 || ^5.47.0", "webpack@^5.0.0", "webpack@^5.1.0", "webpack@^5.20.0", "webpack@^5.64.4", "webpack@>= 4", "webpack@>=2", "webpack@>=4.43.0 <6.0.0": "integrity" "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==" "resolved" "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz" "version" "5.89.0" +<<<<<<< HEAD >>>>>>> af92727 (Début du serveur) +======= +======= +"webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.9.0", "webpack@^4.44.2 || ^5.47.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.64.4, "webpack@>= 4", webpack@>=2, "webpack@>=4.43.0 <6.0.0": + version "5.89.0" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz" + integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== +>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:) +>>>>>>> 7e44c5e (ajout de dépendances pour un switch et stub dans les params de jeu :package:) dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0"