Skip to content
This repository has been archived by the owner on Mar 3, 2022. It is now read-only.

Bump @guardian/types To v1.0.0 #131

Merged
merged 1 commit into from
Nov 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions package-lock.json

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@emotion/core": "^10.1.1",
"@guardian/src-foundations": "^2.6.0",
"@guardian/types": "github:guardian/types#semver:^0.5.2",
"@guardian/types": "github:guardian/types#semver:^1.0.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"typescript": "^4.0.5"
Expand Down Expand Up @@ -40,6 +40,9 @@
"ts-jest": "^26.4.4",
"ts-loader": "^8.0.11"
},
"peerDependencies": {
"@guardian/types": "1.x"
},
"scripts": {
"preinstall": "[ -z \"$CI\" ] || if [[ $npm_execpath =~ 'yarn' ]]; then echo 'Use NPM!' && exit 1; fi",
"build": "npm run build:tsc && npm run build:babel && npm run build:cleanup",
Expand Down
3 changes: 1 addition & 2 deletions src/components/bodyImage.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

// ----- Imports ----- //

import { Design, Display, Pillar } from "@guardian/types/Format";
import { none, some } from "@guardian/types/option";
import { Design, Display, none, Pillar, some } from "@guardian/types";
import type { FC } from "react";
import React from "react";
import { image } from "../fixtures/image";
Expand Down
5 changes: 2 additions & 3 deletions src/components/bodyImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { css } from "@emotion/core";
import { remSpace } from "@guardian/src-foundations";
import type { Breakpoint } from "@guardian/src-foundations/mq";
import { from } from "@guardian/src-foundations/mq";
import type { Format } from "@guardian/types/Format";
import type { Option } from "@guardian/types/option";
import { none, some, withDefault } from "@guardian/types/option";
import type { Format, Option } from "@guardian/types";
import { none, some, withDefault } from "@guardian/types";
import React from "react";
import type { FC, ReactNode } from "react";
import type { Image } from "../image";
Expand Down
3 changes: 1 addition & 2 deletions src/components/figCaption.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

// ----- Imports ----- //

import { Design, Display, Pillar } from "@guardian/types/Format";
import { some } from "@guardian/types/option";
import { Design, Display, Pillar, some } from "@guardian/types";
import type { FC } from "react";
import React from "react";
import { FigCaption } from "./figCaption";
Expand Down
6 changes: 2 additions & 4 deletions src/components/figCaption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import { css } from "@emotion/core";
import { remSpace } from "@guardian/src-foundations";
import { neutral, text } from "@guardian/src-foundations/palette";
import { textSans } from "@guardian/src-foundations/typography";
import type { Format } from "@guardian/types/Format";
import { Design } from "@guardian/types/Format";
import type { Option } from "@guardian/types/option";
import { OptionKind } from "@guardian/types/option";
import type { Format, Option } from "@guardian/types";
import { Design, OptionKind } from "@guardian/types";
import React from "react";
import type { FC, ReactNode } from "react";
import { fill } from "../editorialPalette";
Expand Down
3 changes: 1 addition & 2 deletions src/components/img.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

// ----- Imports ----- //

import { Design, Display, Pillar } from "@guardian/types/Format";
import { none } from "@guardian/types/option";
import { Design, Display, none, Pillar } from "@guardian/types";
import type { FC } from "react";
import React from "react";
import { image } from "../fixtures/image";
Expand Down
6 changes: 2 additions & 4 deletions src/components/img.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
import type { SerializedStyles } from "@emotion/core";
import { css } from "@emotion/core";
import { neutral } from "@guardian/src-foundations/palette";
import type { Format } from "@guardian/types/Format";
import { Design } from "@guardian/types/Format";
import type { Option } from "@guardian/types/option";
import { withDefault } from "@guardian/types/option";
import type { Format, Option } from "@guardian/types";
import { Design, withDefault } from "@guardian/types";
import React from "react";
import type { FC } from "react";
import type { Image } from "../image";
Expand Down
4 changes: 2 additions & 2 deletions src/editorialPalette.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
specialReport,
sport,
} from "@guardian/src-foundations/palette";
import type { Format } from "@guardian/types/Format";
import { Pillar, Special } from "@guardian/types/Format";
import type { Format } from "@guardian/types";
import { Pillar, Special } from "@guardian/types";

// ----- Types ----- //

Expand Down
2 changes: 1 addition & 1 deletion src/fixtures/image.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----- Imports ----- //

import { some } from "@guardian/types/option";
import { some } from "@guardian/types";
import type { Image } from "../image";
import { Role } from "../image";

Expand Down
2 changes: 1 addition & 1 deletion src/image.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----- Imports ----- //

import type { Option } from "@guardian/types/option";
import type { Option } from "@guardian/types";

// ----- Types ----- //

Expand Down
4 changes: 2 additions & 2 deletions src/lightbox.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ----- Imports ----- //

import type { Option } from "@guardian/types/option";
import { OptionKind } from "@guardian/types/option";
import type { Option } from "@guardian/types";
import { OptionKind } from "@guardian/types";

// ----- Types ----- //

Expand Down