Skip to content

Commit

Permalink
Merge pull request #16 from Borewit/upgrade-es6
Browse files Browse the repository at this point in the history
Upgrade to JavaScript ES6
  • Loading branch information
Borewit authored Sep 12, 2018
2 parents e6938c8 + fc693a0 commit a142796
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 31 deletions.
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@
"mocha": "^5.2.0",
"nyc": "^13.0.0",
"ts-node": "^7.0.1",
"tslint": "^5.10.0",
"typescript": "^3.0.1"
"tslint": "^5.11.0",
"typescript": "^3.0.3"
},
"dependencies": {
"debug": "^3.1.0",
"es6-promise": "^4.2.4",
"then-read-stream": "^1.2.1",
"token-types": "^0.10.0"
"debug": "^4.0.1",
"then-read-stream": "^1.3.0",
"token-types": "^1.0.0"
},
"keywords": [
"tokenizer",
Expand Down
1 change: 0 additions & 1 deletion src/AbstractTokenizer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {IGetToken, IToken} from "token-types";
import {endOfFile, ITokenizer} from "./";
import {Promise} from "es6-promise";

export abstract class AbstractTokenizer implements ITokenizer {

Expand Down
1 change: 0 additions & 1 deletion src/BufferTokenizer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {endOfFile} from "./";
import {Promise} from "es6-promise";
import {ITokenizer} from "./index";
import {IGetToken, IToken} from "token-types";

Expand Down
1 change: 0 additions & 1 deletion src/FileTokenizer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {AbstractTokenizer} from "./AbstractTokenizer";
import {endOfFile} from "./";
import {Promise} from "es6-promise";
import {FsPromise} from "./FsPromise";

export class FileTokenizer extends AbstractTokenizer {
Expand Down
1 change: 0 additions & 1 deletion src/FsPromise.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as fs from "fs";
import {Promise} from "es6-promise";

export interface IReadResult {
bytesRead: number,
Expand Down
1 change: 0 additions & 1 deletion src/ReadStreamTokenizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {AbstractTokenizer} from "./AbstractTokenizer";
import {endOfFile} from "./";
import {endOfStream, StreamReader} from "then-read-stream";
import * as Stream from "stream";
import {Promise} from "es6-promise";

import * as _debug from "debug";
const debug = _debug("strtok3:ReadStreamTokenizer");
Expand Down
1 change: 0 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {IGetToken} from 'token-types';
import {ReadStreamTokenizer} from "./ReadStreamTokenizer";
import {FileTokenizer} from "./FileTokenizer";
import * as Stream from "stream";
import {Promise} from "es6-promise";
import {FsPromise} from "./FsPromise";
import {BufferTokenizer} from "./BufferTokenizer";

Expand Down
4 changes: 2 additions & 2 deletions src/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"compilerOptions": {
"sourceMap": true,
"sourceMap": false,
"inlineSources": false,
"module": "commonjs",
"moduleResolution": "node",
"declaration": true,
"target": "es5",
"target": "es6",
"outDir": "../lib"
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"module": "commonjs",
"moduleResolution": "node",
"declaration": false,
"target": "es5"
"target": "es6"
}
}

36 changes: 20 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,12 @@ [email protected], debug@^3.1.0:
dependencies:
ms "2.0.0"

debug@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.1.tgz#f9bb36d439b8d1f0dd52d8fb6b46e4ebb8c1cd5b"
dependencies:
ms "^2.1.1"

decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -535,10 +541,6 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"

es6-promise@^4.2.4:
version "4.2.4"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"

[email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
Expand Down Expand Up @@ -1196,6 +1198,10 @@ [email protected]:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

ms@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"

normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.4.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
Expand Down Expand Up @@ -1725,11 +1731,9 @@ test-exclude@^4.2.2:
read-pkg-up "^3.0.0"
require-main-filename "^1.0.1"

then-read-stream@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/then-read-stream/-/then-read-stream-1.2.1.tgz#9baddcb8a4ebc8a6fb36436985d24c36f7908829"
dependencies:
es6-promise "^4.2.4"
then-read-stream@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/then-read-stream/-/then-read-stream-1.3.0.tgz#fb99314d1c5845fea29e5d271f261a1259039c09"

timed-out@^4.0.0:
version "4.0.1"
Expand All @@ -1739,9 +1743,9 @@ to-fast-properties@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"

token-types@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/token-types/-/token-types-0.10.0.tgz#b45ac19ede381ff58fc818d760f7113a6158693b"
token-types@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/token-types/-/token-types-1.0.0.tgz#91f8180eb5464abb28af361ced3ac855a1e18fb2"

tough-cookie@~2.3.3:
version "2.3.4"
Expand Down Expand Up @@ -1774,7 +1778,7 @@ tslib@^1.8.0, tslib@^1.8.1:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"

tslint@^5.10.0:
tslint@^5.11.0:
version "5.11.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
dependencies:
Expand Down Expand Up @@ -1811,9 +1815,9 @@ type-detect@^4.0.0:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"

typescript@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
typescript@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"

uglify-js@^2.6:
version "2.8.29"
Expand Down

0 comments on commit a142796

Please sign in to comment.