@cocreate/cli 1.23.0 → 1.25.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.25.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.24.0...v1.25.0) (2023-04-24)
+
+
+### Features
+
+* removed dev dependencies, run link.js during install.js ([14fe135](https://github.com/CoCreate-app/CoCreate-cli/commit/14fe135578205e840127e76062e8b27c28d14553))
+
+# [1.24.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.23.0...v1.24.0) (2023-04-23)
+
+
+### Features
+
+* default server is removed and replaced with main server, deleteServer removes from enabled and available ([5fed172](https://github.com/CoCreate-app/CoCreate-cli/commit/5fed172e7f2d48b413ef5a74d9ddfaf9313db066))
+
 # [1.23.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.22.0...v1.23.0) (2023-04-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.23.0",
+  "version": "1.25.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
@@ -58,26 +58,11 @@
   "bin": {
     "coc": "src/coc.js"
   },
-  "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "babel-loader": "^8.1.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "file-loader": "^6.2.0",
-    "mini-css-extract-plugin": "^1.5.0",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.1.1",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^5.24.4",
-    "webpack-cli": "^4.5.0",
-    "webpack-log": "^3.0.1"
-  },
   "dependencies": {
     "@cocreate/docs": "^1.6.5",
     "@cocreate/hosting": "^1.8.5",
     "colors": "latest",
     "glob": "^7.1.7",
-    "got": "latest",
     "prettier": "^2.3.2",
     "prompt": "^1.2.0"
   }

package/src/commands/install.js

@@ -12,6 +12,11 @@ module.exports = async function(repos, args) {
         let symlinkFailed = await require('./symlink.js')(repos, args)
         if (symlinkFailed)
            failed.push(symlinkFailed)
+        
+        let linkFailed = await require('./link.js')(repos, args)
+        if (linkFailed)
+            failed.push(linkFailed)
+   
     } catch (err) {
         console.error(err);
         failed.push({ name: 'general', des: err.message })

package/src/commands/link.js

@@ -1,7 +1,7 @@
 const spawn = require('../spawn');
 const colors = require('colors');
 
-module.exports = async function linkPackages(repos, repoList) {
+module.exports = async function linkPackages(repos, args) {
     const failed = [], isLinked = {};
 
     try {
@@ -11,10 +11,9 @@ module.exports = async function linkPackages(repos, repoList) {
                 continue
 
             console.log(repo.packageName, 'configuring ...')
-            if (!repoList)
-                repoList = repos
-            await doLink(repo.deps, repo, repoList, failed, isLinked)
-            await doLink(repo.devDeps, repo, repoList, failed, isLinked)
+            
+            await doLink(repo.deps, repo, repos, failed, isLinked)
+            await doLink(repo.devDeps, repo, repos, failed, isLinked)
         }
     }
     catch (err) {

package/src/commands/other/nginxConfigManager.js

@@ -78,13 +78,45 @@ server {
         let test = await exec(`sudo nginx -t`);
         if (test.stderr.includes('test is successful')) {
             await exec(`sudo systemctl reload nginx`);
-            console.log('test passed reloading nginx', host)
+            console.log(host, 'test passed reloading nginx')
             response[host] = true
         } else {
-            console.log('test failed', host)
+            console.log(host, 'test failed')
             response[host] = false
         }
     }
+
+
+    if (!fs.existsSync(`${enabled}main`)) {
+        let main = `server {
+            listen 80 default_server;
+            listen [::]:80 default_server;
+        
+        
+            server_name _;
+            return 301 https://$host$request_uri;
+        }`
+        
+        fs.writeFileSync(`${available}main`, main)
+        await exec(`sudo ln -s ${available}main ${enabled}`);
+
+        if (fs.existsSync(`${enabled}default`))
+            fs.unlinkSync(`${enabled}default`)
+        if (fs.existsSync(`${available}default`))
+            fs.unlinkSync(`${available}default`)
+        
+        let test = await exec(`sudo nginx -t`);
+        if (test.stderr.includes('test is successful')) {
+            await exec(`sudo systemctl reload nginx`);
+            console.log('main test passed reloading nginx')
+            response['main'] = true
+        } else {
+            console.log('main test failed')
+            response['main'] = false
+        }
+    
+    }
+
     return response
 }
 
@@ -93,13 +125,14 @@ async function deleteServer(hosts) {
     if (!Array.isArray(hosts))
         hosts = [hosts]
     for (let host of hosts) {
-        fs.unlinkSync(`${available}${host}`)
+        if (fs.existsSync(`${enabled}${host}`))
+            fs.unlinkSync(`${enabled}${host}`)
+        if (fs.existsSync(`${available}${host}`))
+            fs.unlinkSync(`${available}${host}`)
+            
         response[host] = true
     }
     return response
 }
 
-// createServer(['cocreate.app'])
-// deleteServer(['cocreate.app'])
-
 module.exports = {createServer, deleteServer}

package/src/commands/symlink.js

@@ -99,9 +99,7 @@ async function install(repo, repos) {
             })
             console.error(`${repo.name}: ${repo.packageManager} install failed`.red)
         } else {
-            let linkFailed = await require('./link.js')([repo], repos)
-            if (linkFailed)
-                failed.push(linkFailed)
+            console.log(`${repo.name}: ${repo.packageManager} install succesful`.green)
 
         }