merge 'src/editor' subpackage into the main one

graphql-kit · May 29, 2020 · 6e08344 · 6e08344
1 parent ab84b29
commit 6e08344
Show file tree

Hide file tree

Showing 11 changed files with 3,890 additions and 4,474 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "test": "npm run prettier:check",
     "start": "nodemon src/index.ts",
     "debug": "ts-node --inspect --compilerOptions '{\"inlineSources\":true}' src/index.ts",
-    "build:editor": "cd src/editor && yarn && npm run build && cd ../..",
+    "start:editor": "webpack-dev-server --config webpack.config.js",
+    "build:editor": "webpack -p --config webpack.config.js",
     "build:typescript": "tsc",
     "copy:graphql": "cp src/*.graphql dist/",
     "copy:editor": "mkdir \"dist/editor\" && cp src/editor/*.{html,js,css,svg} dist/editor",
@@ -31,14 +32,31 @@
   "homepage": "https://github.com/APIs-guru/graphql-faker#readme",
   "devDependencies": {
     "@types/body-parser": "1.19.0",
+    "@types/classnames": "2.2.10",
     "@types/cors": "2.8.6",
     "@types/express": "4.17.6",
     "@types/faker": "4.1.12",
+    "@types/react": "16.9.35",
+    "@types/react-dom": "16.9.8",
     "@types/yargs": "15.0.5",
+    "classnames": "2.2.6",
+    "codemirror": "5.54.0",
+    "codemirror-graphql": "0.11.6",
+    "css-loader": "3.5.3",
+    "graphiql": "0.17.5",
+    "marked": "1.1.0",
+    "mini-css-extract-plugin": "0.9.0",
     "nodemon": "2.0.4",
-    "prettier": "^2.0.5",
-    "ts-node": "8.10.1",
-    "typescript": "3.9.3"
+    "prettier": "2.0.5",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "style-loader": "1.2.1",
+    "ts-loader": "7.0.5",
+    "ts-node": "8.10.2",
+    "typescript": "3.9.3",
+    "webpack": "4.43.0",
+    "webpack-cli": "3.3.11",
+    "webpack-dev-server": "3.11.0"
   },
   "dependencies": {
     "body-parser": "1.19.0",

diff --git a/src/editor/index.tsx b/src/editor/index.tsx
@@ -4,7 +4,7 @@ import './GraphQLEditor/editor.css';
 import 'graphiql/graphiql.css';
 
 import * as classNames from 'classnames';
-import * as GraphiQL from 'graphiql';
+import GraphiQL from 'graphiql';
 import { buildASTSchema, extendSchema, GraphQLSchema, parse } from 'graphql';
 import { mergeWithFakeDefinitions } from '../fake_definition';
 import * as React from 'react';

diff --git a/src/editor/package.json b/src/editor/package.json
diff --git a/src/editor/postcss.config.js b/src/editor/postcss.config.js
diff --git a/src/editor/tsconfig.json b/src/editor/tsconfig.json
@@ -6,7 +6,6 @@
     "target": "es5",
     "outDir": "dist",
     "moduleResolution": "node",
-    "allowJs": true,
     "lib": ["es2017", "dom"],
     "jsx": "react"
   },

diff --git a/src/editor/webpack.config.js b/src/editor/webpack.config.js