]> _ Git - fluidbook-toolbox.git/commitdiff
Merge branch 'master' into markdown_editor
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 4 Aug 2025 10:24:40 +0000 (12:24 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 4 Aug 2025 10:24:40 +0000 (12:24 +0200)
1  2 
app/Fluidbook/Compiler/Compiler.php
package.json

Simple merge
diff --cc package.json
index ba828d5924bf94d3dead51dd36d0c7abf4211f93,1edf4e346028494be0bf06c76cbbd1ace0509793..bccaac7cd5babdf66bbb975cda76f710b4fdcdb5
          "linkeditor": "cross-env process.env.section=linkeditor-stable mix --production",
          "linkeditor-beta-dev": "cross-env process.env.section=linkeditor mix",
          "linkeditor-beta-watch": "cross-env process.env.section=linkeditor mix watch",
 -        "linkeditor-beta": "cross-env process.env.section=linkeditor mix --production"
 +        "linkeditor-beta": "cross-env process.env.section=linkeditor mix --production",
 +        "markdowneditor-watch": "cross-env process.env.section=markdowneditor mix watch"
      },
      "devDependencies": {
-         "axios": "^1.3.5",
+         "axios": "^1.8.4",
          "cross-env": "^7.0.3",
          "gsap": "npm:@gsap/business@^3.12.3",
-         "jquery": "^3.6.4",
+         "jquery": "^3.7.1",
          "laravel-mix": "^6.0.49",
          "resolve-url-loader": "^5.0.0",
          "sass": "^1.62.0",