update-dependencies (#294)

* update-depenencies

* fixes

* fixes

* fixes

* fixes

* multiple versions of tailwind css

* multiple versions of tailwind css

Author: ritz078

components/EditorPanel.tsx

@@ -6,7 +6,6 @@ import {
   IconButton,
   Pane,
   Popover,
-  Spinner,
   TextInput,
   toaster,
   Tooltip
@@ -15,7 +14,6 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import dynamic from "next/dynamic";
 import copy from "clipboard-copy";
 import Npm from "@assets/svgs/Npm";
-import { supportedLanguages } from "@utils/prettier";
 import { useDropzone } from "react-dropzone";
 
 export interface EditorPanelProps {
@@ -44,18 +42,7 @@ export interface EditorPanelProps {
 }
 
 const Monaco = dynamic(() => import("../components/Monaco"), {
-  ssr: false,
-  loading: () => (
-    <Pane
-      display="flex"
-      alignItems="center"
-      justifyContent="center"
-      height={400}
-      flex={1}
-    >
-      <Spinner />
-    </Pane>
-  )
+  ssr: false
 });
 
 export default function EditorPanel({

components/Monaco.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import Editor from "@monaco-editor/react";
+import { Pane, Spinner } from "evergreen-ui";
 
 export function processSize(size) {
   return !/^\d+$/.test(size) ? size : `${size}px`;
@@ -34,6 +35,17 @@ export const Monaco: React.FC<MonacoProps> = ({
       width={width}
       options={options}
       onChange={onChange}
+      loading={
+        <Pane
+          display="flex"
+          alignItems="center"
+          justifyContent="center"
+          height={400}
+          flex={1}
+        >
+          <Spinner />
+        </Pane>
+      }
     />
   );
 };

package.json

@@ -18,60 +18,62 @@
     "node": "12.x"
   },
   "dependencies": {
-    "@babel/standalone": "^7.11.2",
-    "@graphql-codegen/core": "^1.17.7",
-    "@graphql-codegen/flow": "^1.17.7",
-    "@graphql-codegen/flow-operations": "^1.17.7",
-    "@graphql-codegen/flow-resolvers": "^1.17.7",
-    "@graphql-codegen/fragment-matcher": "^1.17.7",
-    "@graphql-codegen/introspection": "^1.17.7",
-    "@graphql-codegen/java": "^1.17.7",
-    "@graphql-codegen/java-resolvers": "^1.17.7",
-    "@graphql-codegen/schema-ast": "^1.17.7",
-    "@graphql-codegen/typescript": "^1.17.7",
-    "@graphql-codegen/typescript-apollo-angular": "^2.0.0",
-    "@graphql-codegen/typescript-mongodb": "^1.17.7",
-    "@graphql-codegen/typescript-operations": "^1.17.7",
-    "@graphql-codegen/typescript-react-apollo": "^2.0.5",
-    "@graphql-codegen/typescript-resolvers": "^1.17.7",
-    "@graphql-codegen/typescript-stencil-apollo": "^1.17.7",
-    "@graphql-codegen/typescript-urql": "^2.0.0",
-    "@khanacademy/flow-to-ts": "^0.1.6",
+    "@babel/standalone": "^7.14.7",
+    "@graphql-codegen/core": "^1.17.10",
+    "@graphql-codegen/flow": "^1.19.3",
+    "@graphql-codegen/flow-operations": "^1.18.11",
+    "@graphql-codegen/flow-resolvers": "^1.17.16",
+    "@graphql-codegen/fragment-matcher": "^2.0.1",
+    "@graphql-codegen/introspection": "^1.18.2",
+    "@graphql-codegen/java": "^2.0.2",
+    "@graphql-codegen/java-resolvers": "^1.18.3",
+    "@graphql-codegen/schema-ast": "^1.18.3",
+    "@graphql-codegen/typescript": "^1.22.3",
+    "@graphql-codegen/typescript-apollo-angular": "^2.3.6",
+    "@graphql-codegen/typescript-mongodb": "^1.19.3",
+    "@graphql-codegen/typescript-operations": "^1.18.2",
+    "@graphql-codegen/typescript-react-apollo": "^2.2.7",
+    "@graphql-codegen/typescript-resolvers": "^1.19.4",
+    "@graphql-codegen/typescript-stencil-apollo": "^1.18.7",
+    "@graphql-codegen/typescript-urql": "^2.0.9",
+    "@khanacademy/flow-to-ts": "^0.5.2",
     "@monaco-editor/react": "^4.2.1",
-    "@openapi-contrib/json-schema-to-openapi-schema": "^1.2.0",
-    "@svgr/core": "^5.4.0",
-    "@svgr/plugin-jsx": "^5.4.0",
-    "@types/jsonld": "^1.5.1",
-    "@walmartlabs/json-to-simple-graphql-schema": "^2.0.3",
-    "autoprefixer": "^9.8.6",
+    "@openapi-contrib/json-schema-to-openapi-schema": "^2.0.0",
+    "@svgr/core": "^5.5.0",
+    "@svgr/plugin-jsx": "^5.5.0",
+    "@types/jsonld": "^1.5.5",
+    "@walmartlabs/json-to-simple-graphql-schema": "^2.0.4",
+    "autoprefixer": "^10.2.6",
+    "autoprefixer9": "npm:[email protected]",
     "axios": "^0.21.1",
     "babel-plugin-json-to-proptypes": "^0.1.0",
     "babel-plugin-object-styles-to-template": "^0.2.2",
     "babel-standalone": "^6.26.0",
-    "clipboard-copy": "^3.1.0",
+    "clipboard-copy": "^4.0.1",
     "css-to-tailwind": "^1.0.3",
     "evergreen-ui": "^4.28.0",
-    "flowgen": "^1.11.0",
-    "formik": "^2.1.4",
+    "flowgen": "^1.14.1",
+    "formik": "^2.2.9",
     "generate-schema": "^2.6.0",
     "gofmt.js": "^0.0.2",
-    "graphql": "^15.1.0",
+    "graphql": "^15.5.1",
     "html2pug": "^4.0.0",
     "htmltojsx": "^0.3.0",
     "is-capitalized": "^1.0.0",
-    "is-svg": "^4.2.1",
-    "json-schema-to-typescript": "^9.1.0",
+    "is-svg": "^4.3.1",
+    "json-schema-to-typescript": "^10.1.4",
     "json-to-go": "gist:0d0b8324131c80eeb7e1df20001be32f",
     "json-ts": "^1.6.4",
-    "json_typegen_wasm": "^0.4.0",
-    "jsonld": "^3.1.1",
+    "json_typegen_wasm": "^0.6.1",
+    "jsonld": "^5.2.0",
     "jsonschema-protobuf": "^1.0.2",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "markdown": "^0.5.0",
     "next": "10.2.3",
     "nprogress": "^0.2.0",
-    "postcss": "^7.0.32",
-    "postcss-js": "^3.0.0",
+    "postcss": "^8.3.5",
+    "postcss-js": "^3.0.3",
+    "postcss7": "npm:[email protected]",
     "prettier": "^1.18.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -81,27 +83,28 @@
     "stringify-object": "^3.3.0",
     "svg-to-dataurl": "^1.0.0",
     "svgo": "^1.3.2",
-    "tailwindcss": "^1.7.3",
-    "tempy": "^0.6.0",
+    "tailwindcss": "^2.2.4",
+    "tailwindcss1": "npm:[email protected]",
+    "tempy": "^1.0.1",
     "text-encoding-utf-8": "^1.0.2",
     "transform-json-types": "^0.7.0",
-    "ts-json-schema-generator": "^0.70.2",
+    "ts-json-schema-generator": "^0.93.0",
     "typescript": "4.3.4",
     "xml-js": "^1.6.11",
-    "yaml": "^1.10.0"
+    "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.159",
-    "@types/node": "^14.0.27",
-    "@types/prettier": "^2.0.2",
-    "@types/react": "^16.9.45",
+    "@types/lodash": "^4.14.170",
+    "@types/node": "^15.12.5",
+    "@types/prettier": "^2.3.0",
+    "@types/react": "^17.0.11",
     "@types/svgo": "^1.3.3",
     "husky": "^4.2.5",
     "imagemin-lint-staged": "^0.4.0",
-    "lint-staged": "^10.2.11",
-    "patch-package": "^6.1.2",
+    "lint-staged": "^11.0.0",
+    "patch-package": "^6.4.7",
     "postinstall-postinstall": "^2.0.0",
-    "pretty-quick": "^2.0.1",
+    "pretty-quick": "^3.1.1",
     "ui-box": "2.1.0",
     "webpack": "^4.44.1",
     "worker-loader": "^2.0.0"

pages/api/flow-to-typescript.ts

@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from "next";
-import convert from "@khanacademy/flow-to-ts";
+import { convert } from "@khanacademy/flow-to-ts";
 import * as ts from "typescript";
 
 export default (req: NextApiRequest, res: NextApiResponse) => {

pages/css-to-tailwind.tsx

@@ -1,7 +1,7 @@
 import ConversionPanel, { Transformer } from "@components/ConversionPanel";
 import NoSSR from "@components/NoSSR";
 import * as React from "react";
-import { useState, useCallback, useMemo } from "react";
+import { useState, useCallback } from "react";
 import request from "@utils/request";
 import tailwindCss from "@utils/tailwindcss";
 import { promises as fs } from "fs";
@@ -20,7 +20,7 @@ import {
   Tooltip,
   toaster
 } from "evergreen-ui";
-import tailwindResolve from "tailwindcss/resolveConfig";
+import tailwindResolve from "tailwindcss1/resolveConfig";
 import dynamic from "next/dynamic";
 
 const Monaco = dynamic(() => import("../components/Monaco"), {
@@ -36,7 +36,8 @@ const options = {
     enabled: false
   },
   quickSuggestions: false,
-  lineNumbers: "on"
+  lineNumbers: "on",
+  renderValidationDecorations: "off"
 };
 
 const tabs = [
@@ -115,7 +116,7 @@ function CssToTailwindSettings({ open, toggle, onConfirm, settings }) {
                   : setPostCssInputValue
               }
               options={options}
-              height="300"
+              height={300}
             />
           </Pane>
         </Pane>
@@ -270,7 +271,7 @@ export default function CssToTailwind({ defaultSettings }) {
       editorTitle="CSS"
       editorLanguage="css"
       editorDefaultValue="css2"
-      resultTitle="TailwindCSS"
+      resultTitle="TailwindCSS 1"
       resultLanguage={"css"}
       editorProps={{
         settingElement: ({ open, toggle }) => {

pages/typescript-to-flow.tsx

@@ -6,7 +6,7 @@ import { Alert } from "evergreen-ui";
 
 export default function TypescriptToFlow() {
   const transformer = useCallback(
-    ({ value }) => request("/api/typescript-to-flow", value),
+    ({ value }) => request("/api/typescript-to-flow", value, "plain/text"),
     []
   );
 

patches/@khanacademy+flow-to-ts+0.5.2.patch

@@ -0,0 +1,8 @@
+diff --git a/node_modules/@khanacademy/flow-to-ts/.DS_Store b/node_modules/@khanacademy/flow-to-ts/.DS_Store
+new file mode 100644
+index 0000000..c88a062
+Binary files /dev/null and b/node_modules/@khanacademy/flow-to-ts/.DS_Store differ
+diff --git a/node_modules/@khanacademy/flow-to-ts/dist/convert.bundle.js b/node_modules/@khanacademy/flow-to-ts/dist/convert.js
+similarity index 100%
+rename from node_modules/@khanacademy/flow-to-ts/dist/convert.bundle.js
+rename to node_modules/@khanacademy/flow-to-ts/dist/convert.js

patches/json-schema-to-typescript+9.1.1.patch renamed to patches/json-schema-to-typescript+10.1.4.patch

@@ -1,34 +1,36 @@
 diff --git a/node_modules/json-schema-to-typescript/dist/src/formatter.js b/node_modules/json-schema-to-typescript/dist/src/formatter.js
-index 1c2c709..b3eb9e1 100644
+index a9362fa..b3fef5a 100644
 --- a/node_modules/json-schema-to-typescript/dist/src/formatter.js
 +++ b/node_modules/json-schema-to-typescript/dist/src/formatter.js
-@@ -11,9 +11,8 @@ var __assign = (this && this.__assign) || function () {
-     return __assign.apply(this, arguments);
+@@ -12,12 +12,11 @@ var __assign = (this && this.__assign) || function () {
  };
  Object.defineProperty(exports, "__esModule", { value: true });
+ exports.format = void 0;
 -var prettier_1 = require("prettier");
  function format(code, options) {
+     if (!options.format) {
+         return code;
+     }
 -    return prettier_1.format(code, __assign({ parser: 'typescript' }, options.style));
-+    return code;
++    return code
  }
  exports.format = format;
  //# sourceMappingURL=formatter.js.map
-\ No newline at end of file
 diff --git a/node_modules/json-schema-to-typescript/dist/src/index.js b/node_modules/json-schema-to-typescript/dist/src/index.js
-index c3e750a..1d871dd 100644
+index f880f17..0ef8b27 100644
 --- a/node_modules/json-schema-to-typescript/dist/src/index.js
 +++ b/node_modules/json-schema-to-typescript/dist/src/index.js
-@@ -60,9 +60,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
-     }
+@@ -61,9 +61,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
  };
  Object.defineProperty(exports, "__esModule", { value: true });
+ exports.ValidationError = exports.compile = exports.compileFromFile = exports.DEFAULT_OPTIONS = void 0;
 -var fs_1 = require("fs");
  var lodash_1 = require("lodash");
 -var path_1 = require("path");
  var formatter_1 = require("./formatter");
  var generator_1 = require("./generator");
  var normalizer_1 = require("./normalizer");
-@@ -91,17 +89,7 @@ exports.DEFAULT_OPTIONS = {
+@@ -95,17 +93,6 @@ exports.DEFAULT_OPTIONS = {
      unreachableDefinitions: false,
      unknownAny: true
  };
@@ -43,7 +45,6 @@ index c3e750a..1d871dd 100644
 -    return compile(schema, utils_1.stripExtension(filename), __assign({ cwd: path_1.dirname(filename) }, options));
 -}
 -exports.compileFromFile = compileFromFile;
-+
  function compile(schema, name, options) {
      if (options === void 0) { options = {}; }
      return __awaiter(this, void 0, void 0, function () {

patches/json_typegen_wasm+0.4.0.patch

@@ -0,0 +1,17 @@
+diff --git a/node_modules/json_typegen_wasm/json_typegen_wasm_bg.js b/node_modules/json_typegen_wasm/json_typegen_wasm_bg.js
+index 8bbefdb..b6167a1 100644
+--- a/node_modules/json_typegen_wasm/json_typegen_wasm_bg.js
++++ b/node_modules/json_typegen_wasm/json_typegen_wasm_bg.js
+@@ -14,6 +14,12 @@ const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('u
+ 
+ let cachedTextEncoder = new lTextEncoder('utf-8');
+ 
++if (IN_BROWSER && !window.TextEncoder) {
++        const encoding = require("text-encoding-utf-8");
++        window.TextEncoder = encoding.TextEncoder;
++        window.TextDecoder = encoding.TextDecoder;
++    }
++
+ const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
+     ? function (arg, view) {
+     return cachedTextEncoder.encodeInto(arg, view);

patches/json_typegen_wasm+0.6.1.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/relay-compiler/lib/core/GraphQLCompilerProfiler.js b/node_modules/relay-compiler/lib/core/GraphQLCompilerProfiler.js
-index 77a0cad..d842094 100644
+index 77a0cad..a8e73d5 100644
 --- a/node_modules/relay-compiler/lib/core/GraphQLCompilerProfiler.js
 +++ b/node_modules/relay-compiler/lib/core/GraphQLCompilerProfiler.js
 @@ -189,6 +189,8 @@ function instrumentWait(fn, name) {

patches/relay-compiler+10.0.1.patch renamed to patches/relay-compiler+10.1.0.patch

@@ -48,3 +48,5 @@ declare module "@workers/svgr.worker" {
 
 declare const IN_BROWSER: boolean;
 declare const IS_DEV: boolean;
+
+declare module "@khanacademy/flow-to-ts";

typings.d.ts

@@ -1,7 +1,7 @@
-import postcss from "postcss";
-import tailwindcss from "tailwindcss";
-import defaultConfig from "tailwindcss/stubs/simpleConfig.stub.js";
-import autoprefixer from "autoprefixer";
+import postcss from "postcss7";
+import tailwindcss from "tailwindcss1";
+import defaultConfig from "tailwindcss1/stubs/simpleConfig.stub.js";
+import autoprefixer from "autoprefixer9";
 
 export default async function buildTailwindCss(
   tailwindConfig: any,