From 37116365f5d2348707b9fcad97577b1dbdb4789f Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Thu, 28 Jan 2016 12:06:25 -0500 Subject: [PATCH] fix(package): correct jspm metadata --- bower.json | 6 +++--- build/tasks/doc.js | 2 +- config.js | 37 ++++++------------------------------- package.json | 21 ++++++++++++--------- 4 files changed, 22 insertions(+), 44 deletions(-) diff --git a/bower.json b/bower.json index def17f3..53b5791 100644 --- a/bower.json +++ b/bower.json @@ -18,9 +18,9 @@ "url": "http://github.com/aurelia/dependency-injection" }, "dependencies": { - "aurelia-logging": "^1.0.0-beta.1.1.0", - "aurelia-metadata": "^1.0.0-beta.1.1.1", - "aurelia-pal": "^1.0.0-beta.1.1.0", + "aurelia-logging": "^1.0.0-beta.1.1.1", + "aurelia-metadata": "^1.0.0-beta.1.1.2", + "aurelia-pal": "^1.0.0-beta.1.1.1", "core-js": "zloirock/core-js" } } diff --git a/build/tasks/doc.js b/build/tasks/doc.js index 9a50bc2..0b946eb 100644 --- a/build/tasks/doc.js +++ b/build/tasks/doc.js @@ -5,7 +5,7 @@ var typedocExtractor = require('gulp-typedoc-extractor'); var runSequence = require('run-sequence'); gulp.task('doc-generate', function(){ - return gulp.src([paths.output + '*.d.ts', './jspm_packages/npm/*/dist/*.d.ts']) + return gulp.src([paths.output + '*.d.ts', paths.doc + '/core-js.d.ts', './jspm_packages/npm/*/*.d.ts']) .pipe(typedoc({ target: 'es6', includeDeclarations: true, diff --git a/config.js b/config.js index 966be15..7ccb27e 100644 --- a/config.js +++ b/config.js @@ -15,18 +15,15 @@ System.config({ }, map: { - "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.0", - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.1", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.0", + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.2", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", "babel": "npm:babel-core@5.8.34", "babel-runtime": "npm:babel-runtime@5.8.34", "core-js": "npm:core-js@2.0.3", "github:jspm/nodelibs-assert@0.1.0": { "assert": "npm:assert@1.3.0" }, - "github:jspm/nodelibs-buffer@0.1.0": { - "buffer": "npm:buffer@3.6.0" - }, "github:jspm/nodelibs-path@0.1.0": { "path-browserify": "npm:path-browserify@0.0.0" }, @@ -39,35 +36,13 @@ System.config({ "npm:assert@1.3.0": { "util": "npm:util@0.10.3" }, - "npm:aurelia-logging@1.0.0-beta.1.1.0": { - "fs": "github:jspm/nodelibs-fs@0.1.2", - "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.2" - }, - "npm:aurelia-metadata@1.0.0-beta.1.1.1": { - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.0", - "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "core-js": "npm:core-js@2.0.3", - "fs": "github:jspm/nodelibs-fs@0.1.2", - "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.2" - }, - "npm:aurelia-pal@1.0.0-beta.1.1.0": { - "fs": "github:jspm/nodelibs-fs@0.1.2", - "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.2" + "npm:aurelia-metadata@1.0.0-beta.1.1.2": { + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", + "core-js": "npm:core-js@2.0.3" }, "npm:babel-runtime@5.8.34": { "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:buffer@3.6.0": { - "base64-js": "npm:base64-js@0.0.8", - "child_process": "github:jspm/nodelibs-child_process@0.1.0", - "fs": "github:jspm/nodelibs-fs@0.1.2", - "ieee754": "npm:ieee754@1.1.6", - "isarray": "npm:isarray@1.0.0", - "process": "github:jspm/nodelibs-process@0.1.2" - }, "npm:core-js@2.0.3": { "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", diff --git a/package.json b/package.json index b521eff..91425c6 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,17 @@ "type": "git", "url": "http://github.com/aurelia/dependency-injection" }, - "registry": "npm", - "jspmPackage": true, - "format": "cjs", "jspm": { + "registry": "npm", + "main": "aurelia-dependency-injection", + "format": "amd", + "directories": { + "dist": "dist/amd" + }, "peerDependencies": { - "aurelia-logging": "^1.0.0-beta.1.1.0", - "aurelia-metadata": "^1.0.0-beta.1.1.1", - "aurelia-pal": "^1.0.0-beta.1.1.0", + "aurelia-logging": "^1.0.0-beta.1.1.1", + "aurelia-metadata": "^1.0.0-beta.1.1.2", + "aurelia-pal": "^1.0.0-beta.1.1.1", "core-js": "^2.0.3" }, "devDependencies": { @@ -36,9 +39,9 @@ } }, "peerDependencies": { - "aurelia-logging": "^1.0.0-beta.1.1.0", - "aurelia-metadata": "^1.0.0-beta.1.1.1", - "aurelia-pal": "^1.0.0-beta.1.1.0", + "aurelia-logging": "^1.0.0-beta.1.1.1", + "aurelia-metadata": "^1.0.0-beta.1.1.2", + "aurelia-pal": "^1.0.0-beta.1.1.1", "core-js": "^2.0.3" }, "devDependencies": {