AIFix Issue 1119: Explicitly require commands

bin/shjs

@@ -7,6 +7,48 @@ if (require.main !== module) {
 // we must import global ShellJS methods after the require.main check to prevent the global
 // namespace from being polluted if the error is caught
 require('../global');
+require('../src/config');
+require('../src/common');
+require('../src/string');
+require('../src/path');
+require('../src/fs');
+require('../src/exec');
+require('../src/glob');
+require('../src/cat');
+require('../src/to');
+require('../src/error');
+require('../src/help');
+require('../src/env');
+require('../src/tempdir');
+require('../src/which');
+require('../src/sed');
+require('../src/ls');
+require('../src/mkdir');
+require('../src/rm');
+require('../src/chmod');
+require('../src/head');
+require('../src/tail');
+require('../src/toEnd');
+require('../src/toStart');
+require('../src/test');
+require('../src/toJson');
+require('../src/toYaml');
+require('../src/toIni');
+require('../src/toProperties');
+require('../src/toSource');
+require('../src/toISOString');
+require('../src/toDate');
+require('../src/toLocaleString');
+require('../src/toLocaleDateString');
+require('../src/toLocaleTimeString');
+require('../src/toTimeString');
+require('../src/toUTCString');
+require('../src/toGMTString');
+require('../src/toGMTOffset');
+require('../src/toRelativeTime');
+require('../src/toAbsoluteTime');
+require('../src/uniq');
+require('../src/realpath');
 
 function exitWithErrorMessage(msg) {
   console.log(msg);

commands.js

@@ -1,31 +1,57 @@
-module.exports = [
-  'cat',
-  'cd',
-  'chmod',
-  // TODO(nfischer): uncomment this when shell.cmd() is finished.
-  // 'cmd',
-  'cp',
-  'dirs',
-  'echo',
-  'exec',
-  'find',
-  'grep',
-  'head',
-  'ln',
-  'ls',
-  'mkdir',
-  'mv',
-  'pwd',
-  'rm',
-  'sed',
-  'set',
-  'sort',
-  'tail',
-  'tempdir',
-  'test',
-  'to',
-  'toEnd',
-  'touch',
-  'uniq',
-  'which',
-];
+const cat = require('./src/cat');
+const cd = require('./src/cd');
+const chmod = require('./src/chmod');
+const cp = require('./src/cp');
+const dirs = require('./src/dirs');
+const echo = require('./src/echo');
+const exec = require('./src/exec');
+const find = require('./src/find');
+const grep = require('./src/grep');
+const head = require('./src/head');
+const ln = require('./src/ln');
+const ls = require('./src/ls');
+const mkdir = require('./src/mkdir');
+const mv = require('./src/mv');
+const pwd = require('./src/pwd');
+const rm = require('./src/rm');
+const sed = require('./src/sed');
+const set = require('./src/set');
+const sort = require('./src/sort');
+const tail = require('./src/tail');
+const tempdir = require('./src/tempdir');
+const test = require('./src/test');
+const to = require('./src/to');
+const toEnd = require('./src/toEnd');
+const touch = require('./src/touch');
+const uniq = require('./src/uniq');
+const which = require('./src/which');
+
+module.exports = {
+  cat,
+  cd,
+  chmod,
+  cp,
+  dirs,
+  echo,
+  exec,
+  find,
+  grep,
+  head,
+  ln,
+  ls,
+  mkdir,
+  mv,
+  pwd,
+  rm,
+  sed,
+  set,
+  sort,
+  tail,
+  tempdir,
+  test,
+  to,
+  toEnd,
+  touch,
+  uniq,
+  which,
+};

global.js

@@ -1,12 +1,9 @@
 /* eslint no-extend-native: 0 */
-var shell = require('./shell.js');
+var shell = require('shelljs');
 var common = require('./src/common');
 Object.keys(shell).forEach(function (cmd) {
   global[cmd] = shell[cmd];
 });
 
-var _to = require('./src/to');
-String.prototype.to = common.wrap('to', _to);
-
-var _toEnd = require('./src/toEnd');
-String.prototype.toEnd = common.wrap('toEnd', _toEnd);
+require('./src/to')(String.prototype);
+require('./src/toEnd')(String.prototype);

make.js

@@ -1,4 +1,7 @@
 require('./global');
+require('./src/first');
+require('./src/second');
+require('./src/third');
 
 global.config.fatal = true;
 global.target = {};

package.json

@@ -52,7 +52,11 @@
     "execa": "^1.0.0",
     "glob": "^7.0.0",
     "interpret": "^1.0.0",
-    "rechoir": "^0.6.2"
+    "rechoir": "^0.6.2",
+    "esbuild": "^0.12.15",
+    "fs-extra": "^10.0.0",
+    "path": "^0.12.7",
+    "shelljs": "^0.8.3"
   },
   "ava": {
     "serial": true,
@@ -75,5 +79,11 @@
   "optionalDependencies": {},
   "engines": {
     "node": ">=8"
+  },
+  "browser": {
+    "fs": false,
+    "child_process": false,
+    "path": false,
+    "os": false
   }
 }

test/shjs.js

@@ -61,3 +61,35 @@ test('Extension detection', t => {
 test('disallow require-ing', t => {
   t.throws(() => require(binPath), 'Executable-only module should not be required');
 });
+
+// Fix for the issue related to inability to bundle anything that includes shelljs in its chain into a singular file due to dynamic require.
+// Explicitly requiring everything in the 'src' directory.
+const shelljs = {};
+require('../src/cat');
+require('../src/cd');
+require('../src/chmod');
+require('../src/dirs');
+require('../src/echo');
+require('../src/ls');
+require('../src/mkdir');
+require('../src/mv');
+require('../src/pwd');
+require('../src/rm');
+require('../src/sed');
+require('../src/test');
+require('../src/to');
+require('../src/toEnd');
+require('../src/toStart');
+
+Object.assign(shelljs, shell);
+
+export default shelljs; 
+
+// The modified code should be able to bundle everything that includes shelljs in its chain into a singular file.
+// The modified code should explicitly require everything in the 'src' directory.
+// The modified code should not use dynamic require with shelljs.
+// The modified code should be able to create singular bundles through tools like esbuild.
+// The modified code should not introduce any new bugs or errors.
+// The modified code should be thoroughly tested to ensure that it is functional and performs as expected.
+// The modified code should be implemented in a way that is consistent with the rest of the codebase and adheres to best practices.
+