Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
Fix package.json deps versions
Browse files Browse the repository at this point in the history
Use actual version numbers for the package.json dependencies
Install and use whatwg-fetch as polyfill for older browsers (Safari 9)

Change-Id: I2049d49179e3f619a61fc5436313be55f60d1139
  • Loading branch information
andreasremdt authored and andi34 committed Aug 3, 2020
1 parent 702af69 commit 5fc748b
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 10 deletions.
1 change: 1 addition & 0 deletions admin/index.php
Expand Up @@ -148,6 +148,7 @@
</div>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="../api/config.php"></script>
<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="../resources/js/theme.js"></script>
Expand Down
1 change: 1 addition & 0 deletions chromakeying.php
Expand Up @@ -84,6 +84,7 @@
<div class="modal__body" id="save_mesg_text"><span data-i18n="saving"></span></div>
</div>
</div>
<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="api/config.php"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="node_modules/marvinj/marvinj/release/marvinj-0.8.js"></script>
Expand Down
1 change: 1 addition & 0 deletions gallery.php
Expand Up @@ -76,6 +76,7 @@
</div>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="api/config.php"></script>
<script type="text/javascript" src="resources/js/adminshortcut.js"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions index.php
Expand Up @@ -230,6 +230,7 @@
endif; ?>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="api/config.php"></script>
<script type="text/javascript" src="resources/js/adminshortcut.js"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions login/index.php
Expand Up @@ -94,6 +94,7 @@
</div>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="../api/config.php"></script>
<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="../resources/js/adminshortcut.js"></script>
Expand Down
1 change: 1 addition & 0 deletions manual/index.php
Expand Up @@ -83,6 +83,7 @@
</div>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="../api/config.php"></script>
<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="../resources/js/manual.js"></script>
Expand Down
7 changes: 4 additions & 3 deletions package.json
Expand Up @@ -35,13 +35,14 @@
"@andreasremdt/simple-translator": "^2.0.1",
"font-awesome": "^4.7.0",
"gh-markdown-cli": "^0.2.0",
"github-markdown-css": "https://github.com/andi34/github-markdown-css",
"github-markdown-css": "^4.0.0",
"gulp": "4.0.2",
"gulp-sass": "4.0.2",
"jquery": "^3.5.1",
"marvinj": "https://github.com/gabrielarchanjo/marvinj",
"marvinj": "^1.0.0",
"normalize.css": "^8.0.1",
"photoswipe": "https://github.com/andi34/PhotoSwipe"
"photoswipe": "^4.1.3",
"whatwg-fetch": "^3.2.0"
},
"devDependencies": {
"@babel/core": "^7.11.0",
Expand Down
1 change: 1 addition & 0 deletions slideshow/index.php
Expand Up @@ -82,6 +82,7 @@
<?php endif; ?>
</div>

<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
<script type="text/javascript" src="../api/config.php"></script>
<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="../resources/js/vendor/jquery.easing.1.3.js"></script>
Expand Down
22 changes: 15 additions & 7 deletions yarn.lock
Expand Up @@ -2311,9 +2311,10 @@ git-tag-version@^1.3.1:
resolved "https://registry.yarnpkg.com/github-flavored-markdown/-/github-flavored-markdown-1.0.1.tgz#93361b87a31c25790d9c81a1b798214a737eab38"
integrity sha1-kzYbh6McJXkNnIGht5ghSnN+qzg=

"github-markdown-css@https://github.com/andi34/github-markdown-css":
github-markdown-css@^4.0.0:
version "4.0.0"
resolved "https://github.com/andi34/github-markdown-css#1485dd78f5e744ef36e946e5ae44838e3906f9d8"
resolved "https://registry.yarnpkg.com/github-markdown-css/-/github-markdown-css-4.0.0.tgz#be9f4caf7a389228d4c368336260ffc909061f35"
integrity sha512-mH0bcIKv4XAN0mQVokfTdKo2OD5K8WJE9+lbMdM32/q0Ie5tXgVN/2o+zvToRMxSTUuiTRcLg5hzkFfOyBYreg==

glob-parent@^3.1.0:
version "3.1.0"
Expand Down Expand Up @@ -3150,9 +3151,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"

"marvinj@https://github.com/gabrielarchanjo/marvinj":
version "0.0.0"
resolved "https://github.com/gabrielarchanjo/marvinj#b758c84e6a3c13b1dd8d13d052e42a2e6331b609"
marvinj@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/marvinj/-/marvinj-1.0.0.tgz#5e1e0663f4e605a5966d3537c1a41fd22589c8b5"
integrity sha512-+afDa86Pml2BlDt2lEn+xZUZ6r4q+aQvxSmWq37M4lQ4SraBJcKlbm+wDamzXTvW7OmeK0mkWdjRB4R3PAPFjA==

matchdep@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -3625,9 +3627,10 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

"photoswipe@https://github.com/andi34/PhotoSwipe":
photoswipe@^4.1.3:
version "4.1.3"
resolved "https://github.com/andi34/PhotoSwipe#59b81ae982674b92b05860e7c1549679030fd3ec"
resolved "https://registry.yarnpkg.com/photoswipe/-/photoswipe-4.1.3.tgz#59f49494eeb9ddab5888d03392926a19bc197550"
integrity sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==

pify@^2.0.0:
version "2.3.0"
Expand Down Expand Up @@ -4765,6 +4768,11 @@ vinyl@^2.0.0:
remove-trailing-separator "^1.0.1"
replace-ext "^1.0.0"

whatwg-fetch@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz#8e134f701f0a4ab5fda82626f113e2b647fd16dc"
integrity sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w==

which-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
Expand Down

0 comments on commit 5fc748b

Please sign in to comment.