From 2a402b5a1a7315d7b61861eaad038da330bd8ac8 Mon Sep 17 00:00:00 2001
From: Bassel Kanso <basselkanso82@gmail.com>
Date: Thu, 11 Aug 2022 12:10:25 +0300
Subject: [PATCH 1/2] Update typescript plugin generation files:

- Correctly import the Strapi interface
- remove '@strapi/strapi' from typescript plugin dev dependencies
---
 .../generators/lib/files/ts/plugin/server/bootstrap.ts         | 2 +-
 .../files/ts/plugin/server/controllers/my-controller.ts.hbs    | 2 +-
 .../generators/lib/files/ts/plugin/server/destroy.ts           | 2 +-
 .../generators/lib/files/ts/plugin/server/register.ts          | 2 +-
 .../lib/files/ts/plugin/server/services/my-service.ts          | 2 +-
 .../generators/generators/lib/templates/ts/middleware.ts.hbs   | 2 +-
 .../generators/lib/templates/ts/plugin-package.json.hbs        | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/generators/generators/lib/files/ts/plugin/server/bootstrap.ts b/packages/generators/generators/lib/files/ts/plugin/server/bootstrap.ts
index ded1444d5c..aaee9b2fa6 100644
--- a/packages/generators/generators/lib/files/ts/plugin/server/bootstrap.ts
+++ b/packages/generators/generators/lib/files/ts/plugin/server/bootstrap.ts
@@ -1,4 +1,4 @@
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default ({ strapi }: { strapi: Strapi }) => {
   // bootstrap phase
diff --git a/packages/generators/generators/lib/files/ts/plugin/server/controllers/my-controller.ts.hbs b/packages/generators/generators/lib/files/ts/plugin/server/controllers/my-controller.ts.hbs
index 80455e3511..9c2b7c14c7 100644
--- a/packages/generators/generators/lib/files/ts/plugin/server/controllers/my-controller.ts.hbs
+++ b/packages/generators/generators/lib/files/ts/plugin/server/controllers/my-controller.ts.hbs
@@ -1,4 +1,4 @@
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default ({ strapi }: { strapi: Strapi }) => ({
   index(ctx) {
diff --git a/packages/generators/generators/lib/files/ts/plugin/server/destroy.ts b/packages/generators/generators/lib/files/ts/plugin/server/destroy.ts
index 9cc08ce665..e6d8d5e6eb 100644
--- a/packages/generators/generators/lib/files/ts/plugin/server/destroy.ts
+++ b/packages/generators/generators/lib/files/ts/plugin/server/destroy.ts
@@ -1,4 +1,4 @@
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default ({ strapi }: { strapi: Strapi }) => {
   // destroy phase
diff --git a/packages/generators/generators/lib/files/ts/plugin/server/register.ts b/packages/generators/generators/lib/files/ts/plugin/server/register.ts
index fffe84aeda..c53df43937 100644
--- a/packages/generators/generators/lib/files/ts/plugin/server/register.ts
+++ b/packages/generators/generators/lib/files/ts/plugin/server/register.ts
@@ -1,4 +1,4 @@
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default ({ strapi }: { strapi: Strapi }) => {
   // registeration phase
diff --git a/packages/generators/generators/lib/files/ts/plugin/server/services/my-service.ts b/packages/generators/generators/lib/files/ts/plugin/server/services/my-service.ts
index 12e4384752..af306e62be 100644
--- a/packages/generators/generators/lib/files/ts/plugin/server/services/my-service.ts
+++ b/packages/generators/generators/lib/files/ts/plugin/server/services/my-service.ts
@@ -1,4 +1,4 @@
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default ({ strapi }: { strapi: Strapi }) => ({
   getWelcomeMessage() {
diff --git a/packages/generators/generators/lib/templates/ts/middleware.ts.hbs b/packages/generators/generators/lib/templates/ts/middleware.ts.hbs
index 3be9e9503c..b34473df9c 100644
--- a/packages/generators/generators/lib/templates/ts/middleware.ts.hbs
+++ b/packages/generators/generators/lib/templates/ts/middleware.ts.hbs
@@ -2,7 +2,7 @@
  * `{{ name }}` middleware.
  */
 
-import '@strapi/strapi';
+import { Strapi } from '@strapi/strapi';
 
 export default (config, { strapi }: { strapi: Strapi }) => {
   // Add your own logic here.
diff --git a/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs b/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
index 8303bcada1..42bb160e94 100644
--- a/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
+++ b/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
@@ -10,7 +10,6 @@
   "dependencies": {},
   "devDependencies": {
     "typescript": "4.6.3",
-    "@strapi/strapi": "4.1.8"
   },
   "author": {
     "name": "A Strapi developer"
@@ -21,7 +20,7 @@
     }
   ],
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
+    "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
   "scripts": {

From 6b23adaed6b81911b27371f1ce8f7d6eb462b502 Mon Sep 17 00:00:00 2001
From: Bassel Kanso <basselkanso82@gmail.com>
Date: Fri, 12 Aug 2022 15:13:05 +0300
Subject: [PATCH 2/2] small fix remove comma

---
 .../generators/lib/templates/ts/plugin-package.json.hbs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs b/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
index 42bb160e94..013521a68f 100644
--- a/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
+++ b/packages/generators/generators/lib/templates/ts/plugin-package.json.hbs
@@ -9,7 +9,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "typescript": "4.6.3",
+    "typescript": "4.6.3"
   },
   "author": {
     "name": "A Strapi developer"