From 5a4580b6a8c305b7803c8d929843ca1f39677404 Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Wed, 28 Jun 2023 13:32:05 +0200 Subject: [PATCH] chore(medusa-dev-cli): Cleanup plugin setup (#4421) FIXES CORE-1420 does not include ts migration --- .changeset/twelve-mugs-arrive.md | 5 ++ packages/medusa-dev-cli/.babelrc.js | 3 -- packages/medusa-dev-cli/.npmignore | 3 -- packages/medusa-dev-cli/jest.config.js | 13 +++++ packages/medusa-dev-cli/package.json | 15 +++--- packages/medusa-dev-cli/tsconfig.json | 29 +++++++++++ packages/medusa-dev-cli/tsconfig.spec.json | 5 ++ yarn.lock | 60 +++++++++++----------- 8 files changed, 87 insertions(+), 46 deletions(-) create mode 100644 .changeset/twelve-mugs-arrive.md delete mode 100644 packages/medusa-dev-cli/.babelrc.js delete mode 100644 packages/medusa-dev-cli/.npmignore create mode 100644 packages/medusa-dev-cli/jest.config.js create mode 100644 packages/medusa-dev-cli/tsconfig.json create mode 100644 packages/medusa-dev-cli/tsconfig.spec.json diff --git a/.changeset/twelve-mugs-arrive.md b/.changeset/twelve-mugs-arrive.md new file mode 100644 index 0000000000..bf4a81db27 --- /dev/null +++ b/.changeset/twelve-mugs-arrive.md @@ -0,0 +1,5 @@ +--- +"medusa-dev-cli": patch +--- + +chore(medusa-dev-cli): Cleanup plugin setup diff --git a/packages/medusa-dev-cli/.babelrc.js b/packages/medusa-dev-cli/.babelrc.js deleted file mode 100644 index 5611ada924..0000000000 --- a/packages/medusa-dev-cli/.babelrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: [["babel-preset-medusa-package"]], -}; diff --git a/packages/medusa-dev-cli/.npmignore b/packages/medusa-dev-cli/.npmignore deleted file mode 100644 index 4c7126f447..0000000000 --- a/packages/medusa-dev-cli/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -src -flow-typed -verdaccio diff --git a/packages/medusa-dev-cli/jest.config.js b/packages/medusa-dev-cli/jest.config.js new file mode 100644 index 0000000000..14cd7ed6e7 --- /dev/null +++ b/packages/medusa-dev-cli/jest.config.js @@ -0,0 +1,13 @@ +module.exports = { + globals: { + "ts-jest": { + tsConfig: "tsconfig.spec.json", + isolatedModules: false, + }, + }, + transform: { + "^.+\\.[jt]s?$": "ts-jest", + }, + testEnvironment: `node`, + moduleFileExtensions: [`js`, `jsx`, `ts`, `tsx`, `json`], +} diff --git a/packages/medusa-dev-cli/package.json b/packages/medusa-dev-cli/package.json index 3ce690a21a..6cfb4c02b2 100644 --- a/packages/medusa-dev-cli/package.json +++ b/packages/medusa-dev-cli/package.json @@ -10,7 +10,6 @@ "dist" ], "dependencies": { - "@babel/runtime": "^7.12.5", "chokidar": "^3.5.3", "configstore": "^5.0.1", "del": "^6.0.0", @@ -20,18 +19,16 @@ "glob": "^8.1.0", "got": "^11.8.6", "is-absolute": "^1.0.0", - "jest": "^25.5.4", "lodash": "^4.17.21", "signal-exit": "^3.0.7", "verdaccio": "^4.10.0", "yargs": "^15.4.1" }, "devDependencies": { - "@babel/cli": "^7.12.1", - "@babel/core": "^7.12.3", - "babel-preset-medusa-package": "^1.1.19", "cross-env": "^7.0.3", - "jest": "^25.5.4" + "jest": "^25.5.4", + "ts-jest": "^25.5.1", + "typescript": "^4.4.4" }, "homepage": "https://github.com/medusajs/medusa/tree/master/packages/medusa-dev-cli#readme", "keywords": [ @@ -46,9 +43,9 @@ }, "scripts": { "prepare": "cross-env NODE_ENV=production yarn run build", - "test": "jest --passWithNoTests src", - "build": "babel src --out-dir dist/ --ignore '**/__tests__','**/__mocks__'", - "watch": "babel -w src --out-dir dist/ --ignore '**/__tests__','**/__mocks__'" + "test": "jest --passWithNoTests", + "build": "tsc", + "watch": "tsc --watch" }, "engines": { "node": ">=12.13.0" diff --git a/packages/medusa-dev-cli/tsconfig.json b/packages/medusa-dev-cli/tsconfig.json new file mode 100644 index 0000000000..07b7ad9286 --- /dev/null +++ b/packages/medusa-dev-cli/tsconfig.json @@ -0,0 +1,29 @@ +{ + "compilerOptions": { + "lib": ["es5", "es6", "es2019"], + "target": "es6", + "outDir": "./dist", + "esModuleInterop": true, + "declaration": true, + "module": "commonjs", + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "sourceMap": true, + "noImplicitReturns": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "noImplicitThis": true, + "allowJs": true, + "skipLibCheck": true, + "downlevelIteration": true // to use ES5 specific tooling + }, + "include": ["src"], + "exclude": [ + "dist", + "./src/**/__tests__", + "./src/**/__mocks__", + "./src/**/__fixtures__", + "node_modules" + ] +} diff --git a/packages/medusa-dev-cli/tsconfig.spec.json b/packages/medusa-dev-cli/tsconfig.spec.json new file mode 100644 index 0000000000..9b62409191 --- /dev/null +++ b/packages/medusa-dev-cli/tsconfig.spec.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src"], + "exclude": ["node_modules"] +} diff --git a/yarn.lock b/yarn.lock index c1fb1066e0..591ebf22da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,33 +255,6 @@ __metadata: languageName: node linkType: hard -"@babel/cli@npm:^7.12.1, @babel/cli@npm:^7.14.3, @babel/cli@npm:^7.15.4, @babel/cli@npm:^7.7.5": - version: 7.18.6 - resolution: "@babel/cli@npm:7.18.6" - dependencies: - "@jridgewell/trace-mapping": ^0.3.8 - "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 - chokidar: ^3.4.0 - commander: ^4.0.1 - convert-source-map: ^1.1.0 - fs-readdir-recursive: ^1.1.0 - glob: ^7.0.0 - make-dir: ^2.1.0 - slash: ^2.0.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - dependenciesMeta: - "@nicolo-ribaudo/chokidar-2": - optional: true - chokidar: - optional: true - bin: - babel: ./bin/babel.js - babel-external-helpers: ./bin/babel-external-helpers.js - checksum: d9db59862c482a6013ecb89140d337a72b75d1221674cf7276c4a614dac24126f879c8561433c76f73c2683e03db5d5e83d6d0c042ad7a102985f96cc9b99bc3 - languageName: node - linkType: hard - "@babel/cli@npm:^7.12.10": version: 7.19.3 resolution: "@babel/cli@npm:7.19.3" @@ -309,6 +282,33 @@ __metadata: languageName: node linkType: hard +"@babel/cli@npm:^7.14.3, @babel/cli@npm:^7.15.4, @babel/cli@npm:^7.7.5": + version: 7.18.6 + resolution: "@babel/cli@npm:7.18.6" + dependencies: + "@jridgewell/trace-mapping": ^0.3.8 + "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 + chokidar: ^3.4.0 + commander: ^4.0.1 + convert-source-map: ^1.1.0 + fs-readdir-recursive: ^1.1.0 + glob: ^7.0.0 + make-dir: ^2.1.0 + slash: ^2.0.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + dependenciesMeta: + "@nicolo-ribaudo/chokidar-2": + optional: true + chokidar: + optional: true + bin: + babel: ./bin/babel.js + babel-external-helpers: ./bin/babel-external-helpers.js + checksum: d9db59862c482a6013ecb89140d337a72b75d1221674cf7276c4a614dac24126f879c8561433c76f73c2683e03db5d5e83d6d0c042ad7a102985f96cc9b99bc3 + languageName: node + linkType: hard + "@babel/code-frame@npm:7.12.11": version: 7.12.11 resolution: "@babel/code-frame@npm:7.12.11" @@ -30285,10 +30285,6 @@ __metadata: version: 0.0.0-use.local resolution: "medusa-dev-cli@workspace:packages/medusa-dev-cli" dependencies: - "@babel/cli": ^7.12.1 - "@babel/core": ^7.12.3 - "@babel/runtime": ^7.12.5 - babel-preset-medusa-package: ^1.1.19 chokidar: ^3.5.3 configstore: ^5.0.1 cross-env: ^7.0.3 @@ -30302,6 +30298,8 @@ __metadata: jest: ^25.5.4 lodash: ^4.17.21 signal-exit: ^3.0.7 + ts-jest: ^25.5.1 + typescript: ^4.4.4 verdaccio: ^4.10.0 yargs: ^15.4.1 bin: