diff --git a/packages/core/utils/packup.config.ts b/packages/core/utils/packup.config.ts index 7bb660328a..4be00a28bd 100644 --- a/packages/core/utils/packup.config.ts +++ b/packages/core/utils/packup.config.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-extraneous-dependencies import { defineConfig } from '@strapi/pack-up'; export default defineConfig({ diff --git a/packages/providers/audit-logs-local/package.json b/packages/providers/audit-logs-local/package.json index 2d7d9c888e..e748c409c2 100644 --- a/packages/providers/audit-logs-local/package.json +++ b/packages/providers/audit-logs-local/package.json @@ -28,19 +28,21 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "@strapi/types": "4.14.3", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" diff --git a/packages/providers/audit-logs-local/packup.config.ts b/packages/providers/audit-logs-local/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/audit-logs-local/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/audit-logs-local/src/index.ts b/packages/providers/audit-logs-local/src/index.ts index 541785bbda..a56ddd1b8a 100644 --- a/packages/providers/audit-logs-local/src/index.ts +++ b/packages/providers/audit-logs-local/src/index.ts @@ -12,7 +12,7 @@ interface Log extends Omit { user: string | number; } -export = { +export default { async register({ strapi }: { strapi: Strapi }) { const contentTypes = strapi.container.get('content-types'); if (!contentTypes.keys().includes('admin::audit-log')) { diff --git a/packages/providers/audit-logs-local/tsconfig.build.json b/packages/providers/audit-logs-local/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/audit-logs-local/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/audit-logs-local/tsconfig.eslint.json b/packages/providers/audit-logs-local/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/audit-logs-local/tsconfig.eslint.json +++ b/packages/providers/audit-logs-local/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/audit-logs-local/tsconfig.json b/packages/providers/audit-logs-local/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/audit-logs-local/tsconfig.json +++ b/packages/providers/audit-logs-local/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/email-amazon-ses/package.json b/packages/providers/email-amazon-ses/package.json index 0730e9425e..82f29f7e87 100644 --- a/packages/providers/email-amazon-ses/package.json +++ b/packages/providers/email-amazon-ses/package.json @@ -29,23 +29,25 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@strapi/utils": "4.14.3", "node-ses": "^3.0.3" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" }, diff --git a/packages/providers/email-amazon-ses/packup.config.ts b/packages/providers/email-amazon-ses/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/email-amazon-ses/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/email-amazon-ses/src/index.ts b/packages/providers/email-amazon-ses/src/index.ts index e31b589ae4..98846995a2 100644 --- a/packages/providers/email-amazon-ses/src/index.ts +++ b/packages/providers/email-amazon-ses/src/index.ts @@ -23,7 +23,7 @@ interface ProviderOptions { amazon?: string; } -export = { +export default { init(providerOptions: ProviderOptions, settings: Settings) { const client = nodeSES.createClient(providerOptions); diff --git a/packages/providers/email-amazon-ses/tsconfig.build.json b/packages/providers/email-amazon-ses/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/email-amazon-ses/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/email-amazon-ses/tsconfig.eslint.json b/packages/providers/email-amazon-ses/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/email-amazon-ses/tsconfig.eslint.json +++ b/packages/providers/email-amazon-ses/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/email-amazon-ses/tsconfig.json b/packages/providers/email-amazon-ses/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/email-amazon-ses/tsconfig.json +++ b/packages/providers/email-amazon-ses/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/email-mailgun/package.json b/packages/providers/email-mailgun/package.json index 41dbe8cc51..93041501d7 100644 --- a/packages/providers/email-mailgun/package.json +++ b/packages/providers/email-mailgun/package.json @@ -29,19 +29,20 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", "test:unit": "run -T jest", "test:unit:watch": "run -T jest --watch", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@strapi/utils": "4.14.3", @@ -49,6 +50,7 @@ "mailgun.js": "8.2.1" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" }, diff --git a/packages/providers/email-mailgun/packup.config.ts b/packages/providers/email-mailgun/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/email-mailgun/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/email-mailgun/src/index.ts b/packages/providers/email-mailgun/src/index.ts index 94157a25e6..6074beefef 100644 --- a/packages/providers/email-mailgun/src/index.ts +++ b/packages/providers/email-mailgun/src/index.ts @@ -31,7 +31,7 @@ const optionsMap: Record = { host: { field: 'url', fn: (value) => `https://${value || 'api.mailgun.net'}` }, }; -export = { +export default { convertProviderOptions(providerOptions: ProviderOptions): Record { const newOptions: Record = {}; if (typeof providerOptions === 'object') { diff --git a/packages/providers/email-mailgun/tsconfig.build.json b/packages/providers/email-mailgun/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/email-mailgun/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/email-mailgun/tsconfig.eslint.json b/packages/providers/email-mailgun/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/email-mailgun/tsconfig.eslint.json +++ b/packages/providers/email-mailgun/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/email-mailgun/tsconfig.json b/packages/providers/email-mailgun/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/email-mailgun/tsconfig.json +++ b/packages/providers/email-mailgun/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/email-nodemailer/package.json b/packages/providers/email-nodemailer/package.json index f19c563ce4..7b2d635842 100644 --- a/packages/providers/email-nodemailer/package.json +++ b/packages/providers/email-nodemailer/package.json @@ -42,23 +42,25 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "lodash": "4.17.21", "nodemailer": "6.9.1" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "@types/nodemailer": "6.4.7", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" diff --git a/packages/providers/email-nodemailer/packup.config.ts b/packages/providers/email-nodemailer/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/email-nodemailer/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/email-nodemailer/src/index.ts b/packages/providers/email-nodemailer/src/index.ts index d4d7d6de19..91fdfce75d 100644 --- a/packages/providers/email-nodemailer/src/index.ts +++ b/packages/providers/email-nodemailer/src/index.ts @@ -32,7 +32,7 @@ const emailFields = [ 'attachments', ]; -export = { +export default { provider: 'nodemailer', name: 'Nodemailer', diff --git a/packages/providers/email-nodemailer/tsconfig.build.json b/packages/providers/email-nodemailer/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/email-nodemailer/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/email-nodemailer/tsconfig.eslint.json b/packages/providers/email-nodemailer/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/email-nodemailer/tsconfig.eslint.json +++ b/packages/providers/email-nodemailer/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/email-nodemailer/tsconfig.json b/packages/providers/email-nodemailer/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/email-nodemailer/tsconfig.json +++ b/packages/providers/email-nodemailer/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/email-sendgrid/package.json b/packages/providers/email-sendgrid/package.json index 998ede5c3a..a9fc802747 100644 --- a/packages/providers/email-sendgrid/package.json +++ b/packages/providers/email-sendgrid/package.json @@ -29,23 +29,25 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@sendgrid/mail": "7.7.0", "@strapi/utils": "4.14.3" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" }, diff --git a/packages/providers/email-sendgrid/packup.config.ts b/packages/providers/email-sendgrid/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/email-sendgrid/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/email-sendgrid/src/index.ts b/packages/providers/email-sendgrid/src/index.ts index 177dd6ed11..0e56ccb3c9 100644 --- a/packages/providers/email-sendgrid/src/index.ts +++ b/packages/providers/email-sendgrid/src/index.ts @@ -21,7 +21,7 @@ interface ProviderOptions { apiKey: string; } -export = { +export default { init(providerOptions: ProviderOptions, settings: Settings) { sendgrid.setApiKey(providerOptions.apiKey); diff --git a/packages/providers/email-sendgrid/tsconfig.build.json b/packages/providers/email-sendgrid/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/email-sendgrid/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/email-sendgrid/tsconfig.eslint.json b/packages/providers/email-sendgrid/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/email-sendgrid/tsconfig.eslint.json +++ b/packages/providers/email-sendgrid/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/email-sendgrid/tsconfig.json b/packages/providers/email-sendgrid/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/email-sendgrid/tsconfig.json +++ b/packages/providers/email-sendgrid/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json index 100aafa1f6..59368af816 100644 --- a/packages/providers/email-sendmail/package.json +++ b/packages/providers/email-sendmail/package.json @@ -28,23 +28,25 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@strapi/utils": "4.14.3", "sendmail": "^1.6.1" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "@types/sendmail": "1.4.4", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" diff --git a/packages/providers/email-sendmail/packup.config.ts b/packages/providers/email-sendmail/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/email-sendmail/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/email-sendmail/src/index.ts b/packages/providers/email-sendmail/src/index.ts index 9313ebd155..6c829b0f21 100644 --- a/packages/providers/email-sendmail/src/index.ts +++ b/packages/providers/email-sendmail/src/index.ts @@ -19,7 +19,7 @@ interface SendOptions { type ProviderOptions = Options; -export = { +export default { init(providerOptions: ProviderOptions, settings: Settings) { const sendmail = sendmailFactory({ silent: true, diff --git a/packages/providers/email-sendmail/tsconfig.build.json b/packages/providers/email-sendmail/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/email-sendmail/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/email-sendmail/tsconfig.eslint.json b/packages/providers/email-sendmail/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/email-sendmail/tsconfig.eslint.json +++ b/packages/providers/email-sendmail/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/email-sendmail/tsconfig.json b/packages/providers/email-sendmail/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/email-sendmail/tsconfig.json +++ b/packages/providers/email-sendmail/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json index 6346e5e9bd..4903ce2a9b 100644 --- a/packages/providers/upload-aws-s3/package.json +++ b/packages/providers/upload-aws-s3/package.json @@ -30,25 +30,27 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", "test:unit": "run -T jest", "test:unit:watch": "run -T jest --watch", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "aws-sdk": "2.1437.0", "lodash": "4.17.21" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "@types/jest": "29.5.2", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" diff --git a/packages/providers/upload-aws-s3/packup.config.ts b/packages/providers/upload-aws-s3/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/upload-aws-s3/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/upload-aws-s3/src/index.ts b/packages/providers/upload-aws-s3/src/index.ts index d37fd04afb..a47909883b 100644 --- a/packages/providers/upload-aws-s3/src/index.ts +++ b/packages/providers/upload-aws-s3/src/index.ts @@ -44,7 +44,7 @@ interface InitOptions extends Partial { }; } -export = { +export default { init({ baseUrl, rootPath, s3Options, ...legacyS3Options }: InitOptions) { if (Object.keys(legacyS3Options).length > 0) { process.emitWarning( diff --git a/packages/providers/upload-aws-s3/tsconfig.build.json b/packages/providers/upload-aws-s3/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/upload-aws-s3/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/upload-aws-s3/tsconfig.eslint.json b/packages/providers/upload-aws-s3/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/upload-aws-s3/tsconfig.eslint.json +++ b/packages/providers/upload-aws-s3/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/upload-aws-s3/tsconfig.json b/packages/providers/upload-aws-s3/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/upload-aws-s3/tsconfig.json +++ b/packages/providers/upload-aws-s3/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index 3978d305ba..072536f617 100644 --- a/packages/providers/upload-cloudinary/package.json +++ b/packages/providers/upload-cloudinary/package.json @@ -29,17 +29,18 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@strapi/utils": "4.14.3", @@ -47,6 +48,7 @@ "into-stream": "^5.1.0" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" }, diff --git a/packages/providers/upload-cloudinary/packup.config.ts b/packages/providers/upload-cloudinary/packup.config.ts new file mode 100644 index 0000000000..95e06b2131 --- /dev/null +++ b/packages/providers/upload-cloudinary/packup.config.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + runtime: 'node', +}); diff --git a/packages/providers/upload-cloudinary/src/index.ts b/packages/providers/upload-cloudinary/src/index.ts index 702c99a5fa..1731f3e3d7 100644 --- a/packages/providers/upload-cloudinary/src/index.ts +++ b/packages/providers/upload-cloudinary/src/index.ts @@ -23,7 +23,7 @@ interface File { buffer?: Buffer; } -export = { +export default { init(options: ConfigOptions) { cloudinary.config(options); diff --git a/packages/providers/upload-cloudinary/tsconfig.build.json b/packages/providers/upload-cloudinary/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/upload-cloudinary/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/upload-cloudinary/tsconfig.eslint.json b/packages/providers/upload-cloudinary/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/upload-cloudinary/tsconfig.eslint.json +++ b/packages/providers/upload-cloudinary/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index ee7e51dc04..1463e910c1 100644 --- a/packages/providers/upload-local/package.json +++ b/packages/providers/upload-local/package.json @@ -28,25 +28,27 @@ } ], "main": "./dist/index.js", + "module": "./dist/index.mjs", + "source": "./src/index.ts", "types": "./dist/index.d.ts", "files": [ "./dist" ], "scripts": { - "build": "run -T tsc", - "build:ts": "run -T tsc", - "watch": "run -T tsc -w --preserveWatchOutput", + "build": "pack-up build", "clean": "run -T rimraf ./dist", + "lint": "run -T eslint .", "prepublishOnly": "yarn clean && yarn build", "test:unit": "run -T jest", "test:unit:watch": "run -T jest --watch", - "lint": "run -T eslint ." + "watch": "pack-up watch" }, "dependencies": { "@strapi/utils": "4.14.3", "fs-extra": "10.0.0" }, "devDependencies": { + "@strapi/pack-up": "workspace:*", "@types/jest": "29.5.2", "eslint-config-custom": "4.14.3", "tsconfig": "4.14.3" diff --git a/packages/providers/upload-local/packup.config.ts b/packages/providers/upload-local/packup.config.ts new file mode 100644 index 0000000000..b2b7fcdd87 --- /dev/null +++ b/packages/providers/upload-local/packup.config.ts @@ -0,0 +1,7 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import { defineConfig } from '@strapi/pack-up'; + +export default defineConfig({ + externals: ['stream', 'fs', 'path'], + runtime: 'node', +}); diff --git a/packages/providers/upload-local/src/index.ts b/packages/providers/upload-local/src/index.ts index e49f8ce40e..88c1a7b051 100644 --- a/packages/providers/upload-local/src/index.ts +++ b/packages/providers/upload-local/src/index.ts @@ -37,7 +37,7 @@ interface CheckFileSizeOptions { sizeLimit?: number; } -export = { +export default { init({ sizeLimit: providerOptionsSizeLimit }: InitOptions = {}) { // TODO V5: remove providerOptions sizeLimit if (providerOptionsSizeLimit) { diff --git a/packages/providers/upload-local/tsconfig.build.json b/packages/providers/upload-local/tsconfig.build.json new file mode 100644 index 0000000000..85d086a2df --- /dev/null +++ b/packages/providers/upload-local/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig", + "compilerOptions": { + "outDir": "dist" + }, + "include": ["src"], + "exclude": ["**/__tests__/**"] +} diff --git a/packages/providers/upload-local/tsconfig.eslint.json b/packages/providers/upload-local/tsconfig.eslint.json index b531808514..d0192f9ff6 100644 --- a/packages/providers/upload-local/tsconfig.eslint.json +++ b/packages/providers/upload-local/tsconfig.eslint.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["src"], + "include": ["src", "packup.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/providers/upload-local/tsconfig.json b/packages/providers/upload-local/tsconfig.json index f6e9b92e7e..f9cbaa8cc7 100644 --- a/packages/providers/upload-local/tsconfig.json +++ b/packages/providers/upload-local/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "tsconfig/base.json", - "compilerOptions": { - "outDir": "dist" - }, "include": ["src"], - "exclude": ["node_modules", "**/__tests__/**"] + "exclude": ["node_modules"] } diff --git a/yarn.lock b/yarn.lock index 91ca6861b9..fafb6a5c23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8150,6 +8150,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-audit-logs-local@workspace:packages/providers/audit-logs-local" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/types": 4.14.3 eslint-config-custom: 4.14.3 tsconfig: 4.14.3 @@ -8160,6 +8161,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-email-amazon-ses@workspace:packages/providers/email-amazon-ses" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 eslint-config-custom: 4.14.3 node-ses: ^3.0.3 @@ -8171,6 +8173,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-email-mailgun@workspace:packages/providers/email-mailgun" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 eslint-config-custom: 4.14.3 form-data: ^4.0.0 @@ -8183,6 +8186,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-email-nodemailer@workspace:packages/providers/email-nodemailer" dependencies: + "@strapi/pack-up": "workspace:*" "@types/nodemailer": 6.4.7 eslint-config-custom: 4.14.3 lodash: 4.17.21 @@ -8196,6 +8200,7 @@ __metadata: resolution: "@strapi/provider-email-sendgrid@workspace:packages/providers/email-sendgrid" dependencies: "@sendgrid/mail": 7.7.0 + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 eslint-config-custom: 4.14.3 tsconfig: 4.14.3 @@ -8206,6 +8211,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-email-sendmail@workspace:packages/providers/email-sendmail" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 "@types/sendmail": 1.4.4 eslint-config-custom: 4.14.3 @@ -8218,6 +8224,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-upload-aws-s3@workspace:packages/providers/upload-aws-s3" dependencies: + "@strapi/pack-up": "workspace:*" "@types/jest": 29.5.2 aws-sdk: 2.1437.0 eslint-config-custom: 4.14.3 @@ -8230,6 +8237,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-upload-cloudinary@workspace:packages/providers/upload-cloudinary" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 cloudinary: ^1.41.0 eslint-config-custom: 4.14.3 @@ -8242,6 +8250,7 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/provider-upload-local@workspace:packages/providers/upload-local" dependencies: + "@strapi/pack-up": "workspace:*" "@strapi/utils": 4.14.3 "@types/jest": 29.5.2 eslint-config-custom: 4.14.3