Merge branch 'master' of github.com:gamestdio/clock-timer.js

endel · endel · commit b1253b23cf1f · 2018-07-09T16:40:18.000-03:00
Conflicts:
	package.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/gamestdio/clock-timer.js#readme",
   "dependencies": {
-    "clock.js": "^1.1.5"
+    "@gamestdio/clock": "^1.1.8"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.41",
diff --git a/src/ClockTimer.ts b/src/ClockTimer.ts
@@ -1,4 +1,4 @@
-import Clock = require("clock.js");
+import Clock = require("@gamestdio/clock");
 import { Delayed, Type } from "./Delayed";
 
 export class ClockTimer extends Clock {
diff --git a/yarn.lock b/yarn.lock
@@ -2,6 +2,10 @@
 # yarn lockfile v1
 
 
+"@gamestdio/clock@^1.1.8":
+  version "1.1.8"
+  resolved "https://registry.npmjs.org/@gamestdio/clock/-/clock-1.1.8.tgz#bf99f2befffa5976c3173fe1de5a52d9dce169ef"
+
 "@types/mocha@^2.2.41":
   version "2.2.41"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608"
@@ -45,10 +49,6 @@ chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
-clock.js@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/clock.js/-/clock.js-1.1.5.tgz#c1186cd7e328cc838006d1d2a74eac72070b8f45"
-
 color-convert@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Clock = require("clock.js");`
	`1`	`+import Clock = require("@gamestdio/clock");`
`2`	`2`	`import { Delayed, Type } from "./Delayed";`
`3`	`3`
`4`	`4`	`export class ClockTimer extends Clock {`