diff --git a/packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.js b/packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.tsx similarity index 86% rename from packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.js rename to packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.tsx index 939c8f7010b..6f4d42b405a 100644 --- a/packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.js +++ b/packages/app/src/app/pages/common/Modals/Changelog/Dashboard/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; -import { inject, hooksObserver } from 'app/componentConnectors'; +import React, { FunctionComponent } from 'react'; +import CSS from 'csstype'; +import { useOvermind } from 'app/overmind'; import { Link } from 'react-router-dom'; import theme from '@codesandbox/common/lib/theme'; - import { Button } from '@codesandbox/common/lib/components/Button'; // Inline styles because styled-components didn't load the styles -const titleStyles = { +const titleStyles: CSS.Properties = { fontWeight: 600, color: 'rgba(255, 255, 255, 0.9)', fontSize: '1.125rem', @@ -16,7 +16,7 @@ const titleStyles = { textTransform: 'uppercase', }; -const dateStyles = { +const dateStyles: CSS.Properties = { color: 'rgba(255, 255, 255, 0.5)', fontSize: '.875rem', float: 'right', @@ -24,7 +24,7 @@ const dateStyles = { textAlign: 'right', }; -const subTitleStyles = { +const subTitleStyles: CSS.Properties = { fontWeight: 600, color: 'rgba(255, 255, 255, .9)', fontSize: '1rem', @@ -32,7 +32,7 @@ const subTitleStyles = { marginBottom: 0, }; -const descriptionStyles = { +const descriptionStyles: CSS.Properties = { lineHeight: 1.6, color: 'rgba(255, 255, 255, 0.7)', fontWeight: 600, @@ -41,9 +41,15 @@ const descriptionStyles = { marginBottom: 0, }; -const W = props => ; +const W: FunctionComponent = props => ( + +); + +export const DashboardChangelog: FunctionComponent = () => { + const { + actions: { modalClosed }, + } = useOvermind(); -function DashboardChangelog({ signals }) { return (
{ - signals.modalClosed(); - }} + onClick={() => modalClosed()} > Close + {/* + // @ts-ignore */}
); -} - -export default inject('signals')(hooksObserver(DashboardChangelog)); +}; diff --git a/standalone-packages/vscode-textmate/package-lock.json b/standalone-packages/vscode-textmate/package-lock.json index 6d8e3f0d114..587f2306d91 100644 --- a/standalone-packages/vscode-textmate/package-lock.json +++ b/standalone-packages/vscode-textmate/package-lock.json @@ -57,6 +57,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1287,7 +1288,8 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "dev": true, + "optional": true }, "is-builtin-module": { "version": "1.0.0", @@ -1511,6 +1513,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -1714,7 +1717,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -2433,7 +2437,8 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "dev": true, + "optional": true }, "repeating": { "version": "2.0.1",