From 7942f81998fe8de268942a94e25d777e55e2033b Mon Sep 17 00:00:00 2001 From: Jordan Young Date: Thu, 14 Nov 2024 11:30:42 -0500 Subject: [PATCH 1/4] feat: add rewriting jsconfig to tsconfig --- packages/workflow-upgrade/index.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/workflow-upgrade/index.js b/packages/workflow-upgrade/index.js index c0f34ce1..6b3fe9b0 100755 --- a/packages/workflow-upgrade/index.js +++ b/packages/workflow-upgrade/index.js @@ -162,6 +162,18 @@ module.exports = async (cwd) => { fs.unlinkSync(yarnLock); } + const jsconfigPath = path.join(cwd, 'jsconfig.json'); + const hasJsconfig = fs.existsSync(jsconfigPath); + + if (hasJsconfig) { + // Copy jsconfig into tsconfig + const jsconfigData = fs.readFileSync(jsconfigPath); + fs.writeFileSync(jsconfigData, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8'); + + // Delete jsconfig + fs.unlinkSync(jsconfigPath); + } + // Delete node_modules Logger.info('Deleting node_modules...'); rimraf.sync(path.join(cwd, 'node_modules')); From 38aac0e10371fed88c6bce958ba2a3b6c49f948a Mon Sep 17 00:00:00 2001 From: Jordan Young Date: Thu, 14 Nov 2024 13:15:33 -0500 Subject: [PATCH 2/4] feat: add rewriting jsconfig to tsconfig --- packages/workflow-upgrade/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/workflow-upgrade/index.js b/packages/workflow-upgrade/index.js index 6b3fe9b0..4f8be893 100755 --- a/packages/workflow-upgrade/index.js +++ b/packages/workflow-upgrade/index.js @@ -168,7 +168,8 @@ module.exports = async (cwd) => { if (hasJsconfig) { // Copy jsconfig into tsconfig const jsconfigData = fs.readFileSync(jsconfigPath); - fs.writeFileSync(jsconfigData, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8'); + const tsconfigPath = path.join(cwd, 'tsconfig.json'); + fs.writeFileSync(tsconfigPath, `${JSON.stringify(jsconfigData, null, 2)}\n`, 'utf8'); // Delete jsconfig fs.unlinkSync(jsconfigPath); From d2e8a6365682fb5083e3fcabaade8417f1b409e4 Mon Sep 17 00:00:00 2001 From: Jordan Young Date: Thu, 14 Nov 2024 15:40:31 -0500 Subject: [PATCH 3/4] feat: add rewriting jsconfig to tsconfig --- example/package.json | 2 +- packages/workflow-upgrade/index.js | 7 +------ yarn.lock | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/example/package.json b/example/package.json index 4216d640..6deb293f 100644 --- a/example/package.json +++ b/example/package.json @@ -13,7 +13,7 @@ "about": "av about", "lint": "av lint", "help": "av help", - "upgrade:workflow": "./node_modules/.bin/upgrade-workflow", + "upgrade:workflow": "node ../packages/workflow-upgrade/bin.js", "profile": "av profile", "profile:production": "cross-env NODE_ENV=production av profile", "build": "av build", diff --git a/packages/workflow-upgrade/index.js b/packages/workflow-upgrade/index.js index 4f8be893..d11ab74a 100755 --- a/packages/workflow-upgrade/index.js +++ b/packages/workflow-upgrade/index.js @@ -166,13 +166,8 @@ module.exports = async (cwd) => { const hasJsconfig = fs.existsSync(jsconfigPath); if (hasJsconfig) { - // Copy jsconfig into tsconfig - const jsconfigData = fs.readFileSync(jsconfigPath); const tsconfigPath = path.join(cwd, 'tsconfig.json'); - fs.writeFileSync(tsconfigPath, `${JSON.stringify(jsconfigData, null, 2)}\n`, 'utf8'); - - // Delete jsconfig - fs.unlinkSync(jsconfigPath); + fs.renameSync(jsconfigPath, tsconfigPath); } // Delete node_modules diff --git a/yarn.lock b/yarn.lock index 141fe78c..e1b95c75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -283,6 +283,7 @@ __metadata: "@availity/page-header": ^14.0.2 "@availity/spaces": 8.0.8 "@availity/workflow": "workspace:*" + "@availity/workflow-upgrade": "*" "@availity/yup": ^6.0.0 "@tanstack/react-query": ^4.36.1 "@testing-library/react": ^14.3.1 @@ -593,7 +594,7 @@ __metadata: languageName: unknown linkType: soft -"@availity/workflow-upgrade@workspace:packages/workflow-upgrade": +"@availity/workflow-upgrade@*, @availity/workflow-upgrade@workspace:packages/workflow-upgrade": version: 0.0.0-use.local resolution: "@availity/workflow-upgrade@workspace:packages/workflow-upgrade" dependencies: From e4a69372cc85f97f6a1f917b0a45709dcf48d44d Mon Sep 17 00:00:00 2001 From: Jordan Young Date: Thu, 14 Nov 2024 15:42:46 -0500 Subject: [PATCH 4/4] feat: add rewriting jsconfig to tsconfig --- yarn.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index e1b95c75..141fe78c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -283,7 +283,6 @@ __metadata: "@availity/page-header": ^14.0.2 "@availity/spaces": 8.0.8 "@availity/workflow": "workspace:*" - "@availity/workflow-upgrade": "*" "@availity/yup": ^6.0.0 "@tanstack/react-query": ^4.36.1 "@testing-library/react": ^14.3.1 @@ -594,7 +593,7 @@ __metadata: languageName: unknown linkType: soft -"@availity/workflow-upgrade@*, @availity/workflow-upgrade@workspace:packages/workflow-upgrade": +"@availity/workflow-upgrade@workspace:packages/workflow-upgrade": version: 0.0.0-use.local resolution: "@availity/workflow-upgrade@workspace:packages/workflow-upgrade" dependencies: