Merge pull request #246 from devforth/improving-win-installation-speed

fix: update package.json template to use dynamic adminforth version a…

Author: SerVitasik

adminforth/commands/createApp/templates/package.json.hbs

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^1.34.0",
-    "adminforth": "latest",
+    "adminforth": "{{adminforthVersion}}",
     "express": "latest-4"
   },
   "devDependencies": {

adminforth/commands/createApp/utils.js

@@ -14,6 +14,15 @@ import { promisify } from 'util';
 
 const execAsync = promisify(exec);
 
+function detectAdminforthVersion() {
+  const userAgent = process.env.npm_config_user_agent || '';
+  if (userAgent.includes('adminforth@next')) {
+    return 'next'
+  };
+  return 'main'; 
+}
+
+
 export function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
     {
@@ -58,6 +67,7 @@ export async function promptForMissingOptions(options) {
       ...options,
       appName: options.appName || answers.appName,
       db: options.db || answers.db,
+      adminforthVersion: detectAdminforthVersion(),
   };
 }
 
@@ -203,7 +213,10 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: 'package.json.hbs',
       dest: 'package.json',
-      data: { appName },
+      data: { 
+        appName,
+        adminforthVersion: options.adminforthVersion || 'latest'
+       },
     },
     {
       src: 'index.ts.hbs',

adminforth/modules/codeInjector.ts

@@ -345,8 +345,8 @@ class CodeInjector implements ICodeInjector {
     await fsExtra.copy(spaDir, this.spaTmpPath(), {
       filter: (src) => {
         // /adminforth/* used for local development and /dist/* used for production
-        const filterPasses = !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist') 
-                          && !src.includes('/dist/spa/node_modules') && !src.includes('/dist/spa/dist');
+        const filterPasses = !src.includes(`${path.sep}adminforth${path.sep}spa${path.sep}node_modules`) && !src.includes(`${path.sep}adminforth${path.sep}spa${path.sep}dist`) 
+                          && !src.includes(`${path.sep}dist${path.sep}spa${path.sep}node_modules`) && !src.includes(`${path.sep}dist${path.sep}spa${path.sep}dist`);
         if (process.env.HEAVY_DEBUG && !filterPasses) {
           console.log('🪲⚙️ fsExtra.copy filtered out', src);
         }