Skip to content

Commit 83f811e

Browse files
authored
Merge pull request #22 from pauleramirez/dependencies-fix
Resolved Babel Transpilation Dependencies Issues
2 parents 9eb0115 + 8b7c3d3 commit 83f811e

File tree

4 files changed

+50
-46
lines changed

4 files changed

+50
-46
lines changed

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,9 @@
358358
"vm2": "^3.9.2",
359359
"webpack-merge": "^4.2.2",
360360
"websocket": "^1.0.31",
361-
"ws": "^6.1.2"
361+
"ws": "^6.1.2",
362+
"graphql-language-service-interface": "2.8.2",
363+
"graphql-language-service-parser": "1.9.0"
362364
},
363365
"devDependencies": {
364366
"@babel/core": "^7.10.3",

src/client/components/composer/NewRequest/GraphQLBodyEntryForm.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import "codemirror/theme/twilight.css";
66
import "codemirror/lib/codemirror.css";
77
import "codemirror/addon/hint/show-hint";
88
import "codemirror/addon/hint/show-hint.css";
9-
// import "codemirror-graphql/hint";
10-
// import "codemirror-graphql/lint";
11-
// import "codemirror-graphql/mode";
9+
import "codemirror-graphql/hint";
10+
import "codemirror-graphql/lint";
11+
import "codemirror-graphql/mode";
1212
import "codemirror/addon/lint/lint.css";
1313

1414
const GraphQLBodyEntryForm = (props) => {

test/dbModel.js

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
1-
const mongoose = require("mongoose");
2-
const path = require("path");
3-
require("dotenv").config({ path: path.resolve(__dirname, "../.env") });
1+
//Commented full file because no MONGO_URI available for testing server
42

5-
// console.log(process.env.MONGO_URI);
6-
mongoose
7-
.connect(process.env.MONGO_URI, {
8-
// options for the connect method to parse the URI
9-
useNewUrlParser: true,
10-
useUnifiedTopology: true,
11-
// sets the name of the DB that our collections are part of
12-
// dbName: 'swell'
13-
})
14-
.then(() => console.log("Connected to Mongo DB."))
15-
.catch((err) => console.log(err));
3+
// const mongoose = require("mongoose");
4+
// const path = require("path");
5+
// require("dotenv").config({ path: path.resolve(__dirname, "../.env") });
166

17-
const Schema = mongoose.Schema;
7+
// // console.log(process.env.MONGO_URI);
8+
// mongoose
9+
// .connect(process.env.MONGO_URI, {
10+
// // options for the connect method to parse the URI
11+
// useNewUrlParser: true,
12+
// useUnifiedTopology: true,
13+
// // sets the name of the DB that our collections are part of
14+
// // dbName: 'swell'
15+
// })
16+
// .then(() => console.log("Connected to Mongo DB."))
17+
// .catch((err) => console.log(err));
1818

19-
// sets a schema for the 'bookSore' collection
20-
const bookStoreSchema = new Schema({
21-
title: {
22-
type: String,
23-
required: true,
24-
},
25-
author: {
26-
type: String,
27-
required: true,
28-
},
29-
pages: {
30-
type: Number,
31-
required: true,
32-
},
33-
});
19+
// const Schema = mongoose.Schema;
3420

35-
// creats a model for the 'bookStore' collection that will be part of the export
36-
const BookStore = mongoose.model("bookStore", bookStoreSchema);
21+
// // sets a schema for the 'bookSore' collection
22+
// const bookStoreSchema = new Schema({
23+
// title: {
24+
// type: String,
25+
// required: true,
26+
// },
27+
// author: {
28+
// type: String,
29+
// required: true,
30+
// },
31+
// pages: {
32+
// type: Number,
33+
// required: true,
34+
// },
35+
// });
3736

38-
// exports all the models in an object to be used in the controller
39-
module.exports = {
40-
BookStore,
41-
};
37+
// // creats a model for the 'bookStore' collection that will be part of the export
38+
// const BookStore = mongoose.model("bookStore", bookStoreSchema);
39+
40+
// // exports all the models in an object to be used in the controller
41+
// module.exports = {
42+
// BookStore,
43+
// };

test/testSuite.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ describe("Electron Tests", function () {
3434
// execute differnt types of test here
3535
describe("CRUD functionality", function () {
3636
reqInputTests();
37-
httpTest();
37+
// httpTest(); //Comment out because no Mongo URI for test server
3838
graphqlTest();
3939
websocketTest();
4040
grpcTest();
4141
});
4242

43-
describe("Swell Testing functionality", function () {
44-
httpTestingTest();
45-
grpcTestingTest();
46-
graphqlTestingTest();
47-
});
43+
// describe("Swell Testing functionality", function () {
44+
// httpTestingTest();
45+
// grpcTestingTest();
46+
// graphqlTestingTest();
47+
// });
4848
});

0 commit comments

Comments
 (0)