feat: improve ts support

Author: AlexSergey

cloc.js cloc.tscloc.js renamed to cloc.ts

@@ -1,6 +1,6 @@
-const { spawn } = require('child_process');
+import { spawn } from 'node:child_process';
 
-const exclude_folders = [
+const excludeFolders = [
   'node_modules',
   '.git',
   '.idea',
@@ -17,21 +17,21 @@ const exclude_folders = [
   'coverage',
   'seo_report',
   '.storybook',
-  'test-reports'
+  'test-reports',
 ];
 
-const exclude_ext = ['json'];
+const excludeExt = ['json'];
 
-const cl = spawn('cloc', [`--exclude-dir=${exclude_folders.join(',')}`, `--exclude-ext=${exclude_ext.join(',')}`, '.']);
+const cl = spawn('cloc', [`--exclude-dir=${excludeFolders.join(',')}`, `--exclude-ext=${excludeExt.join(',')}`, '.']);
 
-cl.stdout.on('data', data => {
+cl.stdout.on('data', (data: Buffer) => {
   console.log(`stdout: ${data}`);
 });
 
-cl.stderr.on('data', data => {
+cl.stderr.on('data', (data: Buffer) => {
   console.log(`stderr: ${data}`);
 });
 
-cl.on('close', code => {
+cl.on('close', (code: number | null) => {
   console.log(`child process exited with code ${code}`);
 });

e2e/babel-e2e/package.json

@@ -15,7 +15,7 @@
     "lint": "npm run lint:ts && npm run lint:code",
     "lint:code": "eslint .",
     "lint:ts": "tsc --noEmit",
-    "test": "node scripts.test.cjs"
+    "test": "tsx scripts.test.ts"
   },
   "dependencies": {
     "@rockpack/babel": "8.0.0",

e2e/babel-e2e/scripts.test.cjs e2e/babel-e2e/scripts.test.tse2e/babel-e2e/scripts.test.cjs renamed to e2e/babel-e2e/scripts.test.ts

@@ -1,4 +1,4 @@
-const { tester } = require('@rockpack/tester');
+import { tester } from '@rockpack/tester';
 
 tester(
   {},

e2e/starter-e2e/package.json

@@ -15,7 +15,7 @@
     "lint": "npm run lint:ts && npm run lint:code",
     "lint:code": "eslint .",
     "lint:ts": "tsc --noEmit",
-    "test": "node --experimental-vm-modules scripts.test.cjs"
+    "test": "NODE_OPTIONS='--experimental-vm-modules' tsx scripts.test.ts"
   },
   "dependencies": {
     "@rockpack/tester": "8.0.0",

e2e/starter-e2e/scripts.test.cjs e2e/starter-e2e/scripts.test.tse2e/starter-e2e/scripts.test.cjs renamed to e2e/starter-e2e/scripts.test.ts

@@ -1,4 +1,4 @@
-const { tester } = require('@rockpack/tester');
+import { tester } from '@rockpack/tester';
 
 tester(
   {},

package.json

@@ -21,7 +21,10 @@
     "lint": "lerna run lint",
     "format": "lerna run format",
     "production": "lerna run production",
-    "test": "lerna run test --stream"
+    "test": "lerna run test --stream",
+    "cloc": "tsx cloc.ts",
+    "updater": "tsx updater.ts",
+    "version:set": "tsx version.ts"
   },
   "simple-git-hooks": {
     "pre-commit": "npm run lint",

packages/compiler/src/configs/eslintrc.js

@@ -6,6 +6,7 @@ import deepExtend from 'deep-extend';
 import { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 import type { TesterOptions } from '../default-props.js';
 
@@ -14,7 +15,7 @@ import { createTestMatch } from '../modules/create-test-match.js';
 
 const _require = createRequire(import.meta.url);
 
-const rootFolder = path.resolve(__dirname, '..');
+const rootFolder = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const currentProjectFolder = getRootRequireDir();
 const ext = import.meta.url.endsWith('.mjs') ? '.mjs' : '.cjs';
 
@@ -67,7 +68,7 @@ export const configCompiler = (
         '\\.(css|less|scss|sss|styl)$': `${rootFolder}/modules/identity-obj-proxy${ext}`,
       },
       setupFiles,
-      setupFilesAfterEnv: [require.resolve('@rockpack/utils/polyfills/text-encoder.fix'), ...setupFilesAfterEnv],
+      setupFilesAfterEnv: [_require.resolve('@rockpack/utils/polyfills/text-encoder.fix'), ...setupFilesAfterEnv],
       testEnvironment: 'jsdom',
       testPathIgnorePatterns: ['<rootDir>/(build|dist|temp|docs|documentation|public|node_modules)/'],
       transform: {
@@ -89,7 +90,7 @@ export const configCompiler = (
     config['reporters'] = [
       'default',
       [
-        require.resolve('jest-html-reporters'),
+        _require.resolve('jest-html-reporters'),
         {
           expand: true,
           filename: 'jest_reporter.html',

packages/tester/src/configs/config-compiler.ts

@@ -4,7 +4,22 @@ import { writeFileSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import sortPackageJson from 'sort-package-json';
 
-async function updateAllDeps() {
+type PackageJson = {
+  name: string;
+  version: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  [key: string]: unknown;
+};
+
+type VersionEntry = {
+  name: string;
+  version: string;
+};
+
+type VersionsJson = Record<string, Record<string, Record<string, VersionEntry[]>>>;
+
+async function updateAllDeps(): Promise<void> {
   const paths = [
     './e2e/babel-e2e/package.json',
     './e2e/starter-e2e/package.json',
@@ -46,24 +61,21 @@ async function updateAllDeps() {
     './packages/utils/package.json',
   ];
 
-  const fields = ['dependencies', 'devDependencies'];
+  const fields: ReadonlyArray<'dependencies' | 'devDependencies'> = ['dependencies', 'devDependencies'];
 
-  const pkgs = paths.map((p) => {
-    const data = readFileSync(p, 'utf8');
-    return {
-      data: JSON.parse(data),
-      path: p,
-    };
-  });
+  const pkgs = paths.map((p) => ({
+    data: JSON.parse(readFileSync(p, 'utf8')) as PackageJson,
+    path: p,
+  }));
 
   for (let i = 0; i < pkgs.length; i++) {
     const pkg = pkgs[i].data;
     const p = pkgs[i].path;
     for (let y = 0; y < fields.length; y++) {
       const field = fields[y];
-      const deps = pkg[field] || {};
+      const deps = pkg[field] ?? {};
       const names = Object.keys(deps);
-      const forUpdate = {};
+      const forUpdate: Record<string, string> = {};
       for (let j = 0; j < names.length; j++) {
         const dep = names[j];
         if (dep.indexOf('@rockpack/') !== -1) {
@@ -88,9 +100,7 @@ async function updateAllDeps() {
         console.warn(`[${pkg.name}] package.json will be updated`);
         const sorted = sortPackageJson({
           ...pkg,
-          ...{
-            [field]: { ...deps, ...forUpdate },
-          },
+          [field]: { ...deps, ...forUpdate },
         });
 
         if (p.indexOf('starter-e2e') > 0) {
@@ -110,7 +120,9 @@ async function updateAllDeps() {
 
             if (indexA >= 0 && indexB >= 0) {
               [orderedKeys[indexA], orderedKeys[indexB]] = [orderedKeys[indexB], orderedKeys[indexA]];
-              sorted.devDependencies = Object.fromEntries(orderedKeys.map((key) => [key, sorted.devDependencies[key]]));
+              sorted.devDependencies = Object.fromEntries(
+                orderedKeys.map((key) => [key, (sorted.devDependencies as Record<string, string>)[key]]),
+              );
             }
           }
         }
@@ -122,29 +134,30 @@ async function updateAllDeps() {
   }
 }
 
-async function updateStarterDeps() {
+async function updateStarterDeps(): Promise<void> {
   const pth = './packages/starter/src/versions.json';
 
-  const data = JSON.parse(readFileSync(pth, 'utf8'));
+  const data = JSON.parse(readFileSync(pth, 'utf8')) as VersionsJson;
   let wasUpdated = false;
 
   console.log('---');
   console.log('Dependencies checking in @rockpack/starter');
   console.log('---');
 
-  for (let type in data) {
-    for (let variations in data[type]) {
-      for (let depType in data[type][variations]) {
+  for (const type in data) {
+    for (const variations in data[type]) {
+      for (const depType in data[type][variations]) {
         const dependencies = data[type][variations][depType];
 
-        for (let dependency of dependencies) {
+        for (const dependency of dependencies) {
           const { name, version } = dependency;
           const newVersion = await latestVersion(name);
-          const { major } = parse(newVersion);
+          const parsed = parse(newVersion);
+          const major = parsed?.major ?? 0;
 
-          if (major > version) {
+          if (major > Number(version)) {
             console.log(`[${name}] will be updated from ${version} to ${major}`);
-            const index = dependencies.findIndex(({ name }) => name === dependency.name);
+            const index = dependencies.findIndex(({ name: n }) => n === dependency.name);
             dependencies[index] = { name, version: `${major}` };
             wasUpdated = true;
           }
@@ -158,7 +171,7 @@ async function updateStarterDeps() {
   }
 }
 
-async function bootstrap() {
+async function bootstrap(): Promise<void> {
   await updateAllDeps();
   await updateStarterDeps();
 }

updater.mjs updater.tsupdater.mjs renamed to updater.ts

@@ -1,16 +1,24 @@
-const yargs = require('yargs');
-const { hideBin } = require('yargs/helpers');
-const { join } = require('path');
-const { writeFileSync } = require('fs');
-const { EOL } = require('os');
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { join } from 'node:path';
+import { writeFileSync, readFileSync } from 'node:fs';
+import { EOL } from 'node:os';
 
-const argv = yargs(hideBin(process.argv)).parse();
+type PackageJson = {
+  name?: string;
+  version: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+  [key: string]: unknown;
+};
+
+const argv = yargs(hideBin(process.argv)).parseSync();
 
 if (argv._.length !== 1) {
   throw new Error('Provide version x.x.x to the argument');
 }
 
-const version = argv._[0];
+const version = String(argv._[0]);
 const part = version.split('-')[0];
 const format = part.split('.');
 
@@ -63,9 +71,9 @@ const projects = [
   './package.json',
 ];
 
-for (let projectPath of projects) {
-  const pthPackageJson = join(__dirname, projectPath);
-  const file = require(pthPackageJson);
+for (const projectPath of projects) {
+  const pthPackageJson = join(process.cwd(), projectPath);
+  const file = JSON.parse(readFileSync(pthPackageJson, 'utf8')) as PackageJson;
   const { dependencies, devDependencies } = file;
   const depKeys = dependencies ? Object.keys(dependencies) : [];
   const devDepKeys = devDependencies ? Object.keys(devDependencies) : [];
@@ -75,11 +83,11 @@ for (let projectPath of projects) {
   file.version = version;
 
   depKeysExisted.forEach((k) => {
-    file.dependencies[k] = version;
+    (file.dependencies as Record<string, string>)[k] = version;
   });
 
   devDepKeysExisted.forEach((k) => {
-    file.devDependencies[k] = version;
+    (file.devDependencies as Record<string, string>)[k] = version;
   });
 
   writeFileSync(pthPackageJson, JSON.stringify(file, null, 2) + EOL, 'utf-8');