update scripts

demergent-labs · Jul 12, 2024 · 44b99d6 · 44b99d6
1 parent 4cc5def
commit 44b99d6
Show file tree

Hide file tree

Showing 19 changed files with 115 additions and 86 deletions.
diff --git a/examples/bitcoin_psbt/scripts/bitcoin/transaction_count.js b/examples/bitcoin_psbt/scripts/bitcoin/transaction_count.js
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { execSync } = require('child_process');
+import { execSync } from 'child_process';
 
 const CLI = '.bitcoin/bin/bitcoin-cli -conf=$(pwd)/.bitcoin.conf';
 

diff --git a/scripts/add_metadata_to_dfx_json.js b/scripts/add_metadata_to_dfx_json.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 const targetDirectory = process.argv[2] || '.'; // Use the provided directory or default to the current directory
 

diff --git a/scripts/class_migration/add_example_dependency.js b/scripts/class_migration/add_example_dependency.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Get the current directory name
 const currentDirectory = path.basename(process.cwd());

diff --git a/scripts/class_migration/change_to_custom_candid_gen.js b/scripts/class_migration/change_to_custom_candid_gen.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Path to the dfx.json file
 const dfxJsonPath = path.join(process.cwd(), 'dfx.json');

diff --git a/scripts/class_migration/clean_package.js b/scripts/class_migration/clean_package.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Directories to be removed
 const directoriesToRemove = ['node_modules', '.azle', '.dfx'];

diff --git a/scripts/class_migration/copy_generated_candid_from_example.js b/scripts/class_migration/copy_generated_candid_from_example.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Helper function to copy a file from src to dest
 const copyFile = (src, dest) => {

diff --git a/scripts/class_migration/delete_tests_file.js b/scripts/class_migration/delete_tests_file.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Path to the tests.ts file
 const testsFilePath = path.join(process.cwd(), 'test', 'tests.ts');

diff --git a/scripts/class_migration/do_all_packages.js b/scripts/class_migration/do_all_packages.js
@@ -1,9 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { exec } = require('child_process');
+#!/usr/bin/env node
+
+import { exec } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Get the current directory name
 const currentDirectory = process.cwd();

diff --git a/scripts/class_migration/modify_pretest.js b/scripts/class_migration/modify_pretest.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Path to the pretest.ts file
 const pretestFilePath = path.join(process.cwd(), 'test', 'pretest.ts');

diff --git a/scripts/class_migration/name_package.js b/scripts/class_migration/name_package.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Get the current directory name
 const currentDirectory = path.basename(process.cwd());

diff --git a/scripts/class_migration/update_test.js b/scripts/class_migration/update_test.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Get the current directory name
 const currentDirectory = path.basename(process.cwd());

diff --git a/scripts/class_migration/update_ts_config.js b/scripts/class_migration/update_ts_config.js
@@ -1,7 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Path to the tsconfig.json file
 const tsconfigPath = path.join(process.cwd(), 'tsconfig.json');

diff --git a/scripts/class_migration/update_typescript.js b/scripts/class_migration/update_typescript.js
@@ -1,9 +1,6 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { exec } = require('child_process');
+import { exec } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
 
 const tsVersion = '^5.2.2';
 

diff --git a/scripts/file_generator/bin.js b/scripts/file_generator/bin.js
@@ -1,12 +1,4 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-require('ts-node').register({
-    transpileOnly: true,
-    ignore: [`node_modules/(?!azle)`],
-    compilerOptions: {
-        module: 'commonjs',
-        allowJs: true
-    }
-});
-require('./main.ts');
+import 'tsx';
+import('./main.ts');
diff --git a/scripts/hash_file/bin.js b/scripts/hash_file/bin.js
@@ -1,12 +1,4 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-require('ts-node').register({
-    transpileOnly: true,
-    ignore: [`node_modules/(?!azle)`],
-    compilerOptions: {
-        module: 'commonjs',
-        allowJs: true
-    }
-});
-require('./main.ts');
+import 'tsx';
+import('./main.ts');
diff --git a/scripts/reorder_dfx_json.js b/scripts/reorder_dfx_json.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs-extra');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs-extra';
+import * as path from 'path';
 
 // Helper function to reorder keys in an object.
 const reorderKeys = (obj, order) => {

diff --git a/scripts/simplify_tsconfig.js b/scripts/simplify_tsconfig.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs-extra');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs-extra';
+import * as path from 'path';
 
 // Read directory.
 const dirPath = './examples/motoko_examples'; // Replace with the path to the directory containing folders with tsconfig.json files

diff --git a/scripts/tsx_migration/ts_node_to_tsx.js b/scripts/tsx_migration/ts_node_to_tsx.js
@@ -0,0 +1,76 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+// Path to the package.json file
+const packageJsonPath = path.join(process.cwd(), 'package.json');
+
+// Helper function to sort an object by its keys
+const sortObjectByKeys = (obj) => {
+    return Object.keys(obj)
+        .sort()
+        .reduce((result, key) => {
+            result[key] = obj[key];
+            return result;
+        }, {});
+};
+
+// Read and parse package.json
+fs.readFile(packageJsonPath, 'utf8', (err, data) => {
+    if (err) {
+        console.error(`Error reading package.json file: ${err}`);
+        return;
+    }
+
+    let packageJson;
+    try {
+        packageJson = JSON.parse(data);
+    } catch (parseErr) {
+        console.error(`Error parsing package.json: ${parseErr}`);
+        return;
+    }
+
+    const tsxVersion = '^4.15.7';
+    let tsNodeRemoved = false;
+
+    // Check and update dependencies
+    if (packageJson.dependencies && packageJson.dependencies['ts-node']) {
+        delete packageJson.dependencies['ts-node'];
+        packageJson.dependencies['tsx'] = tsxVersion;
+        packageJson.dependencies = sortObjectByKeys(packageJson.dependencies);
+        tsNodeRemoved = true;
+    }
+
+    // Check and update devDependencies
+    if (packageJson.devDependencies && packageJson.devDependencies['ts-node']) {
+        delete packageJson.devDependencies['ts-node'];
+        packageJson.devDependencies['tsx'] = tsxVersion;
+        packageJson.devDependencies = sortObjectByKeys(
+            packageJson.devDependencies
+        );
+        tsNodeRemoved = true;
+    }
+
+    if (!tsNodeRemoved) {
+        console.log('ts-node not found in dependencies or devDependencies.');
+        return;
+    }
+
+    // Write the updated package.json back to the file
+    fs.writeFile(
+        packageJsonPath,
+        JSON.stringify(packageJson, null, 2),
+        'utf8',
+        (writeErr) => {
+            if (writeErr) {
+                console.error(
+                    `Error writing updated package.json: ${writeErr}`
+                );
+                return;
+            }
+
+            console.log('package.json successfully updated.');
+        }
+    );
+});
diff --git a/scripts/update_dfx_json_main.js b/scripts/update_dfx_json_main.js
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
 
 // Helper function to update the canister definition
 function updateCanister(canister) {