[TASK] Move jquery to npm 71/53071/2
authorJohannes Goslar <jogo@kronberger-spiele.de>
Fri, 2 Jun 2017 22:02:01 +0000 (00:02 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 3 Jun 2017 08:13:02 +0000 (10:13 +0200)
Resolves: #81446
Change-Id: I10fd5950636d2e4b992e1a03f1720759d9e7c55d
Releases: master, 8.7
Reviewed-on: https://review.typo3.org/53071
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/Gruntfile.js
Build/bower.json
Build/package-lock.json
Build/package.json

index 3fad451..baaf808 100644 (file)
@@ -359,8 +359,8 @@ module.exports = function(grunt) {
                                        /**
                                         * copy needed parts of jquery
                                         */
-                                       'jquery/jquery-3.2.1.js': 'jquery/dist/jquery.js',
-                                       'jquery/jquery-3.2.1.min.js': 'jquery/dist/jquery.min.js',
+                                       'jquery/jquery-3.2.1.js': '../node_modules/jquery/dist/jquery.js',
+                                       'jquery/jquery-3.2.1.min.js': '../node_modules/jquery/dist/jquery.min.js',
                                        /**
                                         * copy needed parts of jquery-ui
                                         */
index 9636ebd..b3e55bc 100644 (file)
@@ -28,7 +28,6 @@
   },
   "dependencies": {
     "requirejs": "^2.3.2",
-    "jquery": "^3.2.1",
     "jquery-ui": "1.11.4",
     "eonasdan-bootstrap-datetimepicker": "^4.17.45",
     "moment": "^2.17.1",
index 5a882ac..9b784cf 100644 (file)
       "dev": true,
       "optional": true
     },
+    "jquery": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
+      "dev": true
+    },
     "js-base64": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
index c7e93c2..3cbbf26 100644 (file)
@@ -31,6 +31,7 @@
     "grunt-ts": "^5.5.1",
     "grunt-tslint": "^3.2.1",
     "jasmine-core": "~2.6.0",
+    "jquery": "^3.2.1",
     "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.0.0",