Преглед на файлове

Merge pull request #99 from opensheetmusicdisplay/greenkeeper-typescript-2.1.5

Update typescript to version 2.1.5 🚀
Sebastian Haas преди 8 години
родител
ревизия
436e5fe54a
променени са 3 файла, в които са добавени 8 реда и са изтрити 25 реда
  1. 1 18
      Gruntfile.js
  2. 1 1
      bin/publish_gh_page.sh
  3. 6 6
      package.json

+ 1 - 18
Gruntfile.js

@@ -124,19 +124,6 @@ module.exports = function (grunt) {
         typings: {
             install: {}
         },
-        // Class documentation using typedoc
-        typedoc: {
-            build: {
-                options: {
-                    module: 'commonjs',
-                    out: '<%= outputDir.build %>/docs',
-                    name: 'opensheetmusicdisplay',
-                    target: 'es5',
-                    mode: 'file'
-                },
-                src: ['./src/**/*.ts', './external/**/*.ts', './typings/**/*.ts']
-            }
-        },
         // Typescript compilation for ES6 module (npm package)
         ts: {
           default : {
@@ -192,15 +179,11 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-karma');
     grunt.loadNpmTasks('grunt-ts');
     grunt.loadNpmTasks('grunt-tslint');
-    grunt.loadNpmTasks('grunt-typedoc');
     grunt.loadNpmTasks('grunt-typings');
 
     // Code quality
     grunt.registerTask('lint',        'Lints all JavaScript and TypeScript files.',  ['jshint', 'tslint']);
 
-    // Documentation
-    grunt.registerTask('docs',        'Builds class documentation to /build/docs',   ['typedoc']);
-
     // Build tasks
     grunt.registerTask('build:demo',  'Builds the demo.',                            ['browserify:debug', 'copy:demo']);
     grunt.registerTask('build:test',  'Builds the tests',                            ['browserify:test']);
@@ -210,5 +193,5 @@ module.exports = function (grunt) {
     grunt.registerTask('test',        'Runs unit, regression and e2e tests.',        ['build:test', 'karma:ci']);
 
     // Default task (if grunt is run without any argument, used in contiuous integration)
-    grunt.registerTask('default',     'Default task, running all other tasks. (CI)', ['lint', 'test', 'docs', 'build:demo', 'build:dist']);
+    grunt.registerTask('default',     'Default task, running all other tasks. (CI)', ['lint', 'test', 'build:demo', 'build:dist']);
 };

+ 1 - 1
bin/publish_gh_page.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Prepare files to be published
-grunt docs
+npm run docs
 grunt build:demo
 
 # Clone github page

+ 6 - 6
package.json

@@ -5,6 +5,7 @@
   "main": "dist/src/OSMD/OSMD.js",
   "typings": "dist/src/OSMD/OSMD",
   "scripts": {
+    "docs": "typedoc --mode file --out build/docs --module commonjs --target ES5 --name opensheetmusicdisplay ./src",
     "test": "grunt test",
     "postinstall": "grunt typings",
     "prepublish": "grunt build:dist"
@@ -62,11 +63,10 @@
     "grunt-karma": "^2.0.0",
     "grunt-ts": "^6.0.0-beta.3",
     "grunt-tslint": "^4.0.0",
-    "grunt-typedoc": "^0.2.4",
     "grunt-typings": "^0.1.5",
-    "http-server": "",
+    "http-server": "^0.9.0",
     "karma": "^1.1.1",
-    "karma-base64-to-js-preprocessor": "0.0.1",
+    "karma-base64-to-js-preprocessor": "^0.0.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-firefox-launcher": "^1.0.0",
@@ -77,9 +77,9 @@
     "mocha": "^3.0.1",
     "phantomjs-prebuilt": "^2.1.8",
     "tsify": "^3.0.0",
-    "tslint": "4.3.1",
-    "typedoc": "^0.5.0",
-    "typescript": "^1.8.10",
+    "tslint": "^4.3.1",
+    "typedoc": "^0.5.7",
+    "typescript": "^2.2.1",
     "typings": "^2.0.0"
   }
 }