react-creates - npm Package Compare versions

Comparing version 2.1.2 to 2.1.3

dist/commands/create-component.js

@@ -12,2 +12,3 @@ "use strict";
 const file_system_cache_1 = require("../file-system-cache");
+const fetch_template_1 = require("../fetch-template");
 function createComponentCommand() {
@@ -27,40 +28,47 @@ let optionsCache;
         .option('--fresh', 'Will not use cache')
-        .action((name, options) => (0, core_1.createComponent)({ name, ...options }, {
-        fileSystem: node_1.nodeFs,
-        logger: console,
-        templateDirectory: node_1.nodeFs.join(node_1.nodeFs.dirname(require.resolve('react-creates/package.json')), 'templates', 'component'),
-        onFinished({ name: _name, directory: _directory, ...resolvedOptions }) {
-            if (optionsCache && !options.fresh && !options.yes) {
-                for (const [key, value] of Object.entries(resolvedOptions)) {
+        .option('--templatesDirectory <string>', 'Target root directory for templates to be stored locally')
+        .action((name, options) => {
+        const { templatesDirectory } = options;
+        return (0, core_1.createComponent)({ name, ...options }, {
+            fileSystem: node_1.nodeFs,
+            logger: console,
+            async getTemplateDirectory({ language, type }) {
+                const { targetTemplateDirectory } = await (0, fetch_template_1.fetchTemplate)(['component', language, type], templatesDirectory);
+                return targetTemplateDirectory;
+            },
+            onFinished({ name: _name, directory: _directory, ...resolvedOptions }) {
+                if (optionsCache && !options.fresh && !options.yes) {
+                    for (const [key, value] of Object.entries(resolvedOptions)) {
+                        optionsCache.set(key, value);
+                    }
+                }
+            },
+            async resolveProperty(key) {
+                if (options.yes) {
+                    return;
+                }
+                if (!optionsCache) {
+                    optionsCache = file_system_cache_1.FileSystemCache.create({ fileSystem: node_1.nodeFs, rootDir: options.directory });
+                }
+                if (!options.fresh && optionsCache.has(key)) {
+                    return optionsCache.get(key);
+                }
+                if (!(key === 'style' || key === 'language' || key === 'type')) {
+                    return;
+                }
+                const values = [...core_1.createComponentProperties[key]];
+                const response = await (0, prompts_1.default)({
+                    type: 'select',
+                    name: key,
+                    message: `Select component ${key}:`,
+                    choices: values.map((value) => ({ title: value.toString(), value })),
+                });
+                const value = response[key];
+                if (!options.fresh) {
                     optionsCache.set(key, value);
                 }
-            }
-        },
-        async resolveProperty(key) {
-            if (options.yes) {
-                return;
-            }
-            if (!optionsCache) {
-                optionsCache = file_system_cache_1.FileSystemCache.create({ fileSystem: node_1.nodeFs, rootDir: options.directory });
-            }
-            if (!options.fresh && optionsCache.has(key)) {
-                return optionsCache.get(key);
-            }
-            if (!(key === 'style' || key === 'language' || key === 'type')) {
-                return;
-            }
-            const values = [...core_1.createComponentProperties[key]];
-            const response = await (0, prompts_1.default)({
-                type: 'select',
-                name: key,
-                message: `Select component ${key}:`,
-                choices: values.map((value) => ({ title: value.toString(), value })),
-            });
-            const value = response[key];
-            if (!options.fresh) {
-                optionsCache.set(key, value);
-            }
-            return value;
-        },
-    }));
+                return value;
+            },
+        });
+    });
 }
@@ -67,0 +75,0 @@ exports.createComponentCommand = createComponentCommand;

dist/file-system-cache.d.ts

@@ -11,3 +11,3 @@ import type { IFileSystem } from '@file-services/types';
     static create({ fileSystem, rootDir }?: FileSystemCacheOptions): FileSystemCache;
-    static getCachePath({ fileSystem, rootDir }?: FileSystemCacheOptions): string;
+    static getCacheRootPath({ rootDir }?: FileSystemCacheOptions): string;
     static delete({ fileSystem, rootDir }?: FileSystemCacheOptions): boolean;
@@ -14,0 +14,0 @@ private constructor();

dist/file-system-cache.js

@@ -15,18 +15,14 @@ "use strict";
     static create({ fileSystem = node_1.nodeFs, rootDir = process.cwd() } = {}) {
-        return new this(fileSystem, FileSystemCache.getCachePath({ fileSystem, rootDir }));
+        return new this(fileSystem, fileSystem.join(FileSystemCache.getCacheRootPath({ rootDir }), 'cache.json'));
     }
-    static getCachePath({ fileSystem = node_1.nodeFs, rootDir = process.cwd() } = {}) {
-        const packageJsonPath = fileSystem.findClosestFileSync(rootDir, 'package.json');
-        if (!packageJsonPath) {
-            throw new Error('Could not find package.json');
-        }
+    static getCacheRootPath({ rootDir = process.cwd() } = {}) {
         const cachePathDir = (0, find_cache_dir_1.default)({
-            name: fileSystem.join('react-creates', packageJsonPath),
+            name: 'react-creates',
             create: true,
             cwd: rootDir,
         });
-        return fileSystem.join(cachePathDir, 'cache.json');
+        return cachePathDir;
     }
     static delete({ fileSystem = node_1.nodeFs, rootDir = process.cwd() } = {}) {
-        const cachePath = FileSystemCache.getCachePath({ fileSystem, rootDir });
+        const cachePath = FileSystemCache.getCacheRootPath({ rootDir });
         if (fileSystem.existsSync(cachePath)) {
@@ -33,0 +29,0 @@ fileSystem.unlinkSync(cachePath);

package.json

 {
   "name": "react-creates",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "React creates for you useful and common tools that adapt themselves to your project for faster and easier development",
@@ -9,4 +9,3 @@ "files": [
     "!dist/tsconfig.tsbuildinfo",
-    "src",
-    "templates"
+    "src"
   ],
@@ -39,8 +38,9 @@ "types": "dist/index.d.ts",
   "dependencies": {
-    "@file-services/node": "^6.0.0",
-    "@file-services/types": "^6.0.0",
+    "@file-services/node": "^7.0.1",
+    "@file-services/types": "^7.0.1",
+    "@react-creates/core": "^2.1.3",
     "@types/find-cache-dir": "^3.2.1",
     "@types/prompts": "^2.0.14",
-    "@react-creates/core": "^2.1.1",
-    "commander": "^9.3.0",
+    "commander": "^9.4.1",
+    "degit": "^2.8.4",
     "find-cache-dir": "^3.3.2",
@@ -47,0 +47,0 @@ "prompts": "^2.4.2"

src/commands/create-component.ts

@@ -13,2 +13,3 @@ import { nodeFs } from '@file-services/node';
 import { FileSystemCache } from '../file-system-cache';
+import { fetchTemplate } from '../fetch-template';
 
@@ -29,4 +30,6 @@ export function createComponentCommand() {
     .option('--fresh', 'Will not use cache')
-    .action((name, options) =>
-      createComponent(
+    .option('--templatesDirectory <string>', 'Target root directory for templates to be stored locally')
+    .action((name, options) => {
+      const { templatesDirectory } = options;
+      return createComponent(
         { name, ...options },
@@ -36,7 +39,7 @@ {
           logger: console,
-          templateDirectory: nodeFs.join(
-            nodeFs.dirname(require.resolve('react-creates/package.json')),
-            'templates',
-            'component'
-          ),
+          async getTemplateDirectory({ language, type }) {
+            const { targetTemplateDirectory } = await fetchTemplate(['component', language, type], templatesDirectory);
+
+            return targetTemplateDirectory;
+          },
           onFinished({ name: _name, directory: _directory, ...resolvedOptions }) {
@@ -83,4 +86,4 @@ if (optionsCache && !options.fresh && !options.yes) {
         }
-      )
-    );
+      );
+    });
 }
@@ -87,0 +90,0 @@

src/file-system-cache.ts

@@ -13,14 +13,8 @@ import { nodeFs } from '@file-services/node';
   static create({ fileSystem = nodeFs, rootDir = process.cwd() }: FileSystemCacheOptions = {}) {
-    return new this(fileSystem, FileSystemCache.getCachePath({ fileSystem, rootDir }));
+    return new this(fileSystem, fileSystem.join(FileSystemCache.getCacheRootPath({ rootDir }), 'cache.json'));
   }
 
-  static getCachePath({ fileSystem = nodeFs, rootDir = process.cwd() }: FileSystemCacheOptions = {}) {
-    const packageJsonPath = fileSystem.findClosestFileSync(rootDir, 'package.json');
-
-    if (!packageJsonPath) {
-      throw new Error('Could not find package.json');
-    }
-
+  static getCacheRootPath({ rootDir = process.cwd() }: FileSystemCacheOptions = {}) {
     const cachePathDir = findCacheDir({
-      name: fileSystem.join('react-creates', packageJsonPath),
+      name: 'react-creates',
       create: true,
@@ -30,7 +24,7 @@ cwd: rootDir,
 
-    return fileSystem.join(cachePathDir, 'cache.json');
+    return cachePathDir;
   }
 
   static delete({ fileSystem = nodeFs, rootDir = process.cwd() }: FileSystemCacheOptions = {}) {
-    const cachePath = FileSystemCache.getCachePath({ fileSystem, rootDir });
+    const cachePath = FileSystemCache.getCacheRootPath({ rootDir });
 
@@ -37,0 +31,0 @@ if (fileSystem.existsSync(cachePath)) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Shell access

Supply chain risk

This module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

35111

increased by1.5%

Lines of code

469

increased by10.09%

Worsened metrics

Dependency count

9

increased by12.5%

Number of package files

34

decreased by-24.44%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addeddegit@^2.8.4

• + Added@file-services/node@7.4.0(transitive)

• + Added@file-services/utils@7.4.0(transitive)

• + Addeddegit@2.8.4(transitive)

• - Removed@file-services/node@6.0.0(transitive)

• - Removed@file-services/types@6.0.0(transitive)

• - Removed@file-services/utils@6.0.0(transitive)

• Updated@file-services/node@^7.0.1

• Updated@file-services/types@^7.0.1

• Updated@react-creates/core@^2.1.3

• Updatedcommander@^9.4.1