juisy 2.0.0-beta.16 → 2.0.0-beta.18

package/bin/cli/cmds/index.js

@@ -3,13 +3,11 @@ import docs from './private/docs/index.js'
 // import test from './private/test.js'
 // Public commands
 import printGlobals from './public/print-globals.js'
-import squeeze from './public/squeeze.js'
 
 export const commands = [
   // Private
   docs,
   // test,
   // Public
-  printGlobals,
-  squeeze
+  printGlobals
 ]

package/bin/cli/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 'use strict'
 

package/dist/cli/Command.d.ts

@@ -46,7 +46,7 @@ export declare class Command implements CommandObject {
     /**
      * Command handler
      */
-    handler(this: this, argv: CommandHandlerArgs): void | Promise<void>;
+    handler(this: Command, argv: CommandHandlerArgs): void | Promise<void>;
     /**
      * Command middlewares
      */
@@ -73,7 +73,7 @@ export declare class Command implements CommandObject {
         deprecated: string | boolean | undefined;
         meta: Partial<import('./types').CommandMeta> | undefined;
         builder: (cli: CLIEngine) => CLIEngine | PromiseLike<CLIEngine>;
-        handler: OmitThisParameter<(this: this, argv: CommandHandlerArgs) => void | Promise<void>>;
+        handler: (argv: CommandHandlerArgs) => void | Promise<void>;
         middlewares: import('yargs').MiddlewareFunction[] | undefined;
     };
     /**

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.16
+ * juisy v2.0.0-beta.18
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.16
+ * juisy v2.0.0-beta.18
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/dist/templater/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.16
+ * juisy v2.0.0-beta.18
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/dist/vite/plugins/inject-css-variables/index.d.ts

@@ -5,7 +5,8 @@ export type Options = {
      */
     moduleId: string;
     /**
-     * The CSS selector. Default is `:root`
+     * The CSS selector.
+     * @default ':root'
      */
     selector?: string;
     /**

package/dist/vite/plugins/inject-css-variables/index.js

@@ -1,5 +1,5 @@
 /*!
- * juisy v2.0.0-beta.16
+ * juisy v2.0.0-beta.18
  * Copyright © 2022-Present Hervé Perchec
  */
 

package/dist/vite/plugins/inject-project-globals/index.d.ts

@@ -2,10 +2,11 @@ import { Plugin } from 'vite';
 export type Options = {
     /**
      * The virtual module ID
+     * @default 'virtual:project.globals.js'
      */
     moduleId?: string;
     /**
-     * The project globals path (relative form root folder)
+     * The project globals path (relative from root folder)
      */
     filePath?: string;
 };

package/dist/vite/plugins/inject-project-globals/index.js

@@ -1,11 +1,14 @@
 /*!
- * juisy v2.0.0-beta.16
+ * juisy v2.0.0-beta.18
  * Copyright © 2022-Present Hervé Perchec
  */
 
 import { getProjectGlobals } from 'juisy';
+import { OutputUtils } from 'juisy/cli';
 
 function injectProjectGlobals(options = {}) {
+  const { $style } = OutputUtils;
+  let config;
   let moduleId = "virtual:project.globals.js";
   if (options.moduleId) {
     if (options.moduleId.trim().length === 0) {
@@ -16,6 +19,9 @@ function injectProjectGlobals(options = {}) {
   return {
     name: "vite-plugin-inject-project-globals",
     enforce: "pre",
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+    },
     resolveId(id) {
       if (id !== moduleId) {
         return;
@@ -23,12 +29,28 @@ function injectProjectGlobals(options = {}) {
         return "\0" + moduleId;
       }
     },
+    /**
+     * Vite plugin `load` hook
+     * @param id - The requested module ID
+     * @returns The module content as a string
+     * @description
+     * Load the virtual module and return its content.
+     * If the module ID is not the one defined by the plugin, simply return null.
+     * Otherwise, call `getProjectGlobals` and build a js string.
+     */
     async load(id) {
       if (!id.startsWith("\0") || id.slice(1) !== moduleId) {
         return;
       }
-      const PROJECT_GLOBALS = await getProjectGlobals(options.filePath);
-      return "export default " + JSON.stringify(PROJECT_GLOBALS);
+      const PROJECT_GLOBALS = {
+        ...await getProjectGlobals(options.filePath)
+      };
+      if (PROJECT_GLOBALS.ENV) {
+        config.logger.warn("\n[vite-plugin-inject-project-globals] " + $style.yellow("The following ENV variables are exposed:"));
+        config.logger.warn(JSON.stringify(PROJECT_GLOBALS.ENV));
+        config.logger.warn("\n");
+      }
+      return "const PROJECT_GLOBALS = " + JSON.stringify(PROJECT_GLOBALS) + "\nconst isBrowser = import.meta.env.SSR === false\nif (isBrowser) {\n  if (PROJECT_GLOBALS.ENV) {\n    console.warn('[vite-plugin-inject-project-globals] WARNING: some ENV variables are exposed! Be careful, do not expose sensitive data!')\n  }\n}\nexport default PROJECT_GLOBALS\n";
     }
   };
 }

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "juisy",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "description": "Make you JavaScript (and/or TypeScript) project juicy!",
   "type": "module",
   "files": [
     "bin",
-    "dist"
+    "dist",
+    "LICENSE",
+    "README.md"
   ],
   "engines": {
     "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
@@ -118,6 +120,9 @@
     },
     "@release-it/conventional-changelog": {
       "optional": true
+    },
+    "simple-git-hooks": {
+      "optional": true
     }
   },
   "devDependencies": {

package/bin/cli/cmds/public/squeeze.js

@@ -1,269 +0,0 @@
-import path, { dirname } from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-import { getPackageInfo, eject } from '#juisy'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-
-const isDef = value => value !== undefined
-
-/** @type {import('#juisy/cli').Command} */
-export default new CLI.Command({
-  command: 'squeeze',
-  describe: 'Initialize project folder',
-  builder (yargs) {
-    yargs.option('f', {
-      alias: 'force',
-      type: 'boolean',
-      default: false,
-      describe: 'Overwrites existing files / scripts / ...'
-    })
-    return yargs
-  },
-  async handler (argv) {
-    const {
-      rootDir: targetProjectRootDir, // rootDir is parent project
-      prompts,
-      run
-    } = CLI.InterfaceUtils
-    const {
-      $style,
-      log,
-      step,
-      substep
-    } = CLI.OutputUtils
-
-    const templateDir = 'template'
-    const getTemplatePath = target => path.resolve(__dirname, '../../../', templateDir, target)
-
-    /**
-     * Eject files from template
-     */
-    step('Copying files')
-
-    await eject('**/*', {
-      force: argv.force,
-      logLevel: 'warn'
-    })
-
-    substep($style.green(`✔ Successfuly copied`), { last: true })
-    log() // Blank line
-
-    // substep($style.yellow('Target directory "bin" already exists. Skipped... Use --force option to overwrite'), { last: true })
-
-    /**
-     * Update package.json file
-     */
-    // const scripts = {
-    //   'docs:api':              'node ./bin/cli docs generate -c ./docs/docs.config.js',
-    //   'docs:readme':           'node ./bin/cli docs generate:readme',
-    //   'docs:lint':             'node ./bin/cli docs lint',
-    //   'docs:lint:fix':         'npm run docs:lint -- --fix',
-    //   'docs':                  'npm run docs:readme && npm run docs:api && npm run docs:lint',
-    //   'lint':                  'npx eslint . --ext .js',
-    //   'lint:fix':              'npm run lint -- --fix',
-    //   'lint:markdown':         'npm run docs:lint',
-    //   'lint:markdown:fix':     'npm run docs:lint:fix',
-    //   'release':               'node ./bin/cli release',
-    //   'changelog':             'node ./bin/cli changelog',
-    //   'git-hooks:reset':       'node ./bin/cli git-hooks reset',
-    //   'git-hooks:sync':        'node ./bin/cli git-hooks sync',
-    //   'test':                  'node ./bin/cli test',
-    //   'postinstall':           'npm run git-hooks:sync'
-    // }
-
-    const targetCliCommand = 'node ./bin/cli'
-
-    step('Adding scripts to package.json')
-    const packageJson = getPackageInfo()
-    packageJson.scripts = packageJson.scripts || {}
-
-    // "docs:api": "node ./bin/cli docs generate:api"
-    let setScript = isDef(packageJson.scripts['docs:api'])
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'docs:api', `${targetCliCommand} docs generate:api` ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "docs:api" successfuly added'))
-    } else {
-      substep($style.yellow('Script "docs:api" already set. Use --force option to overwrite'))
-    }
-
-    // "docs:readme": "node ./bin/cli docs generate:readme -c ./docs/readme/config.js"
-    setScript = isDef(packageJson.scripts['docs:readme'])
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [
-        'set-script',
-        'docs:readme',
-        `${targetCliCommand} docs generate:readme -c ./docs/readme/config.js`
-      ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "docs:readme" successfuly added'))
-    } else {
-      substep($style.yellow('Script "docs:readme" already set. Use --force option to overwrite'))
-    }
-
-    // "docs": "npm run docs:readme && npm run docs:api"
-    setScript = isDef(packageJson.scripts.docs)
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'docs', 'npm run docs:readme && npm run docs:api' ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "docs" successfuly added'))
-    } else {
-      substep($style.yellow('Script "docs" already set. Use --force option to overwrite'))
-    }
-
-    // "release": "node ./bin/cli release"
-    setScript = isDef(packageJson.scripts.release)
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'release', `${targetCliCommand} release` ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "release" successfuly added'))
-    } else {
-      substep($style.yellow('Script "release" already set. Use --force option to overwrite'))
-    }
-
-    // "changelog": "node ./bin/cli changelog"
-    setScript = isDef(packageJson.scripts.changelog)
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'changelog', `${targetCliCommand} changelog` ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "changelog" successfuly added'))
-    } else {
-      substep($style.yellow('Script "changelog" already set. Use --force option to overwrite'))
-    }
-
-    // "git-hooks:reset": "node ./bin/cli git-hooks reset"
-    setScript = isDef(packageJson.scripts['git-hooks:reset'])
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'git-hooks:reset', `${targetCliCommand} git-hooks reset` ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "git-hooks:reset" successfuly added'))
-    } else {
-      substep($style.yellow('Script "git-hooks:reset" already set. Use --force option to overwrite'))
-    }
-
-    // "git-hooks:sync": "node ./bin/cli git-hooks sync"
-    setScript = isDef(packageJson.scripts['git-hooks:sync'])
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'git-hooks:sync', `${targetCliCommand} git-hooks sync` ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "git-hooks:sync" successfuly added'))
-    } else {
-      substep($style.yellow('Script "git-hooks:sync" already set. Use --force option to overwrite'))
-    }
-
-    // "postinstall": "npm run git-hooks:sync"
-    setScript = isDef(packageJson.scripts.postinstall)
-      ? argv.force
-      : true
-    if (setScript) {
-      await run('npm', [ 'set-script', 'postinstall', 'npm run git-hooks:sync' ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Script "postinstall" successfuly added'))
-    } else {
-      substep($style.yellow('Script "postinstall" already set. Use --force option to overwrite'))
-    }
-    substep($style.green('✔ package.json updated'), { last: true })
-    log() // Blank line
-
-    // Adding repository info
-    step('Adding repository config to package.json')
-    // set repository config
-    const setRepository = isDef(packageJson.repository)
-      ? argv.force
-      : true
-    if (setRepository) {
-      const repositoryConfig = {
-        type: 'git',
-        url: 'https://gitlab.com/hperchec/juisy'
-      }
-      await run('npm', [
-        'pkg',
-        'set',
-        `repository=${JSON.stringify(repositoryConfig)}`,
-        '--json'
-      ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Repository config successfuly added'), { last: true })
-    } else {
-      substep($style.yellow('Repository config already set. Use --force option to overwrite'), { last: true })
-    }
-    log() // Blank line
-
-    // Adding issues URL info
-    step('Adding issues/bugs config to package.json')
-    // set bugs config
-    const setBugs = isDef(packageJson.bugs)
-      ? argv.force
-      : true
-    if (setBugs) {
-      const bugsConfig = {
-        url: 'https://gitlab.com/hperchec/juisy/issues'
-      }
-      await run('npm', [
-        'pkg',
-        'set',
-        `bugs=${JSON.stringify(bugsConfig)}`,
-        '--json'
-      ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Issues/bugs config successfuly added'), { last: true })
-    } else {
-      substep($style.yellow('Issues/bugs config already set. Use --force option to overwrite'), { last: true })
-    }
-    log() // Blank line
-
-    // Adding git hooks
-    step('Adding git hooks config to package.json')
-    // set simple-git-hook config
-    const setSimpleGitHook = isDef(packageJson['simple-git-hooks'])
-      ? argv.force
-      : true
-    if (setSimpleGitHook) {
-      const simpleGitHookConfig = {
-        'pre-commit': 'node ./bin/scripts/pre-commit.js',
-        'commit-msg': 'node ./bin/scripts/commit-msg.js ${1}'
-      }
-      await run('npm', [
-        'pkg',
-        'set',
-        `simple-git-hooks=${JSON.stringify(simpleGitHookConfig)}`,
-        '--json'
-      ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ Git hooks successfuly added'), { last: true })
-    } else {
-      substep($style.yellow('Git hooks already set. Use --force option to overwrite'), { last: true })
-    }
-    log() // Blank line
-
-    // Adding lint-staged configured
-    step('Adding lint-staged config to package.json')
-    // set lint-staged config
-    const setLintStaged = isDef(packageJson['lint-staged'])
-      ? argv.force
-      : true
-    if (setLintStaged) {
-      const lintStagedConfig = {
-        '*.js': [
-          'eslint --fix',
-          'git add'
-        ]
-      }
-      await run('npm', [
-        'pkg',
-        'set',
-        `lint-staged=${JSON.stringify(lintStagedConfig)}`,
-        '--json'
-      ], { stdio: 'pipe', cwd: targetProjectRootDir })
-      substep($style.green('✔ lint-staged successfuly configured'), { last: true })
-    } else {
-      substep($style.yellow('lint-staged already configured. Use --force option to overwrite'), { last: true })
-    }
-    log() // Blank line
-  }
-})