create-gasket-app 7.0.0-next.7 → 7.0.0-next.9

package/lib/scaffold/actions/load-preset.js

@@ -15,6 +15,7 @@ async function loadPresets(_, context) {
   const tmpDir = await mkdtemp(path.join(os.tmpdir(), `gasket-create-${context.appName}`));
   context.tmpDir = tmpDir;
 
+  const modPath = path.join(tmpDir, 'node_modules');
   const pkgManager = new gasketUtils.PackageManager({
     packageManager: context.packageManager,
     dest: tmpDir
@@ -25,17 +26,32 @@ async function loadPresets(_, context) {
     const parts = /@(\^[0-9]\.|[0-9]).+/.test(preset) && preset.split('@').filter(Boolean);
     const name = parts ? `@${parts[0]}` : preset;
     const version = parts ? `@${parts[1]}` : '@latest';
-    await pkgManager.exec(pkgVerb, [`${name}${version}`]);
-    // eslint-disable-next-line
-    const mod = await import(name);
-    return mod.default || mod;
+
+    try {
+      // Install the preset
+      await pkgManager.exec(pkgVerb, [`${name}${version}`]);
+      // Get the package file
+      const pkgFile = require(path.join(modPath, name, 'package.json'));
+      // Import the preset via the package file attrs, name and main
+      // We can't specify the cwd for the import, so we need to use the full path
+      // expects type:module & "main": "lib/fullpath.js"
+      const mod = await import(`${modPath}/${name}/${pkgFile.main}`);
+      return mod.default || mod;
+    } catch (err) {
+      throw new Error(`Failed to install preset ${name}${version}`);
+    }
   });
 
   const localPresets = context.localPresets.map(async localPresetPath => {
-    await pkgManager.exec(pkgVerb, [localPresetPath]);
-    const pkgFile = require(path.join(localPresetPath, 'package.json'));
-    const mod = await import(pkgFile.name);
-    return mod.default || mod;
+
+    try {
+      await pkgManager.exec(pkgVerb, [localPresetPath]);
+      const pkgFile = require(path.join(localPresetPath, 'package.json'));
+      const mod = await import(`${modPath}/${pkgFile.name}/${pkgFile.main}`);
+      return mod.default || mod;
+    } catch (err) {
+      throw new Error(`Failed to install local preset ${localPresetPath}`);
+    }
   });
 
   context.presets = await Promise.all([...remotePresets, ...localPresets]);

package/lib/scaffold/actions/setup-pkg.js

@@ -1,6 +1,9 @@
 import action from '../action-wrapper.js';
 import { ConfigBuilder } from '../config-builder.js';
 import { default as gasketUtils } from '@gasket/utils';
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const { dependencies } = require('../../../package.json');
 
 /**
  * Initializes the ConfigBuilder builder and adds to context.
@@ -18,6 +21,13 @@ async function setupPkg(gasket, context) {
     type: context.typescript ? 'commonjs' : 'module'
   }, { warnings });
 
+  // Add critical dependencies
+  pkg.add('dependencies', {
+    '@gasket/core': dependencies['@gasket/core'],
+    '@gasket/engine': dependencies['@gasket/engine'],
+    '@gasket/utils': dependencies['@gasket/utils']
+  });
+
   const pkgManager = new gasketUtils.PackageManager(context);
   Object.assign(context, { pkg, pkgManager });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-gasket-app",
-  "version": "7.0.0-next.7",
+  "version": "7.0.0-next.9",
   "description": "starter pack for creating a gasket app",
   "main": "lib",
   "bin": {
@@ -32,12 +32,11 @@
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/create-gasket-app",
   "dependencies": {
-    "@gasket/core": "^7.0.0-next.7",
-    "@gasket/engine": "^7.0.0-next.7",
-    "@gasket/plugin-git": "^7.0.0-next.7",
-    "@gasket/plugin-logger": "^7.0.0-next.7",
-    "@gasket/plugin-start": "^7.0.0-next.7",
-    "@gasket/utils": "^7.0.0-next.7",
+    "@gasket/core": "^7.0.0-next.9",
+    "@gasket/engine": "^7.0.0-next.9",
+    "@gasket/plugin-git": "^7.0.0-next.9",
+    "@gasket/plugin-logger": "^7.0.0-next.9",
+    "@gasket/utils": "^7.0.0-next.9",
     "commander": "^12.0.0",
     "deepmerge": "^4.3.1",
     "glob": "^8.1.0",
@@ -80,5 +79,5 @@
   "jest": {
     "transform": {}
   },
-  "gitHead": "de14ea652e392f002c291d1e441ccf836f5fddb2"
+  "gitHead": "d993b3d02586581fee56576d860eb2a8393e601c"
 }