🔨 Refactors build step to use ts config + build tools

Author: danieldelcore

.changeset/green-lobsters-explain.md

@@ -0,0 +1,6 @@
+---
+'@codeshift/initializer': patch
+'@codeshift/publisher': patch
+---
+
+Refactores Community folder build step

package.json

@@ -69,8 +69,7 @@
   ],
   "preconstruct": {
     "packages": [
-      "packages/*",
-      ".tmp/*"
+      "packages/*"
     ]
   }
 }

packages/initializer/src/index.ts

@@ -2,32 +2,33 @@ import fs from 'fs-extra';
 import semver from 'semver';
 import * as recast from 'recast';
 
-import { version as utilsVersion } from '../../utils/package.json';
-import { version as testUtilsVersion } from '../../test-utils/package.json';
-
-function getPackageJson(packageName: string) {
-  return `{
-  "name": "${packageName}",
-  "version": "0.0.1",
-  "license": "MIT",
-  "main": "dist/codeshift.config.js",
-  "scripts": {
-    "build": "tsc --build",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@codeshift/utils": "^${utilsVersion}"
-  },
-  "devDependencies": {
-    "@codeshift/test-utils": "^${testUtilsVersion}",
-    "@types/jest": "^26.0.15",
-    "jest": "^26.6.0",
-    "jscodeshift": "^0.12.0",
-    "prettier": "^1.16.4",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.3.5"
-  }
-}`;
+export function getPackageJson(packageName: string, version: string = '0.0.0') {
+  return JSON.stringify(
+    {
+      name: packageName,
+      version: version,
+      license: 'MIT',
+      main: 'dist/codeshift.config.js',
+      scripts: {
+        build: 'tsc --build',
+        test: 'jest',
+      },
+      dependencies: {
+        '@codeshift/utils': '*',
+      },
+      devDependencies: {
+        '@codeshift/test-utils': '*',
+        '@types/jest': '^26.0.15',
+        jest: '^26.6.0',
+        jscodeshift: '^0.12.0',
+        prettier: '^1.16.4',
+        'ts-jest': '^26.4.4',
+        typescript: '^4.3.5',
+      },
+    },
+    null,
+    2,
+  );
 }
 
 function getConfig(packageName: string, version: string) {

packages/publisher/package.json

@@ -6,6 +6,7 @@
   "license": "MIT",
   "repository": "https://github.com/CodeshiftCommunity/CodeshiftCommunity/tree/master/packages/publisher",
   "dependencies": {
+    "@codeshift/initializer": "*",
     "@preconstruct/cli": "^2.0.0",
     "fs-extra": "^9.1.0",
     "npm-registry-client": "^8.6.0",

packages/publisher/src/build.ts

@@ -1,18 +1,26 @@
 import { exec } from 'child_process';
 
-export default function buildPackages() {
-  return new Promise<void>((resolve, reject) => {
-    // TODO stop this from building the entire repo.
-    exec(`yarn build`, (error, stdout, stderr) => {
-      if (error) {
-        console.error(`exec error: ${error}`);
-        reject('Unable to build codeshift packages');
-      }
+export default function buildPackages(path: string, packages: string[]) {
+  return Promise.all(
+    packages.map(
+      pkg =>
+        new Promise<void>((resolve, reject) => {
+          // TODO: stop this from building the entire repo.
+          exec(
+            `echo $PWD && cd ${path}/${pkg} && yarn build`,
+            (error, stdout, stderr) => {
+              if (error) {
+                console.error(`exec error: ${error}`);
+                reject('Unable to build codeshift packages');
+              }
 
-      console.log(stdout);
-      console.error(stderr);
+              console.log(stdout);
+              console.error(stderr);
 
-      resolve();
-    });
-  });
+              resolve();
+            },
+          );
+        }),
+    ),
+  );
 }

packages/publisher/src/generate.ts

@@ -2,6 +2,7 @@ import semver from 'semver';
 import fs from 'fs-extra';
 // @ts-ignore
 import RegClient from 'npm-registry-client';
+import { getPackageJson } from '@codeshift/initializer';
 
 const client = new RegClient();
 const npmUri = 'https://registry.npmjs.org/';
@@ -26,62 +27,46 @@ function getPackageVersion(packageName: string) {
   );
 }
 
-function getPackageJson(packageName: string, version: string) {
-  return JSON.stringify(
-    {
-      name: packageName,
-      version,
-      main: `dist/codeshift-${packageName.replace('@codeshift/', '')}.cjs.js`,
-      license: 'MIT',
-      repository: 'https://github.com/CodeshiftCommunity/CodeshiftCommunity/',
-      scripts: {},
-      dependencies: {
-        jscodeshift: '^0.12.0',
-        '@codeshift/utils': '*',
-      },
-    },
-    null,
-    2,
-  );
-}
-
 export default async function generatePackages(
   sourcePath: string,
   targetPath: string,
   changedPackages: string[],
 ) {
   await fs.mkdir(targetPath);
+
   const directories = await fs.readdir(sourcePath);
 
-  directories
-    .filter(dir => changedPackages.includes(dir))
-    .forEach(async dir => {
-      const packageName = `@codeshift/mod-${dir
-        .replace('@', '')
-        .replace('/', '__')}`;
-      const packageVersion = await getPackageVersion(packageName);
-      // We need to manually patch bump the codemod
-      const nextPackageVersion = semver.inc(packageVersion, 'patch');
+  await Promise.all(
+    directories
+      .filter(dir => changedPackages.includes(dir))
+      .map(async dir => {
+        const packageName = `@codeshift/mod-${dir
+          .replace('@', '')
+          .replace('/', '__')}`;
+        const packageVersion = await getPackageVersion(packageName);
+        // We need to manually patch bump the codemod
+        const nextPackageVersion = semver.inc(packageVersion, 'patch');
 
-      const basePath = `${targetPath}/${dir}`;
-      await fs.copy(`${sourcePath}/${dir}`, `${basePath}/src`);
-      await fs.copyFile(
-        `${__dirname}/../template/LICENSE`,
-        `${basePath}/LICENSE`,
-      );
-      await fs.copyFile(
-        `${__dirname}/../template/.npmignore`,
-        `${basePath}/.npmignore`,
-      );
-      await fs.rename(
-        `${basePath}/src/codeshift.config.js`,
-        `${basePath}/src/index.js`,
-      );
-      await fs.writeFile(
-        `${basePath}/package.json`,
-        getPackageJson(packageName, nextPackageVersion!),
-      );
-    });
+        const basePath = `${targetPath}/${dir}`;
+        await fs.copy(`${sourcePath}/${dir}`, `${basePath}/src`);
+        await fs.copyFile(
+          `${__dirname}/../template/LICENSE`,
+          `${basePath}/LICENSE`,
+        );
+        await fs.copyFile(
+          `${__dirname}/../template/.npmignore`,
+          `${basePath}/.npmignore`,
+        );
+        await fs.copyFile(
+          `${__dirname}/../template/tsconfig.json`,
+          `${basePath}/tsconfig.json`,
+        );
+        await fs.writeFile(
+          `${basePath}/package.json`,
+          getPackageJson(packageName, nextPackageVersion!),
+        );
+      }),
+  );
 }
 
 export function cleanTargetDir(path: string) {

packages/publisher/src/publish.ts

@@ -60,6 +60,8 @@ export default function publishPackages(path: string, authToken: string) {
         access: 'public',
         body: fs.createReadStream(tarballPath),
         token: authToken,
+      }).catch(err => {
+        throw new Error(err);
       });
     }),
   );

packages/publisher/template/.npmignore

@@ -1,3 +1,8 @@
 node_modules
+src/
 **/__test__
-**/*.(spec|test).(ts|js)
+**/*.spec.(ts|js)
+.vscode
+jest.config.js
+tsconfig.json
+yarn-error.log

packages/publisher/template/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "outDir": "dist",
+    "esModuleInterop": true,
+    "allowJs": true
+  }
+}

scripts/publish-all-dry.ts

@@ -9,13 +9,12 @@ async function main(sourcePath: string, targetPath: string) {
   cleanTargetDir(targetPath);
 
   const packages = getAllPackages(sourcePath);
-  console.log(packages);
 
   console.log('Generating temporary directory');
   await generatePackages(sourcePath, targetPath, packages);
 
   console.log('Building all packages');
-  await buildPackages();
+  await buildPackages(targetPath, packages);
 }
 
 main(process.argv[2], process.argv[3]).catch(error => {