Skip to content

Commit

Permalink
Switch to cookie_js package
Browse files Browse the repository at this point in the history
We previously wrongly used the "cookiejs" npm package. The "cookiejs"
typings correspond to the "cookie_js" npm package from
https://github.com/florian/cookie.js.
  • Loading branch information
beheh committed Dec 14, 2016
1 parent b431824 commit ae4da25
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
8 changes: 4 additions & 4 deletions npm-shrinkwrap.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"babel-preset-react": "^6.16.0",
"bowser": "^1.6.0",
"concurrently": "^3.1.0",
"cookiejs": "^1.0.11",
"cookie_js": "^1.2.2",
"cssnano": "^3.8.1",
"filereader-stream": "^1.0.0",
"fullscreen": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion ts/components/GameWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Option from "../Option";
import PlayerEntity from "../Player";
import LoadingScreen from "./LoadingScreen";
import * as bowser from "bowser";
import * as cookie from "cookiejs";
import {cookie} from "cookie_js";

interface GameWrapperProps extends CardDataProps, CardOracleProps, MulliganOracleProps, AssetDirectoryProps, CardArtDirectory, HideCardsProps, React.ClassAttributes<GameWrapper> {
state: GameState;
Expand Down
2 changes: 1 addition & 1 deletion ts/components/Scrubber.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {StreamScrubber, KeybindingProps} from "../interfaces";
import Timeline from "./Timeline";
import SpeedSelector from "./SpeedSelector";
import Tooltipper from "./Tooltipper";
import * as cookie from "cookiejs";
import {cookie} from "cookie_js";
import * as _ from "lodash";

interface ScrubberProps extends KeybindingProps, React.ClassAttributes<Scrubber> {
Expand Down
5 changes: 5 additions & 0 deletions ts/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,8 @@ declare module "react-dimensions" {

export default Dimensions;
}

declare module "cookie_js" {
import * as cookiejs from "cookiejs";
export {cookiejs as cookie};
}

0 comments on commit ae4da25

Please sign in to comment.