Skip to content

Commit 5f8a9e6

Browse files
committed
fix bugs related to ES module vs commonJS conflicts. Apollo server v4 now stable and connecting to mongoDB.
1 parent 2640aa1 commit 5f8a9e6

File tree

6 files changed

+52
-25
lines changed

6 files changed

+52
-25
lines changed

app/electron/main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ const {
2020
const { resolve } = require('app-root-path');
2121

2222
// to install react dev tool extension
23-
const {
24-
default: installExtension,
25-
REACT_DEVELOPER_TOOLS
26-
} = require('electron-devtools-installer');
23+
// const {
24+
// default: installExtension,
25+
// REACT_DEVELOPER_TOOLS
26+
// } = require('electron-devtools-installer');
2727
const debug = require('electron-debug');
2828

2929
// import custom protocol in protocol.js

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"scripts": {
6868
"postinstall": "set ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
6969
"dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
70-
"dev": "concurrently -k \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development nodemon server/server.js --open\"",
70+
"dev": "concurrently -k \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development nodemon server/server.mjs --open\"",
7171
"electron-dev": "cross-env NODE_ENV=development electron .",
7272
"prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
7373
"prod": "npm run prod-build && electron . --no-sandbox",

server/graphQL/resolvers/mutation.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// const { ApolloServerErrorCode.BAD_USER_INPUT } = require('apollo-server-express');
22

3-
import { ApolloServerErrorCode } from '@apollo/server/errors';// v4 syntax
3+
// import { ApolloServerErrorCode } from '@apollo/server/errors';// v4 syntax
4+
const ApolloServerErrorCode = require('@apollo/server/errors');
45
//now using ApolloServerErrorCode.BAD_USER_INPUT in place of ApolloServerErrorCode.BAD_USER_INPUT
56

67
const { Projects, Users, Comments } = require('../../models/reactypeModels');

server/graphQL/resolvers/query.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// const { UserInputError } = require('apollo-server-express');//v3 syntax
22

3-
import { ApolloServerErrorCode } from '@apollo/server/errors';// v4 syntax
3+
// import { ApolloServerErrorCode } from '@apollo/server/errors';// v4 syntax
4+
const ApolloServerErrorCode = require('@apollo/server/errors')
45
//now using ApolloServerErrorCode.BAD_USER_INPUT in place of UserInputError
56

67
const { Projects, Comments } = require('../../models/reactypeModels');

server/graphQL/schema/typeDefs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const { gql } = require('apollo-server-express');
1+
// const { gql } = require('apollo-server-express');
2+
const { gql } = require('@apollo/client');
23

34
// Link to defining a schema in Apollo:
45
// https://www.apollographql.com/docs/apollo-server/schema/schema/

server/server.js renamed to server/server.mjs

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
1-
const { ApolloServer } = require('@apollo/server');//changed for v4
1+
// const { ApolloServer } = require('@apollo/server');//changed for v4
2+
import { ApolloServer } from '@apollo/server';
23

34
//v4 Apollo imports
45
import { expressMiddleware } from '@apollo/server/express4';
56
import cors from 'cors';
6-
import { json } from 'body-parser';
7+
import bodyParser from 'body-parser';
8+
const {json, urlencoded} = bodyParser;
79

810
//possibly redundant
9-
const {makeExecutableSchema} = require('@graphql-tools/schema');
11+
// const {makeExecutableSchema} = require('@graphql-tools/schema');
12+
import { makeExecutableSchema } from '@graphql-tools/schema';
13+
14+
// const express = require('express');
15+
// const cookieParser = require('cookie-parser');
16+
import express from 'express';
17+
import cookieParser from 'cookie-parser';
1018

11-
const express = require('express');
12-
const cookieParser = require('cookie-parser');
1319
//const passport = require('passport');
1420
//const GitHubStrategy = require('passport-github2').Strategy;
15-
const { DEV_PORT } = require('../config');
1621

17-
const path = require('path');
22+
// const { DEV_PORT } = require('../config');
23+
import DEV_PORT from '../config.js';
24+
25+
// const path = require('path');
26+
import path from 'path';
27+
28+
// const userController = require('./controllers/userController');
29+
// const cookieController = require('./controllers/cookieController');
30+
// const sessionController = require('./controllers/sessionController');
31+
// const projectController = require('./controllers/projectController');
1832

19-
const userController = require('./controllers/userController');
20-
const cookieController = require('./controllers/cookieController');
21-
const sessionController = require('./controllers/sessionController');
22-
const projectController = require('./controllers/projectController');
33+
import userController from './controllers/userController.js';
34+
import cookieController from './controllers/cookieController.js';
35+
import sessionController from './controllers/sessionController.js';
36+
import projectController from './controllers/projectController.js';
2337

2438
const app = express();
2539

@@ -33,7 +47,8 @@ app.use(express.urlencoded({ limit: '100mb', extended: true }));
3347
app.use(cookieParser());
3448

3549
// Routes
36-
const stylesRouter = require('./routers/stylesRouter');
50+
// const stylesRouter = require('./routers/stylesRouter');
51+
import stylesRouter from './routers/stylesRouter.js';
3752

3853
// enable cors
3954
// options: origin: allows from localhost when in dev or the app://rse when using prod, credentials: allows credentials header from origin (needed to send cookies)
@@ -111,9 +126,14 @@ GraphQl Router
111126
/* ******************************************************************* */
112127

113128
// Query resolvers
114-
const Query = require('./graphQL/resolvers/query');
129+
// const Query = require('./graphQL/resolvers/query');
130+
import Query from './graphQL/resolvers/query.js';
131+
// const {Query} = query;
132+
115133
// Mutation resolvers
116-
const Mutation = require('./graphQL/resolvers/mutation');
134+
// const Mutation = require('./graphQL/resolvers/mutation');
135+
import Mutation from './graphQL/resolvers/mutation.js';
136+
// const {Mutation} = mutation;
117137

118138
// package resolvers into one variable to pass to Apollo Server
119139
const resolvers = {
@@ -130,8 +150,11 @@ const resolvers = {
130150
app.use('/user-styles', stylesRouter);
131151

132152
// schemas used for graphQL
133-
const typeDefs = require('./graphQL/schema/typeDefs.js');
134-
const { dirname } = require('node:path');
153+
154+
// const typeDefs = require('./graphQL/schema/typeDefs.js');
155+
import typeDefs from './graphQL/schema/typeDefs.js';
156+
157+
// const { dirname } = require('node:path');
135158

136159
// instantiate Apollo server and attach to Express server, mounted at 'http://localhost:PORT/graphql'
137160

@@ -228,6 +251,7 @@ app.use((err, req, res, next) => {
228251

229252
// starts server on PORT
230253
if (isDev || isProd) {
231-
app.listen(PORT, () => console.log(`Server listening on port: ${PORT}`));
254+
app.listen(PORT.DEV_PORT, () => console.log(`Server listening on port: ${PORT.DEV_PORT}`));
232255
}
233256
if (isTest) module.exports = app;
257+
// export default app;

0 commit comments

Comments
 (0)