Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
aelassas committed Apr 13, 2024
1 parent 56a992f commit a3614c7
Show file tree
Hide file tree
Showing 182 changed files with 1,465 additions and 1,910 deletions.
34 changes: 21 additions & 13 deletions api/.babelrc.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{
"presets": [
[
"@babel/preset-env",
{
"modules": false,
"targets": {
"node": "current"
}
}
],
"@babel/preset-typescript"
"presets": [
[
"@babel/preset-env",
{
"modules": false,
"targets": {
"node": "current"
}
}
],
"plugins": [
"add-import-extension"
"@babel/preset-typescript"
],
"plugins": [
"add-import-extension",
[
"module-resolver",
{
"alias": {
":movinin-types": "../packages/movinin-types"
}
}
]
]
}
143 changes: 138 additions & 5 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "module",
"scripts": {
"dev": "nodemon",
"build": "rimraf dist && tsc && babel dist -d dist",
"build": "rimraf dist && tsc -b && babel dist -d dist",
"start": "npm run build && node dist/src",
"test": "rimraf coverage && cross-env NODE_ENV=test NODE_OPTIONS=--experimental-vm-modules jest --coverage",
"lint": "eslint --ext .ts .",
Expand Down Expand Up @@ -46,6 +46,7 @@
"@types/validator": "^13.11.9",
"babel-jest": "^29.7.0",
"babel-plugin-add-import-extension": "^1.6.0",
"babel-plugin-module-resolver": "^5.0.0",
"bcrypt": "^5.1.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.6",
Expand All @@ -60,7 +61,6 @@
"jest": "^29.7.0",
"jsonwebtoken": "^9.0.2",
"mongoose": "^8.3.1",
"movinin-types": "file:../packages/movinin-types",
"multer": "^1.4.5-lts.1",
"nocache": "^4.0.0",
"nodemailer": "^6.9.13",
Expand Down
2 changes: 1 addition & 1 deletion api/src/config/env.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import process from 'node:process'
import { Document, Types } from 'mongoose'
import { CookieOptions } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as helper from '../common/helper'

/**
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/agencyController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import path from 'node:path'
import fs from 'node:fs/promises'
import escapeStringRegexp from 'escape-string-regexp'
import { Request, Response } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import i18n from '../lang/i18n'
import * as env from '../config/env.config'
import User from '../models/User'
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/bookingController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import mongoose from 'mongoose'
import escapeStringRegexp from 'escape-string-regexp'
import { Expo, ExpoPushMessage, ExpoPushTicket } from 'expo-server-sdk'
import { Request, Response } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import i18n from '../lang/i18n'
import Booking from '../models/Booking'
import User from '../models/User'
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/locationController.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import escapeStringRegexp from 'escape-string-regexp'
import mongoose from 'mongoose'
import { Request, Response } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as env from '../config/env.config'
import i18n from '../lang/i18n'
import Location from '../models/Location'
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/propertyController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { v1 as uuid } from 'uuid'
import escapeStringRegexp from 'escape-string-regexp'
import mongoose from 'mongoose'
import { Request, Response } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import Booking from '../models/Booking'
import Property from '../models/Property'
import i18n from '../lang/i18n'
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/userController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { v1 as uuid } from 'uuid'
import escapeStringRegexp from 'escape-string-regexp'
import mongoose from 'mongoose'
import { CookieOptions, Request, Response } from 'express'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import i18n from '../lang/i18n'
import * as env from '../config/env.config'
import User from '../models/User'
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Booking.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Schema, model } from 'mongoose'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as env from '../config/env.config'

const bookingSchema = new Schema<env.Booking>(
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Property.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Schema, model } from 'mongoose'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as env from '../config/env.config'

const propertySchema = new Schema<env.Property>(
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/User.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import validator from 'validator'
import { Schema, model } from 'mongoose'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as env from '../config/env.config'

const userSchema = new Schema<env.User>(
Expand Down
2 changes: 1 addition & 1 deletion api/tests/agency.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import url from 'url'
import path from 'path'
import fs from 'node:fs/promises'
import { v1 as uuid } from 'uuid'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as databaseHelper from '../src/common/databaseHelper'
import * as testHelper from './testHelper'
import app from '../src/app'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/booking.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dotenv/config'
import request from 'supertest'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import { v1 as uuid } from 'uuid'

Check failure on line 4 in api/tests/booking.test.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`uuid` import should occur before import of `:movinin-types`

Check failure on line 4 in api/tests/booking.test.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`uuid` import should occur before import of `:movinin-types`
import app from '../src/app'
import * as databaseHelper from '../src/common/databaseHelper'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/location.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dotenv/config'
import request from 'supertest'
import { v1 as uuid } from 'uuid'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import app from '../src/app'
import * as databaseHelper from '../src/common/databaseHelper'
import * as testHelper from './testHelper'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/middleware.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dotenv/config'
import request from 'supertest'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as databaseHelper from '../src/common/databaseHelper'
import app from '../src/app'
import * as env from '../src/config/env.config'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/miscellaneous.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'dotenv/config'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'
import * as env from '../src/config/env.config'
import * as databaseHelper from '../src/common/databaseHelper'
import * as mailHelper from '../src/common/mailHelper'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/property.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dotenv/config'
import request from 'supertest'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'

Check failure on line 3 in api/tests/property.test.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`:movinin-types` import should occur after import of `uuid`

Check failure on line 3 in api/tests/property.test.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`:movinin-types` import should occur after import of `uuid`
import url from 'url'
import path from 'path'
import fs from 'node:fs/promises'
Expand Down
2 changes: 1 addition & 1 deletion api/tests/testHelper.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import request from 'supertest'
import cookieParser from 'cookie-parser'
import bcrypt from 'bcrypt'
import * as movininTypes from 'movinin-types'
import * as movininTypes from ':movinin-types'

Check failure on line 4 in api/tests/testHelper.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`:movinin-types` import should occur after import of `mongoose`

Check failure on line 4 in api/tests/testHelper.ts

View workflow job for this annotation

GitHub Actions / build (lts/*)

`:movinin-types` import should occur after import of `mongoose`
import { v1 as uuid } from 'uuid'
import mongoose from 'mongoose'
import app from '../src/app'
Expand Down
Loading

0 comments on commit a3614c7

Please sign in to comment.