[TASK] Remove bower and update Gruntfile.js 98/53098/2
authorJohannes Goslar <jogo@kronberger-spiele.de>
Sat, 3 Jun 2017 13:23:25 +0000 (15:23 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 3 Jun 2017 17:23:39 +0000 (19:23 +0200)
Resolves: #81459
Releases: 8.7
Change-Id: I213c8d52d8c5ed0d027c1c6e7d01e9bec49ce506
Reviewed-on: https://review.typo3.org/53098
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/.bowerrc [deleted file]
Build/Gruntfile.js
Build/bower.json [deleted file]
Build/package-lock.json
Build/package.json
typo3/sysext/core/Resources/Public/Icons/T3Icons/overlay/overlay-endtime.svg

diff --git a/Build/.bowerrc b/Build/.bowerrc
deleted file mode 100644 (file)
index 2b6cad3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "analytics": false,
-  "timeout": 120000
-}
index 1e10c8c..150b8f8 100644 (file)
@@ -59,7 +59,6 @@ module.exports = function(grunt) {
                        workspaces: '<%= paths.sysext %>workspaces/Resources/',
                        ckeditor: '<%= paths.sysext %>rte_ckeditor/Resources/',
                        core: '<%= paths.sysext %>core/Resources/',
-                       bower: 'bower_components/',
                        npm: 'node_modules/',
                        t3icons: '<%= paths.npm %>@typo3/icons/dist/'
                },
@@ -310,22 +309,21 @@ module.exports = function(grunt) {
                                ]
                        }
                },
-               bowercopy: {
+               npmcopy: {
                        options: {
                                clean: false,
                                report: false,
-                               runBower: false,
-                               srcPrefix: "bower_components/"
+                               srcPrefix: "node_modules/"
                        },
                        ckeditor: {
                                options: {
                                        destPrefix: "<%= paths.ckeditor %>Public/JavaScript/Contrib"
                                },
                                files: {
-                                       'ckeditor.js': '../node_modules/ckeditor/ckeditor.js',
-                                       'plugins/': '../node_modules/ckeditor/plugins/',
-                                       'skins/': '../node_modules/ckeditor/skins/',
-                                       'lang/': '../node_modules/ckeditor/lang/'
+                                       'ckeditor.js': 'ckeditor/ckeditor.js',
+                                       'plugins/': 'ckeditor/plugins/',
+                                       'skins/': 'ckeditor/skins/',
+                                       'lang/': 'ckeditor/lang/'
                                }
                        },
                        all: {
@@ -333,45 +331,45 @@ module.exports = function(grunt) {
                                        destPrefix: "<%= paths.core %>Public/JavaScript/Contrib"
                                },
                                files: {
-                                       'nprogress.js': '../node_modules/nprogress/nprogress.js',
-                                       'jquery.matchHeight-min.js': '../node_modules/jquery-match-height/dist/jquery.matchHeight-min.js',
-                                       'jquery.dataTables.js': '../node_modules/datatables/media/js/jquery.dataTables.min.js',
-                                       'require.js': '../node_modules/requirejs/require.js',
-                                       'moment.js': '../node_modules/moment/min/moment-with-locales.min.js',
-                                       'moment-timezone.js': '../node_modules/moment-timezone/builds/moment-timezone-with-data.min.js',
-                                       'cropper.min.js': '../node_modules/cropper/dist/cropper.min.js',
-                                       'imagesloaded.pkgd.min.js': '../node_modules/imagesloaded/imagesloaded.pkgd.min.js',
-                                       'bootstrap-datetimepicker.js': '../node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
-                                       'autosize.js': '../node_modules/autosize/dist/autosize.min.js',
-                                       'taboverride.min.js': '../node_modules/taboverride/build/output/taboverride.min.js',
-                                       'bootstrap-slider.min.js': '../node_modules/bootstrap-slider/dist/bootstrap-slider.min.js',
+                                       'nprogress.js': 'nprogress/nprogress.js',
+                                       'jquery.matchHeight-min.js': 'jquery-match-height/dist/jquery.matchHeight-min.js',
+                                       'jquery.dataTables.js': 'datatables/media/js/jquery.dataTables.min.js',
+                                       'require.js': 'requirejs/require.js',
+                                       'moment.js': 'moment/min/moment-with-locales.min.js',
+                                       'moment-timezone.js': 'moment-timezone/builds/moment-timezone-with-data.min.js',
+                                       'cropper.min.js': 'cropper/dist/cropper.min.js',
+                                       'imagesloaded.pkgd.min.js': 'imagesloaded/imagesloaded.pkgd.min.js',
+                                       'bootstrap-datetimepicker.js': 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',
+                                       'autosize.js': 'autosize/dist/autosize.min.js',
+                                       'taboverride.min.js': 'taboverride/build/output/taboverride.min.js',
+                                       'bootstrap-slider.min.js': 'bootstrap-slider/dist/bootstrap-slider.min.js',
                                        /* disabled until events are not bound to document only
-                                         see https://github.com/claviska/jquery-minicolors/issues/192
-                                         see https://github.com/claviska/jquery-minicolors/issues/206
-                                       'jquery.minicolors.js': '../node_modules/@claviska/jquery-minicolors/jquery.minicolors.min.js',
-                                       '../../Images/colorpicker/jquery.minicolors.png': '../node_modules/@claviska/jquery-minicolors/jquery.minicolors.png'
-                                        */
+                                          see https://github.com/claviska/jquery-minicolors/issues/192
+                                          see https://github.com/claviska/jquery-minicolors/issues/206
+                                          'jquery.minicolors.js': '../node_modules/@claviska/jquery-minicolors/jquery.minicolors.min.js',
+                                          '../../Images/colorpicker/jquery.minicolors.png': '../node_modules/@claviska/jquery-minicolors/jquery.minicolors.png'
+                                       */
                                        /* disabled until autocomplete formatGroup is fixed to pass on the index too
                                           'jquery.autocomplete.js': '../node_modules/devbridge-autocomplete/dist/jquery.autocomplete.min.js',
-                                        */
-                                       'd3/d3.js': '../node_modules/d3/build/d3.min.js',
+                                       */
+                                       'd3/d3.js': 'd3/build/d3.min.js',
                                        /**
                                         * copy needed parts of jquery
                                         */
-                                       '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',
+                                       'jquery/jquery-3.2.1.js': 'jquery/dist/jquery.js',
+                                       'jquery/jquery-3.2.1.min.js': 'jquery/dist/jquery.min.js',
                                        /**
                                         * copy needed parts of jquery-ui
                                         */
-                                       'jquery-ui/core.js': '../node_modules/jquery-ui/ui/core.js',
-                                       'jquery-ui/draggable.js': '../node_modules/jquery-ui/ui/draggable.js',
-                                       'jquery-ui/droppable.js': '../node_modules/jquery-ui/ui/droppable.js',
-                                       'jquery-ui/mouse.js': '../node_modules/jquery-ui/ui/mouse.js',
-                                       'jquery-ui/position.js': '../node_modules/jquery-ui/ui/position.js',
-                                       'jquery-ui/resizable.js': '../node_modules/jquery-ui/ui/resizable.js',
-                                       'jquery-ui/selectable.js': '../node_modules/jquery-ui/ui/selectable.js',
-                                       'jquery-ui/sortable.js': '../node_modules/jquery-ui/ui/sortable.js',
-                                       'jquery-ui/widget.js': '../node_modules/jquery-ui/ui/widget.js'
+                                       'jquery-ui/core.js': 'jquery-ui/ui/core.js',
+                                       'jquery-ui/draggable.js': 'jquery-ui/ui/draggable.js',
+                                       'jquery-ui/droppable.js': 'jquery-ui/ui/droppable.js',
+                                       'jquery-ui/mouse.js': 'jquery-ui/ui/mouse.js',
+                                       'jquery-ui/position.js': 'jquery-ui/ui/position.js',
+                                       'jquery-ui/resizable.js': 'jquery-ui/ui/resizable.js',
+                                       'jquery-ui/selectable.js': 'jquery-ui/ui/selectable.js',
+                                       'jquery-ui/sortable.js': 'jquery-ui/ui/sortable.js',
+                                       'jquery-ui/widget.js': 'jquery-ui/ui/widget.js'
                                }
                        }
                },
@@ -393,24 +391,15 @@ module.exports = function(grunt) {
                                        "<%= paths.core %>Public/JavaScript/Contrib/bootstrap-datetimepicker.js": ["<%= paths.core %>Public/JavaScript/Contrib/bootstrap-datetimepicker.js"]
                                }
                        }
-               },
-               svgmin: {
-                       options: {
-                               plugins: [
-                                       { removeViewBox: false }
-                               ]
-                       }
                }
        });
 
        // Register tasks
        grunt.loadNpmTasks('grunt-sass');
        grunt.loadNpmTasks('grunt-contrib-watch');
-       grunt.loadNpmTasks('grunt-bowercopy');
+       grunt.loadNpmTasks('grunt-npmcopy');
        grunt.loadNpmTasks('grunt-npm-install');
-       grunt.loadNpmTasks('grunt-bower-just-install');
        grunt.loadNpmTasks('grunt-contrib-uglify');
-       grunt.loadNpmTasks('grunt-svgmin');
        grunt.loadNpmTasks('grunt-postcss');
        grunt.loadNpmTasks('grunt-contrib-copy');
        grunt.loadNpmTasks("grunt-ts");
@@ -466,10 +455,9 @@ module.exports = function(grunt) {
         *
         * this task does the following things:
         * - npm install
-        * - bower install
-        * - copy some bower components to a specific destinations because they need to be included via PHP
+        * - copy some components to a specific destinations because they need to be included via PHP
         */
-       grunt.registerTask('update', ['npm-install', 'bower_install', 'bowercopy']);
+       grunt.registerTask('update', ['npm-install', 'npmcopy']);
 
        /**
         * grunt scripts task
@@ -501,5 +489,5 @@ module.exports = function(grunt) {
         * - minifies svg files
         * - compiles TypeScript files
         */
-       grunt.registerTask('build', ['update', 'scripts', 'copy', 'format', 'css', 'uglify', 'svgmin']);
+       grunt.registerTask('build', ['update', 'scripts', 'copy', 'format', 'css', 'uglify']);
 };
diff --git a/Build/bower.json b/Build/bower.json
deleted file mode 100644 (file)
index d3c6be5..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "typo3",
-  "version": "8.7.0-dev",
-  "authors": [
-    {
-      "name": "TYPO3 CMS Core Team",
-      "role": "Developer",
-      "homepage": "https://forge.typo3.org/projects/typo3cms-core"
-    },
-    {
-      "name": "The TYPO3 Community",
-      "role": "Contributor",
-      "homepage": "https://typo3.org/community/"
-    }
-  ],
-  "description": "TYPO3 CMS is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.",
-  "keywords": [
-    "typo3",
-    "cms",
-    "content management system"
-  ],
-  "license": "GPL-2.0+",
-  "homepage": "https://typo3.org/",
-  "private": true,
-  "dependencies": {
-  }
-}
index 754d876..1f28c74 100644 (file)
       "integrity": "sha1-zny5ctkB8oHI4oSzBFbtrPga+ZM=",
       "dev": true
     },
-    "bower": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz",
-      "integrity": "sha1-Vdvr7wrZFVOC2enT5JfBNyNFtEo=",
-      "dev": true
-    },
     "brace-expansion": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
       "integrity": "sha1-sVUrei+VN+Fl16/S0p09SVn/a60=",
       "dev": true
     },
-    "clap": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz",
-      "integrity": "sha1-s7026T3Uy/s5WjwmiWNSRFJlwFs=",
-      "dev": true
-    },
     "clean-css": {
       "version": "3.4.26",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "coa": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz",
-      "integrity": "sha1-K6n+w7SqQ9eknX5sNWHpIGG2vOw=",
-      "dev": true
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
         }
       }
     },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-      "dev": true
-    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
         }
       }
     },
-    "grunt-bower-just-install": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/grunt-bower-just-install/-/grunt-bower-just-install-0.0.3.tgz",
-      "integrity": "sha1-ph2aFsNTj05N3Y4rH5P9ENu7Kdo=",
-      "dev": true
-    },
-    "grunt-bowercopy": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/grunt-bowercopy/-/grunt-bowercopy-1.2.4.tgz",
-      "integrity": "sha1-DCafaBs4u9+hOwHayBJInvMiTFc=",
-      "dev": true,
-      "dependencies": {
-        "glob": {
-          "version": "4.5.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true
-        }
-      }
-    },
     "grunt-contrib-copy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
       "integrity": "sha1-kWFwWV43DiB44d+wQiQzHbHehDc=",
       "dev": true
     },
+    "grunt-npmcopy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-npmcopy/-/grunt-npmcopy-0.1.0.tgz",
+      "integrity": "sha1-pAnSXHv3eDA/a5GAVH1ngENMdX8=",
+      "dev": true,
+      "dependencies": {
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc="
+        }
+      }
+    },
     "grunt-postcss": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.8.0.tgz",
       "integrity": "sha1-bdiaORERfiFNKi785WWsRqBuRC0=",
       "dev": true
     },
-    "grunt-svgmin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-svgmin/-/grunt-svgmin-4.0.0.tgz",
-      "integrity": "sha1-rq3Y0WVBXVPuuSnqa8nk7Xz5PiM=",
-      "dev": true,
-      "dependencies": {
-        "pretty-bytes": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-          "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-          "dev": true
-        }
-      }
-    },
     "grunt-ts": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/grunt-ts/-/grunt-ts-5.5.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
       "dev": true
     },
-    "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-      "dev": true
-    },
     "qjobs": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true
     },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "dev": true,
-      "dependencies": {
-        "js-yaml": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-          "dev": true
-        }
-      }
-    },
     "synesthesia": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz",
       "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
       "dev": true
     },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-      "dev": true
-    },
     "which": {
       "version": "1.2.14",
       "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
index fe5a8ff..17c9045 100644 (file)
@@ -20,7 +20,6 @@
     "autosize": "^3.0.20",
     "bootstrap-sass": "^3.3.7",
     "bootstrap-slider": "^9.7.3",
-    "bower": "^1.8.0",
     "chosen-js": "^1.7.0",
     "ckeditor": "^4.6.2",
     "cropper": "^2.3.4",
     "eonasdan-bootstrap-datetimepicker": "^4.17.47",
     "font-awesome": "^4.7.0",
     "grunt": "~1.0.1",
-    "grunt-bower-just-install": "0.0.3",
-    "grunt-bowercopy": "^1.2.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-uglify": "2.0.0",
     "grunt-contrib-watch": "~1.0.0",
     "grunt-npm-install": "^0.3.1",
+    "grunt-npmcopy": "^0.1.0",
     "grunt-postcss": "^0.8.0",
     "grunt-sass": "^2.0.0",
     "grunt-stylelint": "^0.7.0",
-    "grunt-svgmin": "4.0.0",
     "grunt-ts": "^5.5.1",
     "grunt-tslint": "^3.2.1",
     "imagesloaded": "^4.1.1",
@@ -72,7 +69,6 @@
     "typescript": "^2.2.0"
   },
   "scripts": {
-    "bower": "./node_modules/.bin/bower install",
     "build-css": "./node_modules/.bin/grunt css",
     "lint": "./node_modules/.bin/grunt lint"
   }
index babea80..bb016b5 100644 (file)
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11"><circle fill="#C83C3C" cx="5.5" cy="5.5" r="5.5"/><path opacity=".2" d="M5.5 1C7.981 1 10 3.019 10 5.5S7.981 10 5.5 10 1 7.981 1 5.5 3.019 1 5.5 1m0-1a5.5 5.5 0 1 0 0 11 5.5 5.5 0 1 0 0-11z"/><path fill="#FFF" d="M5 2h1v4H5z"/><path fill="#FFF" d="M5 5h3v1H5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11"><circle fill="#C83C3C" cx="5.5" cy="5.5" r="5.5"/><path opacity=".2" d="M5.5 1C7.981 1 10 3.019 10 5.5S7.981 10 5.5 10 1 7.981 1 5.5 3.019 1 5.5 1m0-1a5.5 5.5 0 1 0 0 11 5.5 5.5 0 1 0 0-11z"/><path fill="#FFF" d="M5 2h1v4H5z"/><path fill="#FFF" d="M5 5h3v1H5z"/></svg>
\ No newline at end of file