Skip to content

Commit

Permalink
Dependency "ta-json" GitHub semver dependency becomes "ta-json-x" NPM…
Browse files Browse the repository at this point in the history
… package (fixes readium/r2-testapp-js#10 )
  • Loading branch information
danielweck committed Oct 2, 2018
1 parent 50747b4 commit 14e645a
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 21 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
# Next

Git diff:
* https://github.com/readium/r2-lcp-js/compare/v1.0.0-alpha.5...develop
* https://github.com/readium/r2-lcp-js/compare/v1.0.0-alpha.6...develop

# 1.0.0-alpha.6

Changes:
* Dependency "ta-json" GitHub semver dependency becomes "ta-json-x" NPM package (fixes https://github.com/readium/r2-testapp-js/issues/10 )

Git revision info:
* https://unpkg.com/r2-lcp-js@1.0.0-alpha.6/dist/gitrev.json
* https://github.com/edrlab/r2-lcp-js-dist/blob/v1.0.0-alpha.6/dist/gitrev.json

Git commit history:
* https://github.com/readium/r2-lcp-js/commits/v1.0.0-alpha.6

Git diff:
* https://github.com/readium/r2-lcp-js/compare/v1.0.0-alpha.5...v1.0.0-alpha.6

# 1.0.0-alpha.5

Expand Down
17 changes: 9 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "r2-lcp-js",
"version": "1.0.0-alpha.5",
"version": "1.0.0-alpha.6",
"description": "Readium 2 LCP bits for NodeJS (TypeScript)",
"keywords": [
"readium",
Expand Down Expand Up @@ -52,7 +52,7 @@
"r2-utils-js": "^1.0.0-alpha.5",
"request": "^2.88.0",
"request-promise-native": "^1.0.5",
"ta-json": "git://github.com/danielweck/ta-json.git#semver:^2.5.0",
"ta-json-x": "^2.5.0",
"tslib": "^1.9.3",
"urijs": "^1.19.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/models/metadata-encrypted.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class Encrypted {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-contentkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class ContentKey {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-encryption.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

import { ContentKey } from "./lcp-contentkey";
import { UserKey } from "./lcp-userkey";
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class Link {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-rights.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class Rights {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-signature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class Signature {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
JsonElementType,
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class User {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp-userkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

@JsonObject()
export class UserKey {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/epub/lcp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
JsonElementType,
JsonObject,
JsonProperty,
} from "ta-json";
} from "ta-json-x";

import { DUMMY_CRL } from "./lcp-certificate";
import { Encryption } from "./lcp-encryption";
Expand Down
2 changes: 1 addition & 1 deletion src/publication-download.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { injectFileInZip } from "@utils/zip/zipInjector";
import * as debug_ from "debug";
import * as request from "request";
import * as requestPromise from "request-promise-native";
import { JSON as TAJSON } from "ta-json";
import { JSON as TAJSON } from "ta-json-x";

import { LCP } from "./parser/epub/lcp";

Expand Down

0 comments on commit 14e645a

Please sign in to comment.