Skip to content

Commit 1ace8a6

Browse files
committed
rm code changed previously, added node v20 in gh actions yml file
1 parent 0e041de commit 1ace8a6

File tree

7 files changed

+18
-25
lines changed

7 files changed

+18
-25
lines changed

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
node-version: [16.x, 18.x]
17+
node-version: [16.x, 18.x, 20.x]
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919

2020
steps:

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "dbspy",
33
"version": "8.0.0",
4-
"type": "module",
54
"description": "The open source dev tool to logically model and build MySQL and PostgreSQL databases",
65
"main": "server/server.ts",
76
"engines": {

server/logger/index.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
/**
22
* Creates colored alert via log.info()
33
**/
4-
import pinoModule from 'pino';
4+
import pino from 'pino';
55
import dayjs from 'dayjs';
66

7-
// TS thinks pink is not a function anymore - can't import pino from 'pino'
8-
// with "type": "module" & "moduleResolution": "NodeNext", TS expects CommonJS modules to be imported differently
9-
// Pino is published as CmmonJS (cjs) not ESM
10-
// Need to do a "default" import manually in this case
11-
const pino = pinoModule.default;
12-
137
const transport = pino.transport({
148
target: 'pino-pretty',
159
options: { colorize: true },

server/models/userModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import mysql from 'mysql2';
22
import fs from 'fs';
3-
import log from '../logger/index.js';
3+
import log from '../logger';
44
import path from 'path';
55

66
import dotenv from 'dotenv';

server/routes/index.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import express, { Express, Request, Response, NextFunction } from 'express';
2-
import { getAccesToken, getUserInfo } from '../controllers/oauth.controller.js';
3-
import { setJwtToken, getCurrentUser } from '../controllers/sessionController.js';
2+
import { getAccesToken, getUserInfo } from '../controllers/oauth.controller';
3+
import { setJwtToken, getCurrentUser } from '../controllers/sessionController';
44
import {
55
retrieveSchema,
66
saveSchema,
77
userRegistration,
88
verifyUser,
9-
} from '../controllers/user.controller.js';
10-
import { postgresRouter } from './postgres.router.js';
11-
import { microsoftRouter } from './microsoft.router.js';
12-
import { oracleRouter } from './oracle.router.js';
13-
import { mysqlRouter } from './mysql.router.js';
14-
import { sqliteRouter } from './sqlite.router.js';
15-
import { saveRouter } from './save.router.js';
9+
} from '../controllers/user.controller';
10+
import { postgresRouter } from './postgres.router';
11+
import { microsoftRouter } from './microsoft.router';
12+
import { oracleRouter } from './oracle.router';
13+
import { mysqlRouter } from './mysql.router';
14+
import { sqliteRouter } from './sqlite.router';
15+
import { saveRouter } from './save.router';
1616
import { config } from 'dotenv';
17-
import log from '../logger/index.js';
18-
import type { DefaultErr } from '../../src/Types.js';
17+
import log from '../logger';
18+
import type { DefaultErr } from '../../src/Types';
1919
import session from 'express-session';
2020
import path from 'path';
2121

server/server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { config } from 'dotenv';
22
import express, { Express } from 'express';
3-
import log from './logger/index.js';
4-
import routes from './routes/index.js';
3+
import log from './logger';
4+
import routes from './routes';
55
import path from 'path';
66
import cors from 'cors';
77
import session from 'express-session';

src/pages/Signup.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// React & React Router Modules
22
import axios from 'axios';
33
import React, { useState } from 'react';
4-
import useCredentialsStore from '../store/credentialsStore.js';
5-
import { handleOAuthLogin } from '../utils/getGoogleUrl.js';
4+
import useCredentialsStore from '../store/credentialsStore';
5+
import { handleOAuthLogin } from '../utils/getGoogleUrl';
66
import googleImg from '../../src/assets/GoogleImage.png';
77
import gitHubImage from '../../src/assets/GithubImage.png';
88
import { NavLink, useNavigate } from 'react-router-dom';

0 commit comments

Comments
 (0)