[TASK] Update to TypeScript 2.0 70/50370/5
authorFrank Naegler <frank.naegler@typo3.org>
Tue, 25 Oct 2016 13:18:12 +0000 (15:18 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 27 Oct 2016 13:47:07 +0000 (15:47 +0200)
Resolves: #78430
Releases: master
Change-Id: Iba0303ebde90be0008f73f88bf9338389274d38a
Reviewed-on: https://review.typo3.org/50370
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Stefan Bürk <stefan.buerk@impactmedia.de>
Tested-by: Stefan Bürk <stefan.buerk@impactmedia.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/Gruntfile.js
Build/package.json
Build/tsconfig.json
Build/typings.json [deleted file]
Build/typings/no-def/index.d.ts

index 2c6febe..17156fc 100644 (file)
@@ -151,9 +151,6 @@ module.exports = function(grunt) {
                                ]
                        }
                },
-               typings: {
-                       install: {}
-               },
                watch: {
                        options: {
                                livereload: true
@@ -342,7 +339,6 @@ module.exports = function(grunt) {
        grunt.loadNpmTasks('grunt-contrib-copy');
        grunt.loadNpmTasks("grunt-ts");
        grunt.loadNpmTasks('grunt-tslint');
-       grunt.loadNpmTasks('grunt-typings');
 
        /**
         * grunt default task
@@ -371,11 +367,10 @@ module.exports = function(grunt) {
         *
         * this task does the following things:
         * - npm install
-        * - typings install
         * - bower install
         * - copy some bower components to a specific destinations because they need to be included via PHP
         */
-       grunt.registerTask('update', ['npm-install', 'typings', 'bower_install', 'bowercopy']);
+       grunt.registerTask('update', ['npm-install', 'bower_install', 'bowercopy']);
 
        /**
         * grunt scripts task
index 6ace8df..b797502 100644 (file)
@@ -9,6 +9,12 @@
   "license": "GPL-2.0+",
   "devDependencies": {
     "@types/jasmine": "^2.5.35",
+    "@types/bootstrap": "*",
+    "@types/d3": "*",
+    "@types/jquery": "*",
+    "@types/jqueryui": "*",
+    "@types/nprogress": "*",
+    "@types/requirejs": "*",
     "autoprefixer": "^6.3.7",
     "grunt": "~1.0.1",
     "grunt-bower-just-install": "0.0.3",
@@ -22,7 +28,6 @@
     "grunt-svgmin": "4.0.0",
     "grunt-ts": "^5.5.1",
     "grunt-tslint": "^3.2.1",
-    "grunt-typings": "^0.1.5",
     "jasmine-core": "^2.4.1",
     "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
@@ -39,7 +44,6 @@
     "requirejs": "^2.2.0",
     "tagsort": "1.4.0",
     "tslint": "^3.15.1",
-    "typescript": "^1.8.10",
-    "typings": "^1.3.3"
+    "typescript": "^2.0.3"
   }
 }
index a990e60..b6d9f01 100644 (file)
         "outDir": "./JavaScript/"
     },
     "filesGlob": [
-        "typings/index.d.ts",
         "typings/no-def/index.d.ts",
         "../../typo3/sysext/*/Resources/Private/TypeScript/**/*.ts",
         "!node_modules/**"
     ],
     "files": [
-        "typings/index.d.ts",
         "typings/no-def/index.d.ts",
         "../../typo3/sysext/backend/Resources/Private/TypeScript/ColorPicker.ts"
     ]
diff --git a/Build/typings.json b/Build/typings.json
deleted file mode 100644 (file)
index 03fb060..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "globalDependencies": {
-    "bootstrap": "registry:dt/bootstrap#3.3.5+20160619023404",
-    "d3": "registry:dt/d3#0.0.0+20160727131401",
-    "jquery": "registry:dt/jquery#1.10.0+20160704162008",
-    "jqueryui": "registry:dt/jqueryui#1.11.0+20160727153854",
-    "moment": "registry:dt/moment#2.11.1+20160829143156",
-    "nprogress": "registry:dt/nprogress#0.0.0+20160316155526",
-    "require": "registry:dt/require#2.1.20+20160316155526"
-  }
-}
index d651119..41bf82c 100644 (file)
@@ -1 +1 @@
-/// <reference path="jquery.minicolors.d.ts" />
+import 'jquery.minicolors';