diff --git a/Gruntfile.js b/Gruntfile.js index d0e47035..1e804917 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -103,7 +103,8 @@ module.exports = function (grunt) { options: { debug: true, alias: ["./index.js:blue-button"], - ignore: ["blue-button-generate", 'blue-button-cms'] + ignore: ["blue-button-generate", 'blue-button-cms'], + external: ['blue-button-xml'] }, dev: { src: 'index.js', diff --git a/bower.json b/bower.json index e1234ede..c4671531 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,13 @@ { - "name": "bbxml", - "version": "1.3.0-beta.1", + "name": "blue-button", + "version": "1.3.0-beta.11", "license": "Apache-2.0", + "ignore": ["**/*", "!dist/*", "!bower.json", "!package.json", "!LICENSE"], "dependencies": { + "blue-button-xml": "*", "angular": "*", - "angular-route": "*" + "angular-route": "*", + "blue-button-xml": "*" }, "devDependencies": { "angular-mocks": "*" diff --git a/karma.conf.js b/karma.conf.js index 1db057d5..d815be7f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -14,6 +14,7 @@ module.exports = function (config) { 'angulartest/app/lib/angular/angular.js', 'angulartest/app/lib/angular-route/angular-route.js', 'angulartest/app/lib/angular-mocks/angular-mocks.js', + 'angulartest/app/lib/blue-button-xml/dist/blue-button-xml.js', 'angulartest/app/lib/dist/blue-button.js', 'angulartest/app/scripts/app.js', 'angulartest/app/scripts/**/*.js', diff --git a/package.json b/package.json index 57c45aa5..4ffd1897 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,8 @@ { "name": "blue-button", - "version": "1.3.0-beta.10", + "version": "1.3.0-beta.11", "description": "Blue Button (CCDA) to JSON Parser.", "main": "/index.js", - "browser": { - "./node_modules/blue-button-xml/lib/xml.js": "./node_modules/blue-button-xml/browser/lib/xml.js" - }, - "browserify": { - "transform": ["brfs"] - }, "directories": { "doc": "doc", "lib": "lib" diff --git a/test/fixtures/generated/CCD_1.xml.json b/test/fixtures/generated/CCD_1.xml.json index 158033bb..85acff65 100644 --- a/test/fixtures/generated/CCD_1.xml.json +++ b/test/fixtures/generated/CCD_1.xml.json @@ -1960,7 +1960,7 @@ ] }, "meta": { - "version": "1.3.0-beta.10", + "version": "1.3.0-beta.11", "identifiers": [ { "identifier": "2.16.840.1.113883.19.5.99999.1", diff --git a/test/fixtures/generated/SampleCCDDocument.json b/test/fixtures/generated/SampleCCDDocument.json index 470f1ac8..402169d5 100644 --- a/test/fixtures/generated/SampleCCDDocument.json +++ b/test/fixtures/generated/SampleCCDDocument.json @@ -519,7 +519,7 @@ ] }, "meta": { - "version": "1.3.0-beta.10", + "version": "1.3.0-beta.11", "identifiers": [ { "identifier": "db734647-fc99-424c-a864-7e3cda82e703" diff --git a/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json b/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json index 4740db68..66d68f7d 100644 --- a/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json +++ b/test/fixtures/generated/VA_CCD_Sample_File_Version_12_5_1.json @@ -1048,7 +1048,7 @@ ] }, "meta": { - "version": "1.3.0-beta.10", + "version": "1.3.0-beta.11", "identifiers": [ { "identifier": "2.16.840.1.113883.4.349",