@vercel/hydrogen 1.3.1 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/index.js +17 -10
  2. package/package.json +5 -5
package/dist/index.js CHANGED
@@ -50,17 +50,24 @@ var build = async ({
50
50
  }
51
51
  const mountpoint = (0, import_path.dirname)(entrypoint);
52
52
  const entrypointDir = (0, import_path.join)(workPath, mountpoint);
53
+ const nodeVersion = await (0, import_build_utils.getNodeVersion)(
54
+ entrypointDir,
55
+ void 0,
56
+ config,
57
+ meta
58
+ );
59
+ const spawnOpts = (0, import_build_utils.getSpawnOptions)(meta, nodeVersion);
53
60
  const {
54
61
  cliType,
55
62
  lockfileVersion,
56
63
  packageJsonPackageManager,
57
64
  turboSupportsCorepackHome
58
65
  } = await (0, import_build_utils.scanParentDirs)(entrypointDir, true);
59
- const spawnEnv = (0, import_build_utils.getEnvForPackageManager)({
66
+ spawnOpts.env = (0, import_build_utils.getEnvForPackageManager)({
60
67
  cliType,
61
68
  lockfileVersion,
62
69
  packageJsonPackageManager,
63
- env: process.env,
70
+ env: spawnOpts.env || {},
64
71
  turboSupportsCorepackHome,
65
72
  projectCreatedAt: config.projectSettings?.createdAt
66
73
  });
@@ -68,7 +75,7 @@ var build = async ({
68
75
  if (installCommand.trim()) {
69
76
  console.log(`Running "install" command: \`${installCommand}\`...`);
70
77
  await (0, import_build_utils.execCommand)(installCommand, {
71
- env: spawnEnv,
78
+ ...spawnOpts,
72
79
  cwd: entrypointDir
73
80
  });
74
81
  } else {
@@ -78,7 +85,7 @@ var build = async ({
78
85
  await (0, import_build_utils.runNpmInstall)(
79
86
  entrypointDir,
80
87
  [],
81
- { env: spawnEnv },
88
+ spawnOpts,
82
89
  meta,
83
90
  config.projectSettings?.createdAt
84
91
  );
@@ -96,12 +103,12 @@ var build = async ({
96
103
  );
97
104
  await import_fs.promises.mkdir(edgeEntryDir, { recursive: true });
98
105
  await import_fs.promises.writeFile(edgeEntryDest, edgeEntryContents);
99
- spawnEnv.SHOPIFY_FLAG_BUILD_TARGET = "worker";
100
- spawnEnv.SHOPIFY_FLAG_BUILD_SSR_ENTRY = edgeEntryDest;
106
+ spawnOpts.env.SHOPIFY_FLAG_BUILD_TARGET = "worker";
107
+ spawnOpts.env.SHOPIFY_FLAG_BUILD_SSR_ENTRY = edgeEntryDest;
101
108
  if (buildCommand) {
102
109
  (0, import_build_utils.debug)(`Executing build command "${buildCommand}"`);
103
110
  await (0, import_build_utils.execCommand)(buildCommand, {
104
- env: spawnEnv,
111
+ ...spawnOpts,
105
112
  cwd: entrypointDir
106
113
  });
107
114
  } else {
@@ -113,7 +120,7 @@ var build = async ({
113
120
  await (0, import_build_utils.runPackageJsonScript)(
114
121
  entrypointDir,
115
122
  "vercel-build",
116
- { env: spawnEnv },
123
+ spawnOpts,
117
124
  config.projectSettings?.createdAt
118
125
  );
119
126
  } else if (hasScript("build", pkg)) {
@@ -121,12 +128,12 @@ var build = async ({
121
128
  await (0, import_build_utils.runPackageJsonScript)(
122
129
  entrypointDir,
123
130
  "build",
124
- { env: spawnEnv },
131
+ spawnOpts,
125
132
  config.projectSettings?.createdAt
126
133
  );
127
134
  } else {
128
135
  await (0, import_build_utils.execCommand)("shopify hydrogen build", {
129
- env: spawnEnv,
136
+ ...spawnOpts,
130
137
  cwd: entrypointDir
131
138
  });
132
139
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vercel/hydrogen",
3
- "version": "1.3.1",
3
+ "version": "1.3.3",
4
4
  "license": "Apache-2.0",
5
5
  "main": "./dist/index.js",
6
6
  "homepage": "https://vercel.com/docs",
@@ -14,16 +14,16 @@
14
14
  "edge-entry.js"
15
15
  ],
16
16
  "dependencies": {
17
- "@vercel/static-config": "3.1.2",
18
- "ts-morph": "12.0.0"
17
+ "ts-morph": "12.0.0",
18
+ "@vercel/static-config": "3.1.2"
19
19
  },
20
20
  "devDependencies": {
21
21
  "@types/jest": "27.5.1",
22
22
  "@types/node": "14.18.33",
23
- "@vercel/build-utils": "13.0.0",
24
23
  "execa": "3.2.0",
25
24
  "fs-extra": "11.1.0",
26
- "jest-junit": "16.0.0"
25
+ "jest-junit": "16.0.0",
26
+ "@vercel/build-utils": "13.2.3"
27
27
  },
28
28
  "scripts": {
29
29
  "build": "node ../../utils/build-builder.mjs",