Merge branch 'master' into feat/onboarding

.env.template

@@ -1,6 +1,5 @@
 JWT_SECRET=something
 COOKIE_SECRET=something
 
-DATABASE_URL="postgres://localhost/medusa-store"
 DATABASE_TYPE="postgres"
 REDIS_URL=redis://localhost:6379

package.json

@@ -44,8 +44,10 @@
     "typeorm": "^0.3.16"
   },
   "devDependencies": {
+    "@babel/preset-typescript": "^7.21.4",
     "@babel/cli": "^7.14.3",
     "@babel/core": "^7.14.3",
+    "@medusajs/medusa-cli": "^1.3.14",
     "@types/express": "^4.17.13",
     "@types/jest": "^27.4.0",
     "@types/node": "^17.0.8",

src/api/routes/store/index.ts

@@ -1,6 +1,6 @@
-import * as cors from "cors"
+import cors from "cors"
 import { Router } from "express"
-import * as bodyParser from "body-parser"
+import bodyParser from "body-parser"
 import customRouteHandler from "./custom-route-handler"
 import { wrapHandler } from "@medusajs/medusa";
 

src/models/README.md

@@ -10,7 +10,8 @@ You may define custom models (entities) that will be registered on the global co
 // src/models/post.ts
 
 import { BeforeInsert, Column, Entity, PrimaryColumn } from "typeorm";
-import { BaseEntity, generateEntityId } from "@medusajs/utils";
+import { generateEntityId } from "@medusajs/utils";
+import { BaseEntity } from "@medusajs/medusa";
 
 @Entity()
 export class Post extends BaseEntity {

src/services/README.md

@@ -6,7 +6,7 @@ You may define custom services that will be registered on the global container b
 // src/services/my-custom.ts
 
 import { Lifetime } from "awilix"
-import { TransactionBaseService } from "@medusajs/utils";
+import { TransactionBaseService } from "@medusajs/medusa";
 import { IEventBusService } from "@medusajs/types";
 
 export default class MyCustomService extends TransactionBaseService {

tsconfig.json

@@ -3,7 +3,7 @@
     "lib": ["es5", "es6"],
     "target": "esnext",
     "allowJs": true,
-    "esModuleInterop": false,
+    "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,