lucy-cli 0.6.0 → 0.7.0

package/src/init.ts

@@ -7,6 +7,7 @@ import fs from 'fs/promises';
 import { spawnSync } from 'child_process';
 import path from 'path';
 import { ModuleSettings, ProjectSettings, blue, green, orange, red } from './index.js';
+import { gitInit, installPackages } from './helpers.js';
 
 /**
  * Init Lucy project
@@ -23,10 +24,10 @@ export async function init(moduleSettings: ModuleSettings, projectSettings: Proj
 
 	await copyFolder(join(moduleSettings.packageRoot, 'files'), moduleSettings.targetFolder);
 
-	await editJson(moduleSettings.packageJsonPath, ['type', 'scripts', 'wixLucy'], ['module', moduleSettings.settings.scripts, moduleSettings.settings.lucySettings ]);
+	await editJson(moduleSettings.packageJsonPath, ['type', 'scripts'], ['module', moduleSettings.settings.scripts ]);
 	await stringReplace(join(moduleSettings.targetFolder, 'currents.config.js'), ['__ProjectName__'], [path.basename(moduleSettings.targetFolder)]);
 
-	await installPackages( moduleSettings.settings.wixPackages, moduleSettings.settings.devPackages, moduleSettings.targetFolder);
+	await installPackages( moduleSettings.settings.wixPackages, moduleSettings.settings.devPackages, moduleSettings.targetFolder, moduleSettings.lockVersion);
 
 	await editJson(join(moduleSettings.targetFolder, 'jsconfig.json'), ['compilerOptions', 'exclude'], [moduleSettings.settings.wixSettings.compilerOptions, moduleSettings.settings.wixSettings.exclude]);
 	await editJson(join(moduleSettings.targetFolder, 'typedoc.json'), ['name'], [path.basename(moduleSettings.targetFolder)]);
@@ -126,55 +127,4 @@ async function stringReplace(filePath: string, keys: string[], values: string[])
 	} finally {
 		console.log(blue.underline(`🐕 => Updated file ${orange(filePath)}`));
 	}
-}
-
-async function installPackages(wixPackages: Record<string, string>, devPackages: Record<string, string>,  cwd: string) {
-
-	const wixPackageNames = Object.keys(wixPackages);
-
-	const devPackageNames = Object.keys(devPackages);
-	const devPackageVersions = Object.values(devPackages);
-	const devPackageNamesAndVersions = devPackageNames.map((name, index) => `${name}@${devPackageVersions[index]}`);
-
-	let success = true;
-	wixPackageNames.forEach((name, index) => {
-		console.log(`🐕 => Installing ${orange(name)}`);
-		const wixInstall = `wix install ${name}`;
-		const wixres = spawnSync(wixInstall, { shell: true, stdio: 'inherit' });
-		if (wixres.error) {
-			console.log((`💩 ${red.underline.bold("=> Failed to install package =>")} ${orange(wixres.error.message)}`));
-			success = false;
-		} else {
-			console.log("🐕" + blue.underline(` => Package installed!`));
-		}
-	});
-
-	const yarnAdd = `yarn add -D ${devPackageNamesAndVersions.join(' ')}`;
-	const yarnRes = spawnSync(yarnAdd, { shell: true, stdio: 'inherit' });
-	if (yarnRes.error) {
-		success = false;
-		console.log((`💩 ${red.underline.bold("=> Failed to install dev packages =>")} ${orange(yarnRes.error.message)}`));
-	}
-
-	if(success) {
-		await fs.writeFile(join(cwd, 'wixpkgs.json'), JSON.stringify(wixPackages, null, 2), 'utf8');
-		console.log("🐕" + blue.underline(` => All Packages installed!`));
-	} else {
-		console.log("🐕" + red.underline(` => Some packages failed to install!`));
-	}																
-}
-
-async function gitInit(cwd: string, modules: Record<string, string>) {
-	const git = simpleGit({ baseDir: cwd });
-	for (const [name, url] of Object.entries(modules)) {
-		console.log(chalk.green.underline.bold(`Cloning ${name}`));
-		try {
-			await git.submoduleAdd(url, name)
-		} catch (err) {
-			console.log((`💩 ${red.underline.bold("=> Command failed =>")} ${orange(err)}`));
-		} finally {	
-			console.log("🐕" + blue.underline(` => Cloned ${orange(name)}`));
-		}
-	}
-	console.log("🐶" + green.underline(' => All Modules cloned!'));
 }

package/src/prepare.ts

@@ -0,0 +1,23 @@
+import chalk from 'chalk';
+import { ModuleSettings, ProjectSettings, blue, green, orange, red } from './index.js';
+import { gitInit, installPackages } from './helpers.js';
+
+/**
+ * Init Lucy project
+ * @param {string} cwd Current working directory
+ * @param {string} packageRoot Package root directory
+ * @returns {void}
+ */
+export async function prepare(moduleSettings: ModuleSettings, projectSettings: ProjectSettings) {
+	
+	if(projectSettings.lucySettings?.initialized) {
+		console.log((`💩 ${red.underline.bold("=> This project is already initialized =>")} ${orange(moduleSettings.targetFolder)}`));
+		return;
+	}
+
+	await installPackages(moduleSettings.settings.wixPackages, moduleSettings.settings.devPackages, moduleSettings.targetFolder, moduleSettings.lockVersion);
+
+	await gitInit(moduleSettings.targetFolder, projectSettings?.lucySettings?.modules ? projectSettings?.lucySettings?.modules : moduleSettings.settings.modules);
+
+	console.log(chalk.greenBright.underline('🐶 => Initialization done!'));
+}

package/src/settings.json

@@ -1,97 +1,29 @@
 {
-  "modules": {
-    "lib": "git@github.com:Integral-Systems/lucy-lib.git"
-  },
+  "modules": {},
   "wixSettings": {
     "compilerOptions": {
       "composite": true,
       "noEmit": false,
-      "lib": [
-        "DOM"
-      ],
-      "jsx": "react"
+      "lib": [],
+      "jsx": "react-jsx"
     },
-    "exclude": [
-      "**/*.js"
-    ]
-  },
-  "lucySettings": {
-    "initialized": true
+    "exclude": ["**/*.js"]
   },
+  "initialized": false,
   "wixPackages": {
-    "@js-joda/core": "5.5.3",
-    "@js-joda/locale": "4.8.10",
-    "@js-joda/locale_de": "4.8.10",
-    "@js-joda/locale_en": "4.8.10",
-    "@js-joda/locale_fr": "4.8.10",
-    "@js-joda/locale_it": "4.8.10",
-    "@js-joda/timezone": "2.18.0",
-    "@react-pdf/renderer": "4.0.0",
-    "@wix/image": "1.96.0",
-    "@wix/velo-bind": "1.0.8",
-    "add": "^2.0.6",
-    "await-semaphore": "0.1.3",
-    "axios": "1.4.0",
-    "crypto-js": "4.1.1",
-    "uuid": "11.0.3",
-    "velo-sync": "^0.0.9",
-    "@legendapp/state": "beta",
-    "zod": "3.22.2",
-    "react": "18.2.0",
-    "react-dom": "18.1.0",
-    "react-transition-group": "4.4.5",
-    "mobx": "6.8.0",
-    "mobx-utils": "6.0.3",
-    "node-cache": "5.1.2",
-    "nodemailer": "6.9.3",
-    "payment": "2.3.0",
-    "merge-stream": "^2.0.0",
-    "i18next": "23.16.5",
-    "eventemitter3": "5.0.1",
-    "gsap": "3.11.4"
+    "@hey-api/openapi-ts": "0.55.1"
   },
   "devPackages": {
-    "@danpercic86/helpful-decorators": "^2.4.0",
-    "@styled/typescript-styled-plugin": "^1.0.1",
-    "@total-typescript/ts-reset": "0.6.1",
-    "@types/i18n": "^0.13.6",
-    "@types/jest": "^29.5.3",
-    "@types/node": "22.9.0",
-    "@types/nodemailer": "^6.4.10",
-    "@types/react": "^18.2.21",
-    "@typescript-eslint/eslint-plugin": "8.14.0",
-    "@typescript-eslint/parser": "8.14.0",
-    "@typescript-eslint/utils": "8.14.0",
-    "@wix/cli": "latest",
-    "@wix/eslint-plugin-cli": "latest",
-    "cypress": "13.15.2",
-    "cypress-cloud": "^1.9.3",
-    "esbuild": "0.24.0",
-    "eslint": "9.14.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "50.5.0",
-    "eslint-plugin-named-import-spacing": "^1.0.3",
-    "eslint-plugin-simple-import-sort": "12.1.1",
-    "helpful-decorators": "^2.1.0",
-    "jest": "^29.6.1",
-    "prettier": "^3.0.3",
-    "sass": "^1.65.1",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "tsx": "4.19.2",
-    "typedoc": "0.26.11",
-    "typedoc-theme-hierarchy": "5.0.3",
-    "typescript": "^5.1.6",
-    "typescript-eslint-language-service": "^5.0.5"
+    "@wix/cli": "1.1.50"
   },
   "scripts": {
     "postinstall": "wix sync-types",
     "wix:dev": "wix dev",
-    "dev": "gulp dev",
+    "dev": "lucy-cli dev",
     "lint": "eslint .",
     "docs": "typedoc --tsconfig typescript/tsconfig.json --skipErrorChecking",
-    "build": "gulp build-prod",
-    "fix-wix": "gulp fix-wix",
+    "build": "lucy-cli build-prod",
+    "fix-wix": "lucy-cli fix",
     "tsc": "tsc -p ./typescript/tsconfig.json --noEmit",
     "test": "jest --config jest.config.ts --passWithNoTests",
     "test:watch": "jest --config jest.config.ts --watch"

package/.drone/.drone.yml

@@ -1,156 +0,0 @@
-kind: pipeline
-type: docker
-name: Build-Pipeline
-
-steps:
-- name: Test-${DRONE_TAG}
-  image: node:18
-  commands:
-    - yarn install --ignore-scripts
-    - npx gulp fix-masterpage
-    - npx gulp fix-types
-    - yarn tsc
-    - yarn test
-    - yarn build
-  settings:
-    mtu: 1450
-  when:
-    ref:
-      include:
-      - refs/tags/*
-    branch:
-      exclude:
-      - main
-- name: push commit
-  image: appleboy/drone-git-push
-  settings:
-    remote_name: origin
-    commit: true
-    commit_message: Tests Passed - ${DRONE_COMMIT_MESSAGE}
-    branch: ${DRONE_BRANCH}
-  when:
-    status:
-    - success
-    ref:
-      include:
-      - refs/tags/*
-    branch:
-      exclude:
-      - main
-- name: Notify-via-Telegram
-  image: appleboy/drone-telegram
-  settings:
-    mtu: 1450
-    token:
-      from_secret: telegram_token
-    to: 
-      from_secret: telegram_default_groupe_id
-    message_file: .drone/telegram_prod_build.tpl
-  when:
-    status:
-    - failure
-    - success
-    ref:
-      include:
-      - refs/tags/*
-    branch:
-      exclude:
-      - main
-- name: Notify-via-Mail
-  image: drillster/drone-email
-  settings:
-    mtu: 1450
-    host: smtp.gmail.com
-    username:
-      from_secret: gmail_user
-    password:
-      from_secret: gmail_pass
-    from: admin@integralschweiz.org
-    recipients: []
-    recipients_only: true
-    body: file:///drone/src/.drone/mail_prod_build.hbs
-    when:
-      status: [ changed, failure, success ]
-  when:
-    status:
-    - failure
-    - success
-    ref:
-      include:
-      - refs/tags/*
-    branch:
-      exclude:
-      - main
-trigger:
-  event:
-  - tag
-############Production Deploy only##########
----
-kind: pipeline
-type: docker
-name: Deploy-Production
-
-steps:
-- name: Create-Pull-Request & Merge
-  image: registry.integral-systems.ch/integral-systems/alpine:github-client-alpine
-  environment:
-    GH_TOKEN:
-      from_secret: github_api_token
-  commands:
-    - gh pr create --base main --head dev --title "Automated Pull Request ${DRONE_TAG}" --body "This pull request is for version ${DRONE_TAG} with the commit message ${DRONE_COMMIT_MESSAGE}"
-    - PR_NUMBER=$(gh pr list --base main --head dev --json number --jq '.[0].number')
-    - gh pr merge "$PR_NUMBER" --auto --merge
-#############Notification###################
-- name: Notify-via-Telegram
-  image: appleboy/drone-telegram
-  settings:
-    mtu: 1450
-    token:
-      from_secret: telegram_token
-    to: 
-      from_secret: telegram_default_groupe_id
-    message_file: .drone/telegram_prod_deploy.tpl
-  when:
-    status:
-    - failure
-    - success
-- name: Notify-via-Mail
-  image: drillster/drone-email
-  settings:
-    mtu: 1450
-    host: smtp.gmail.com
-    username:
-      from_secret: gmail_user
-    password:
-      from_secret: gmail_pass
-    from: admin@integralschweiz.org
-    recipients: []
-    recipients_only: true
-    body: file:///drone/src/.drone/mail_prod_deploy.hbs
-    when:
-      status: [ changed, failure, success ]
-  when:
-    status:
-    - failure
-    - success
-# - name: Update-Rollbar-Deploy
-#   image: plugins/webhook
-#   settings:
-#     mtu: 1450
-#     urls: https://api.rollbar.com/api/1/deploy
-#     headers:
-#       - "X-Rollbar-Access-Token=675b85f9093e4099b89376f4a973bca8"
-#     template: |
-#       {
-#         "environment": "production",
-#         "revision": "{{build.commit}}",
-#         "rollbar_username": "{{build.author}}",
-#         "local_username": "{{build.author}}",
-#         "comment": "{{build.message}}",
-#         "status": "succeeded"
-#       }   
-trigger:
-  event:
-  - promote
-  target:
-  - production 

package/.drone/mail_prod_build.hbs

@@ -1,319 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-  <head>
-    <meta name="viewport"
-      content="width=device-width" />
-    <meta http-equiv="Content-Type"
-      content="text/html; charset=UTF-8" />
-    <style>
-      * {
-        margin: 0;
-        padding: 0;
-        font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
-        box-sizing: border-box;
-        font-size: 14px;
-      }
-
-      body {
-        -webkit-font-smoothing: antialiased;
-        -webkit-text-size-adjust: none;
-        width: 100% !important;
-        height: 100%;
-        line-height: 1.6;
-        background-color: #f6f6f6;
-      }
-
-      table td {
-        vertical-align: top;
-      }
-
-      .body-wrap {
-        background-color: #f6f6f6;
-        width: 100%;
-      }
-
-      .container {
-        display: block !important;
-        max-width: 600px !important;
-        margin: 0 auto !important;
-        /* makes it centered */
-        clear: both !important;
-      }
-
-      .content {
-        max-width: 600px;
-        margin: 0 auto;
-        display: block;
-        padding: 20px;
-      }
-
-      .main {
-        background: #fff;
-        border: 1px solid #e9e9e9;
-        border-radius: 3px;
-      }
-
-      .content-wrap {
-        padding: 20px;
-      }
-
-      .content-block {
-        padding: 0 0 20px;
-      }
-
-      .header {
-        width: 100%;
-        margin-bottom: 20px;
-      }
-
-      h1,
-      h2,
-      h3 {
-        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-        color: #000;
-        margin: 40px 0 0;
-        line-height: 1.2;
-        font-weight: 400;
-      }
-
-      h1 {
-        font-size: 32px;
-        font-weight: 500;
-      }
-
-      h2 {
-        font-size: 24px;
-      }
-
-      h3 {
-        font-size: 18px;
-      }
-
-      hr {
-        border: 1px solid #e9e9e9;
-        margin: 20px 0;
-        height: 1px;
-        padding: 0;
-      }
-
-      p,
-      ul,
-      ol {
-        margin-bottom: 10px;
-        font-weight: normal;
-      }
-
-      p li,
-      ul li,
-      ol li {
-        margin-left: 5px;
-        list-style-position: inside;
-      }
-
-      a {
-        color: #348eda;
-        text-decoration: underline;
-      }
-
-      .last {
-        margin-bottom: 0;
-      }
-
-      .first {
-        margin-top: 0;
-      }
-
-      .padding {
-        padding: 10px 0;
-      }
-
-      .aligncenter {
-        text-align: center;
-      }
-
-      .alignright {
-        text-align: right;
-      }
-
-      .alignleft {
-        text-align: left;
-      }
-
-      .clear {
-        clear: both;
-      }
-
-      .alert {
-        font-size: 16px;
-        color: #fff;
-        font-weight: 500;
-        padding: 20px;
-        text-align: center;
-        border-radius: 3px 3px 0 0;
-      }
-
-      .alert a {
-        color: #fff;
-        text-decoration: none;
-        font-weight: 500;
-        font-size: 16px;
-      }
-
-      .alert.alert-warning {
-        background: #ff9f00;
-      }
-
-      .alert.alert-bad {
-        background: #d0021b;
-      }
-
-      .alert.alert-good {
-        background: #68b90f;
-      }
-
-      @media only screen and (max-width: 640px) {
-
-        h1,
-        h2,
-        h3 {
-          font-weight: 600 !important;
-          margin: 20px 0 5px !important;
-        }
-
-        h1 {
-          font-size: 22px !important;
-        }
-
-        h2 {
-          font-size: 18px !important;
-        }
-
-        h3 {
-          font-size: 16px !important;
-        }
-
-        .container {
-          width: 100% !important;
-        }
-
-        .content,
-        .content-wrapper {
-          padding: 10px !important;
-        }
-      }
-    </style>
-  </head>
-
-  <body>
-    <table class="body-wrap">
-      <tr>
-        <td></td>
-        <td class="container"
-          width="600">
-          <div class="content">
-            <table class="main"
-              width="100%"
-              cellpadding="0"
-              cellspacing="0">
-              <tr>
-                {{#success build.status}}
-                  <td class="alert alert-good">
-                    <a href="{{ build.link }}">
-                      Successful Production-Build #{{ build.number }}
-                    </a>
-                  </td>
-                  {{else}}
-                    <td class="alert alert-bad">
-                      <a href="{{ build.link }}">
-                        Failed Production-Build #{{ build.number }}
-                      </a>
-                    </td>
-                {{/success}}
-              </tr>
-              <tr>
-                <td class="content-wrap">
-                  <table width="100%"
-                    cellpadding="0"
-                    cellspacing="0">
-                    <tr>
-                      <td>
-                        Repo:
-                      </td>
-                      <td>
-                        {{ repo.owner }}/{{ repo.name }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        Author:
-                      </td>
-                      <td>
-                        {{ commit.author.name }} ({{ commit.author.email }})
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        Branch:
-                      </td>
-                      <td>
-                        {{ commit.branch }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        Tag:
-                      </td>
-                      <td>
-                        {{ tag }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        Commit:
-                      </td>
-                      <td>
-                        {{ truncate commit.sha 8 }}
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        Started at:
-                      </td>
-                      <td>
-                        {{ datetime build.created "Mon Jan 2 15:04:05 MST 2006" "Local" }}
-                      </td>
-                    </tr>
-                    {{#success build.status}}
-                    <tr>
-                      <td>
-                        Deploy Build:
-                      </td>
-                      <td>
-                      drone build promote {{ repo.owner }}/{{ repo.name }} {{build.number}} production
-                      </td>
-                    </tr>
-                    {{/success}}
-                  </table>
-                  <hr>
-                  <table width="100%"
-                    cellpadding="0"
-                    cellspacing="0">
-                    <tr>
-                      <td>
-                        {{ commit.message }}
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </div>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </body>
-
-</html>