feat: Add standalone yarn file to install and uninstall packages (inspired from Hyper)

Author: QuiiBz

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squid-cli",
-  "version": "0.2.0-canary",
+  "version": "0.3.0-canary",
   "description": "The CLI for Squid.",
   "author": {
     "email": "[email protected]",
@@ -17,7 +17,6 @@
   },
   "dependencies": {
     "chalk": "^4.1.0",
-    "get-installed-path": "^4.0.8",
     "inquirer": "^8.0.0",
     "yargs": "^16.2.0"
   },

cli/src/commands/install.ts

@@ -2,7 +2,7 @@ import { Arguments, Argv, CommandModule } from 'yargs';
 import chalk from 'chalk';
 import { getConfig, PACKAGES_PATH, saveConfig } from '../utils/config';
 import { spawn } from 'child_process';
-import { getInstalledPath } from 'get-installed-path';
+import { YARN_PATH } from '../utils/utils';
 
 export const install: CommandModule = {
 
@@ -33,32 +33,27 @@ export const install: CommandModule = {
         console.log(`Installing ${packageName} in ${chalk.green(PACKAGES_PATH)}...`);
         console.log(' ');
 
-        getInstalledPath('yarn').then((path) => {
+        const install = spawn(process.execPath, [YARN_PATH, 'add', '--cwd', process.env.HOME, '--modules-folder', '.squid', packageName], { stdio: 'inherit', env: process.env });
 
-            path += '/bin/yarn';
+        install.on('message', (msg) => console.log(msg))
+        install.on('exit', (code) => {
 
-            const install = spawn(path, ['add', '--cwd', process.env.HOME, '--modules-folder', '.squid', '--no-lockfile', packageName], { stdio: 'inherit', env: process.env });
+            if(code !== 0) {
 
-            install.on('message', (msg) => console.log(msg))
-            install.on('exit', (code) => {
+                console.log('Installation failed!')
+                return;
+            }
 
-                if(code !== 0) {
-
-                    console.log('Installation failed!')
-                    return;
-                }
-
-                const config = getConfig();
-                saveConfig({
-                    ...config,
-                    packages: [...config.packages, packageName],
-                });
+            const config = getConfig();
+            saveConfig({
+                ...config,
+                packages: [...config.packages, packageName],
+            });
 
-                console.log(' ');
-                console.log('Success!');
+            console.log(' ');
+            console.log('Success!');
 
-                process.exit(0);
-            });
+            process.exit(0);
         });
     },
 };

cli/src/commands/list.ts

@@ -37,8 +37,7 @@ export const getPackages = (): PackageItem[] => {
         else {
 
             try {
-                // eslint-disable-next-line @typescript-eslint/no-var-requires
-                const { name: pName, version: pVersion } = require(packagePath);
+                const { name: pName, version: pVersion } = JSON.parse(fs.readFileSync(packageJsonPath).toString());
                 name = pName;
                 version = pVersion;
 
@@ -63,11 +62,19 @@ export const list: CommandModule = {
     describe: 'List installed package',
     handler: () => {
 
+        const packages = getPackages();
+
+        if(packages.length === 0) {
+
+            console.log(chalk.red('Not packages installed.'));
+            return;
+        }
+
         console.log(' ');
         console.log(`Installed packages in ${chalk.green(PACKAGES_PATH)}`);
         console.log(' ');
 
-        getPackages().forEach(({ name, version, error }) => {
+        packages.forEach(({ name, version, error }) => {
 
             console.log(` - ${name} ${chalk.gray('v' + version)}`);
             error && console.log(`   \\=> ${chalk.red(error)}`);

cli/src/commands/new.ts

@@ -2,6 +2,7 @@ import { Arguments, Argv, CommandModule } from 'yargs';
 import inquirer from 'inquirer'
 import { resolveArgPath } from '../utils/utils';
 import { initializeProject, Language, PackageType } from '../new/new';
+import chalk from 'chalk';
 
 export const newCommand: CommandModule = {
 
@@ -28,6 +29,12 @@ export const newCommand: CommandModule = {
         const path = resolveArgPath(args);
         const useYarn = !args.npm;
 
+        if(!useYarn) {
+
+            console.log(chalk.red('NPM is not yet supported to install packages.'));
+            return;
+        }
+
         inquirer.prompt([
             {
                 type: 'input',

cli/src/commands/uninstall.ts

@@ -2,8 +2,8 @@ import { Arguments, CommandModule } from 'yargs';
 import chalk from 'chalk';
 import { getConfig, PACKAGES_PATH, saveConfig } from '../utils/config';
 import { spawn } from 'child_process';
-import path from 'path';
 import { getPackages } from './list';
+import { YARN_PATH } from '../utils/utils';
 
 export const uninstall: CommandModule = {
 
@@ -15,7 +15,7 @@ export const uninstall: CommandModule = {
         const packageName = args.name as string;
         const packages = getPackages();
 
-        if(packages.every(({ name }) => name !== packageName)) {
+        if(!packages.find(({ name }) => name === packageName)) {
 
             console.log(chalk.red(`${packageName} is not installed.`));
             return;
@@ -25,9 +25,16 @@ export const uninstall: CommandModule = {
         console.log(`Uninstalling ${packageName} in ${chalk.green(PACKAGES_PATH)}...`);
         console.log(' ');
 
-        const install = spawn('rm', ['-rf', path.join(PACKAGES_PATH, packageName)], { stdio: 'inherit' });
+        const install = spawn(process.execPath, [YARN_PATH, 'remove', '--cwd', process.env.HOME, '--modules-folder', '.squid', packageName], { stdio: 'inherit' });
 
-        install.on('exit', () => {
+        install.on('message', (msg) => console.log(msg))
+        install.on('exit', (code) => {
+
+            if(code !== 0) {
+
+                console.log('Uninstallation failed!')
+                return;
+            }
 
             const config = getConfig();
             saveConfig({

cli/src/new/new.ts

@@ -6,6 +6,7 @@ import { javascriptThemeTemplate } from './templates/javascript-theme';
 import { javascriptPluginTemplate } from './templates/javascript-plugin';
 import { typescriptPluginTemplate } from './templates/typescript-plugin';
 import { typescriptThemeTemplate } from './templates/typescript-theme';
+import { YARN_PATH } from '../utils/utils';
 
 export type PackageType = 'Theme' | 'Plugin';
 export type Language = 'TypeScript' | 'JavaScript';
@@ -79,7 +80,7 @@ export const initializeProject = (name: string, path: string, useYarn: boolean,
     console.log(`Installing ${chalk.blue(packages.join(', '))}`);
     console.log(' ');
 
-    const install = spawn(useYarn ? 'yarn' : 'npm', useYarn ? ['add', '--cwd', projectPath, '-D', ...packages] : ['i', '--prefix', projectPath, '--dev', ...packages], { stdio: 'inherit' });
+    const install = spawn(process.execPath, [YARN_PATH, 'add', '--cwd', projectPath, '-D', ...packages], { stdio: 'inherit' });
 
     install.on('message', (msg) => console.log(msg))
     install.on('exit', () => {

cli/src/utils/utils.ts

@@ -9,3 +9,8 @@ export const resolveArgPath = (args: Arguments) => {
 
 export const isMac = process.platform === 'darwin';
 export const isWin = process.platform === 'win32';
+
+export const YARN_PATH = isMac ?
+    '/Applications/Squid.app/Contents/Resources/bin/yarn' : isWin ?
+    '' :
+    '';

cli/yarn.lock

@@ -134,13 +134,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -162,57 +155,18 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-installed-path@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/get-installed-path/-/get-installed-path-4.0.8.tgz#a4fee849f5f327c12c551bb37477acd5151e5f7d"
-  integrity sha512-PmANK1xElIHlHH2tXfOoTnSDUjX1X3GvKK6ZyLbUnSCCn1pADwu67eVWttuPzJWrXDDT2MfO6uAaKILOFfitmA==
-  dependencies:
-    global-modules "1.0.0"
-
-[email protected], global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
 iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 inquirer@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.0.0.tgz#957a46db1abcf0fdd2ab82deb7470e90afc7d0ac"
@@ -237,16 +191,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
 lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -279,24 +223,11 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-resolve-dir@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -402,13 +333,6 @@ typescript@^4.2.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
   integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
 
-which@^1.2.14:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "squid",
-  "version": "0.2.0-canary",
+  "version": "0.3.0-canary",
   "description": "The extendible Shell and SSH terminal, with E2E encryption in the cloud.",
   "author": {
     "email": "[email protected]",