@vercel/remix-builder 1.8.18 → 1.9.1
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.
- package/dist/build.js +32 -46
- package/dist/build.js.map +1 -1
- package/dist/prepare-cache.js +4 -1
- package/dist/prepare-cache.js.map +1 -1
- package/dist/utils.d.ts +7 -3
- package/dist/utils.js +64 -9
- package/dist/utils.js.map +1 -1
- package/package.json +2 -2
package/dist/build.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.build = void 0;
|
|
7
4
|
const ts_morph_1 = require("ts-morph");
|
|
@@ -11,14 +8,18 @@ const build_utils_1 = require("@vercel/build-utils");
|
|
|
11
8
|
const static_config_1 = require("@vercel/static-config");
|
|
12
9
|
const nft_1 = require("@vercel/nft");
|
|
13
10
|
const utils_1 = require("./utils");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const REMIX_RUN_DEV_PATH = (0, path_1.dirname)(_require.resolve('@remix-run/dev/package.json'));
|
|
11
|
+
const remixBuilderPkg = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../package.json'), 'utf8'));
|
|
12
|
+
const remixRunDevForkVersion = remixBuilderPkg.devDependencies['@remix-run/dev'];
|
|
17
13
|
const DEFAULTS_PATH = (0, path_1.join)(__dirname, '../defaults');
|
|
18
14
|
const edgeServerSrcPromise = fs_1.promises.readFile((0, path_1.join)(DEFAULTS_PATH, 'server-edge.mjs'), 'utf-8');
|
|
19
15
|
const nodeServerSrcPromise = fs_1.promises.readFile((0, path_1.join)(DEFAULTS_PATH, 'server-node.mjs'), 'utf-8');
|
|
20
|
-
//
|
|
21
|
-
const
|
|
16
|
+
// Minimum supported version of the `@vercel/remix` package
|
|
17
|
+
const VERCEL_REMIX_MIN_VERSION = '1.10.0';
|
|
18
|
+
// Minimum supported version of the `@vercel/remix-run-dev` forked compiler
|
|
19
|
+
const REMIX_RUN_DEV_MIN_VERSION = '1.15.0';
|
|
20
|
+
// Maximum version of `@vercel/remix-run-dev` fork
|
|
21
|
+
// (and also `@vercel/remix` since they get published at the same time)
|
|
22
|
+
const REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(remixRunDevForkVersion.lastIndexOf('@') + 1);
|
|
22
23
|
const build = async ({ entrypoint, files, workPath, repoRootPath, config, meta = {}, }) => {
|
|
23
24
|
const { installCommand, buildCommand } = config;
|
|
24
25
|
await (0, build_utils_1.download)(files, workPath, meta);
|
|
@@ -60,10 +61,16 @@ const build = async ({ entrypoint, files, workPath, repoRootPath, config, meta =
|
|
|
60
61
|
// Determine the version of Remix based on the `@remix-run/dev`
|
|
61
62
|
// package version.
|
|
62
63
|
const remixRunDevPath = await (0, utils_1.ensureResolvable)(entrypointFsDirname, repoRootPath, '@remix-run/dev');
|
|
63
|
-
const
|
|
64
|
-
const
|
|
64
|
+
const remixRunDevPkg = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(remixRunDevPath, 'package.json'), 'utf8'));
|
|
65
|
+
const remixVersion = remixRunDevPkg.version;
|
|
66
|
+
const remixConfig = await (0, utils_1.chdirAndReadConfig)(remixRunDevPath, entrypointFsDirname, packageJsonPath);
|
|
65
67
|
const { serverEntryPoint, appDirectory } = remixConfig;
|
|
66
68
|
const remixRoutes = Object.values(remixConfig.routes);
|
|
69
|
+
const depsToAdd = [];
|
|
70
|
+
if (remixRunDevPkg.name !== '@vercel/remix-run-dev') {
|
|
71
|
+
const remixDevForkVersion = (0, utils_1.resolveSemverMinMax)(REMIX_RUN_DEV_MIN_VERSION, REMIX_RUN_DEV_MAX_VERSION, remixVersion);
|
|
72
|
+
depsToAdd.push(`@remix-run/dev@npm:@vercel/remix-run-dev@${remixDevForkVersion}`);
|
|
73
|
+
}
|
|
67
74
|
// `app/entry.server.tsx` and `app/entry.client.tsx` are optional in Remix,
|
|
68
75
|
// so if either of those files are missing then add our own versions.
|
|
69
76
|
const userEntryServerFile = (0, utils_1.findEntry)(appDirectory, 'entry.server');
|
|
@@ -71,29 +78,21 @@ const build = async ({ entrypoint, files, workPath, repoRootPath, config, meta =
|
|
|
71
78
|
await fs_1.promises.copyFile((0, path_1.join)(DEFAULTS_PATH, 'entry.server.jsx'), (0, path_1.join)(appDirectory, 'entry.server.jsx'));
|
|
72
79
|
if (!pkg.dependencies['@vercel/remix']) {
|
|
73
80
|
// Dependency version resolution logic
|
|
74
|
-
// 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of
|
|
75
|
-
// 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the
|
|
76
|
-
//
|
|
77
|
-
//
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
// Prevent frozen lockfile rejections
|
|
82
|
-
const envForAddDep = { ...spawnOpts.env };
|
|
83
|
-
delete envForAddDep.CI;
|
|
84
|
-
delete envForAddDep.VERCEL;
|
|
85
|
-
delete envForAddDep.NOW_BUILDER;
|
|
86
|
-
await (0, utils_1.addDependency)(cliType, [
|
|
87
|
-
`@vercel/remix@${semver_1.default.gt(usersRemixVersion, require('@remix-run/dev/package.json').version)
|
|
88
|
-
? 'latest'
|
|
89
|
-
: usersRemixVersion}`,
|
|
90
|
-
], {
|
|
91
|
-
...spawnOpts,
|
|
92
|
-
env: envForAddDep,
|
|
93
|
-
cwd: entrypointFsDirname,
|
|
94
|
-
});
|
|
81
|
+
// 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of `@vercel/remix`.
|
|
82
|
+
// 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the known max
|
|
83
|
+
// published version) -> we install the (matching) 1.11.0 version of `@vercel/remix`.
|
|
84
|
+
// 3. Users app is on something greater than our latest version of the fork -> we install
|
|
85
|
+
// the latest known published version of `@vercel/remix`.
|
|
86
|
+
const vercelRemixVersion = (0, utils_1.resolveSemverMinMax)(VERCEL_REMIX_MIN_VERSION, REMIX_RUN_DEV_MAX_VERSION, remixVersion);
|
|
87
|
+
depsToAdd.push(`@vercel/remix@${vercelRemixVersion}`);
|
|
95
88
|
}
|
|
96
89
|
}
|
|
90
|
+
if (depsToAdd.length) {
|
|
91
|
+
await (0, utils_1.addDependencies)(cliType, depsToAdd, {
|
|
92
|
+
...spawnOpts,
|
|
93
|
+
cwd: entrypointFsDirname,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
97
96
|
const userEntryClientFile = (0, utils_1.findEntry)(remixConfig.appDirectory, 'entry.client');
|
|
98
97
|
if (!userEntryClientFile) {
|
|
99
98
|
await fs_1.promises.copyFile((0, path_1.join)(DEFAULTS_PATH, 'entry.client.react.jsx'), (0, path_1.join)(appDirectory, 'entry.client.jsx'));
|
|
@@ -103,9 +102,6 @@ const build = async ({ entrypoint, files, workPath, repoRootPath, config, meta =
|
|
|
103
102
|
const renamedRemixConfigPath = remixConfigPath
|
|
104
103
|
? `${remixConfigPath}.original${(0, path_1.extname)(remixConfigPath)}`
|
|
105
104
|
: undefined;
|
|
106
|
-
const backupRemixRunDevPath = `${remixRunDevPath}.__vercel_backup`;
|
|
107
|
-
await fs_1.promises.rename(remixRunDevPath, backupRemixRunDevPath);
|
|
108
|
-
await fs_1.promises.symlink(REMIX_RUN_DEV_PATH, remixRunDevPath);
|
|
109
105
|
// These get populated inside the try/catch below
|
|
110
106
|
let serverBundles;
|
|
111
107
|
const serverBundlesMap = new Map();
|
|
@@ -151,16 +147,9 @@ const build = async ({ entrypoint, files, workPath, repoRootPath, config, meta =
|
|
|
151
147
|
// for a build that works on either Node.js or the Edge runtime
|
|
152
148
|
if (remixConfigPath && renamedRemixConfigPath) {
|
|
153
149
|
await fs_1.promises.rename(remixConfigPath, renamedRemixConfigPath);
|
|
154
|
-
// Figure out if the `remix.config` file is using ESM syntax
|
|
155
|
-
let isESM = false;
|
|
156
|
-
try {
|
|
157
|
-
_require(renamedRemixConfigPath);
|
|
158
|
-
}
|
|
159
|
-
catch (err) {
|
|
160
|
-
isESM = err.code === 'ERR_REQUIRE_ESM';
|
|
161
|
-
}
|
|
162
150
|
let patchedConfig;
|
|
163
|
-
if
|
|
151
|
+
// Figure out if the `remix.config` file is using ESM syntax
|
|
152
|
+
if ((0, utils_1.isESM)(renamedRemixConfigPath)) {
|
|
164
153
|
patchedConfig = `import config from './${(0, path_1.basename)(renamedRemixConfigPath)}';
|
|
165
154
|
config.serverBuildTarget = undefined;
|
|
166
155
|
config.serverModuleFormat = 'cjs';
|
|
@@ -213,9 +202,6 @@ module.exports = config;`;
|
|
|
213
202
|
if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
|
|
214
203
|
await fs_1.promises.rename(renamedRemixConfigPath, remixConfigPath);
|
|
215
204
|
}
|
|
216
|
-
// Remove `@remix-run/dev` symlink
|
|
217
|
-
await fs_1.promises.unlink(remixRunDevPath);
|
|
218
|
-
await fs_1.promises.rename(backupRemixRunDevPath, remixRunDevPath);
|
|
219
205
|
}
|
|
220
206
|
// This needs to happen before we run NFT to create the Node/Edge functions
|
|
221
207
|
await Promise.all([
|
package/dist/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
|
package/dist/prepare-cache.js
CHANGED
|
@@ -9,7 +9,10 @@ const prepareCache = async ({ entrypoint, repoRootPath, workPath, }) => {
|
|
|
9
9
|
const mountpoint = (0, path_1.dirname)(entrypoint);
|
|
10
10
|
const entrypointFsDirname = (0, path_1.join)(workPath, mountpoint);
|
|
11
11
|
const packageJsonPath = (0, path_1.join)(entrypointFsDirname, 'package.json');
|
|
12
|
-
const
|
|
12
|
+
const remixRunDevPath = (0, path_1.dirname)(utils_1._require.resolve('@remix-run/dev/package.json', {
|
|
13
|
+
paths: [entrypointFsDirname],
|
|
14
|
+
}));
|
|
15
|
+
const remixConfig = await (0, utils_1.chdirAndReadConfig)(remixRunDevPath, entrypointFsDirname, packageJsonPath);
|
|
13
16
|
const [nodeModulesFiles, cacheDirFiles] = await Promise.all([
|
|
14
17
|
// Cache `node_modules`
|
|
15
18
|
(0, build_utils_1.glob)('**/node_modules/**', root),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-cache.js","sourceRoot":"","sources":["../src/prepare-cache.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,+BAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"prepare-cache.js","sourceRoot":"","sources":["../src/prepare-cache.ts"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,+BAA+C;AAC/C,mCAAuD;AAGhD,MAAM,YAAY,GAAiB,KAAK,EAAE,EAC/C,UAAU,EACV,YAAY,EACZ,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,YAAY,IAAI,QAAQ,CAAC;IACtC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;IACvC,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IAClE,MAAM,eAAe,GAAG,IAAA,cAAO,EAC7B,gBAAQ,CAAC,OAAO,CAAC,6BAA6B,EAAE;QAC9C,KAAK,EAAE,CAAC,mBAAmB,CAAC;KAC7B,CAAC,CACH,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAkB,EAC1C,eAAe,EACf,mBAAmB,EACnB,eAAe,CAChB,CAAC;IACF,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1D,uBAAuB;QACvB,IAAA,kBAAI,EAAC,oBAAoB,EAAE,IAAI,CAAC;QAEhC,wDAAwD;QACxD,IAAA,kBAAI,EAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;KACnE,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,gBAAgB,EAAE,GAAG,aAAa,EAAE,CAAC;AACnD,CAAC,CAAC;AA5BW,QAAA,YAAY,gBA4BvB"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import type { ConfigRoute, RouteManifest } from '@remix-run/dev/dist/config/routes';
|
|
3
4
|
import type { RemixConfig } from '@remix-run/dev/dist/config';
|
|
4
5
|
import type { BaseFunctionConfig } from '@vercel/static-config';
|
|
5
6
|
import type { CliType, SpawnOptionsExtended } from '@vercel/build-utils/dist/fs/run-user-scripts';
|
|
7
|
+
export declare const _require: typeof require;
|
|
6
8
|
export interface ResolvedNodeRouteConfig {
|
|
7
9
|
runtime: 'nodejs';
|
|
8
10
|
regions?: string[];
|
|
@@ -40,12 +42,14 @@ export declare function getRegExpFromPath(rePath: string): RegExp | false;
|
|
|
40
42
|
* it was originally.
|
|
41
43
|
*/
|
|
42
44
|
export declare function syncEnv(source: NodeJS.ProcessEnv, dest: NodeJS.ProcessEnv): () => any;
|
|
43
|
-
export declare function chdirAndReadConfig(dir: string, packageJsonPath: string): Promise<RemixConfig>;
|
|
44
|
-
export interface
|
|
45
|
+
export declare function chdirAndReadConfig(remixRunDevPath: string, dir: string, packageJsonPath: string): Promise<RemixConfig>;
|
|
46
|
+
export interface AddDependenciesOptions extends SpawnOptionsExtended {
|
|
45
47
|
saveDev?: boolean;
|
|
46
48
|
}
|
|
47
49
|
/**
|
|
48
50
|
* Runs `npm i ${name}` / `pnpm i ${name}` / `yarn add ${name}`.
|
|
49
51
|
*/
|
|
50
|
-
export declare function
|
|
52
|
+
export declare function addDependencies(cliType: CliType, names: string[], opts?: AddDependenciesOptions): Promise<void>;
|
|
53
|
+
export declare function resolveSemverMinMax(min: string, max: string, version: string): string;
|
|
51
54
|
export declare function ensureResolvable(start: string, base: string, pkgName: string): Promise<string>;
|
|
55
|
+
export declare function isESM(path: string): boolean;
|
package/dist/utils.js
CHANGED
|
@@ -1,13 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
var _a;
|
|
2
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ensureResolvable = exports.
|
|
30
|
+
exports.isESM = exports.ensureResolvable = exports.resolveSemverMinMax = exports.addDependencies = exports.chdirAndReadConfig = exports.syncEnv = exports.getRegExpFromPath = exports.getPathFromRoute = exports.getRouteIterator = exports.isLayoutRoute = exports.calculateRouteConfigHash = exports.getResolvedRouteConfig = exports.findConfig = exports.findEntry = exports._require = void 0;
|
|
31
|
+
const semver_1 = __importDefault(require("semver"));
|
|
4
32
|
const fs_1 = require("fs");
|
|
5
33
|
const path_1 = require("path");
|
|
6
34
|
const path_to_regexp_1 = require("path-to-regexp");
|
|
7
35
|
const build_utils_1 = require("@vercel/build-utils");
|
|
8
|
-
const config_1 = require("@remix-run/dev/dist/config");
|
|
9
36
|
const build_utils_2 = require("@vercel/build-utils");
|
|
10
|
-
|
|
37
|
+
exports._require = eval('require');
|
|
11
38
|
const SPLAT_PATH = '/:params*';
|
|
12
39
|
const entryExts = ['.js', '.jsx', '.ts', '.tsx'];
|
|
13
40
|
function findEntry(dir, basename) {
|
|
@@ -150,7 +177,8 @@ function syncEnv(source, dest) {
|
|
|
150
177
|
return () => syncEnv(originalDest, dest);
|
|
151
178
|
}
|
|
152
179
|
exports.syncEnv = syncEnv;
|
|
153
|
-
async function chdirAndReadConfig(dir, packageJsonPath) {
|
|
180
|
+
async function chdirAndReadConfig(remixRunDevPath, dir, packageJsonPath) {
|
|
181
|
+
const { readConfig } = await (_a = (0, path_1.join)(remixRunDevPath, 'dist/config.js'), Promise.resolve().then(() => __importStar(require(_a))));
|
|
154
182
|
const originalCwd = process.cwd();
|
|
155
183
|
// As of Remix v1.14.0, reading the config may trigger adding
|
|
156
184
|
// "isbot" as a dependency, and `npm`/`pnpm`/`yarn` may be invoked.
|
|
@@ -172,7 +200,7 @@ async function chdirAndReadConfig(dir, packageJsonPath) {
|
|
|
172
200
|
let remixConfig;
|
|
173
201
|
try {
|
|
174
202
|
process.chdir(dir);
|
|
175
|
-
remixConfig = await
|
|
203
|
+
remixConfig = await readConfig(dir);
|
|
176
204
|
}
|
|
177
205
|
finally {
|
|
178
206
|
console.warn = warn;
|
|
@@ -187,7 +215,11 @@ exports.chdirAndReadConfig = chdirAndReadConfig;
|
|
|
187
215
|
/**
|
|
188
216
|
* Runs `npm i ${name}` / `pnpm i ${name}` / `yarn add ${name}`.
|
|
189
217
|
*/
|
|
190
|
-
function
|
|
218
|
+
function addDependencies(cliType, names, opts = {}) {
|
|
219
|
+
(0, build_utils_1.debug)('Installing additional dependencies:');
|
|
220
|
+
for (const name of names) {
|
|
221
|
+
(0, build_utils_1.debug)(` - ${name}`);
|
|
222
|
+
}
|
|
191
223
|
const args = [];
|
|
192
224
|
if (cliType === 'npm' || cliType === 'pnpm') {
|
|
193
225
|
args.push('install');
|
|
@@ -197,17 +229,28 @@ function addDependency(cliType, names, opts = {}) {
|
|
|
197
229
|
}
|
|
198
230
|
else {
|
|
199
231
|
// 'yarn'
|
|
200
|
-
args.push('add');
|
|
232
|
+
args.push('add', '--ignore-workspace-root-check');
|
|
201
233
|
if (opts.saveDev) {
|
|
202
234
|
args.push('--dev');
|
|
203
235
|
}
|
|
204
236
|
}
|
|
237
|
+
// Don't fail if pnpm is being run at the workspace root
|
|
238
|
+
if (cliType === 'pnpm' && opts.cwd) {
|
|
239
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'pnpm-workspace.yaml'))) {
|
|
240
|
+
args.push('--workspace-root');
|
|
241
|
+
}
|
|
242
|
+
}
|
|
205
243
|
return (0, build_utils_1.spawnAsync)(cliType, args.concat(names), opts);
|
|
206
244
|
}
|
|
207
|
-
exports.
|
|
245
|
+
exports.addDependencies = addDependencies;
|
|
246
|
+
function resolveSemverMinMax(min, max, version) {
|
|
247
|
+
const floored = semver_1.default.intersects(version, `>= ${min}`) ? version : min;
|
|
248
|
+
return semver_1.default.intersects(floored, `<= ${max}`) ? floored : max;
|
|
249
|
+
}
|
|
250
|
+
exports.resolveSemverMinMax = resolveSemverMinMax;
|
|
208
251
|
async function ensureResolvable(start, base, pkgName) {
|
|
209
252
|
try {
|
|
210
|
-
const resolvedPkgPath = _require.resolve(`${pkgName}/package.json`, {
|
|
253
|
+
const resolvedPkgPath = exports._require.resolve(`${pkgName}/package.json`, {
|
|
211
254
|
paths: [start],
|
|
212
255
|
});
|
|
213
256
|
const resolvedPath = (0, path_1.dirname)(resolvedPkgPath);
|
|
@@ -284,4 +327,16 @@ async function ensureSymlink(target, nodeModulesDir, pkgName) {
|
|
|
284
327
|
await fs_1.promises.symlink(relativeTarget, symlinkPath);
|
|
285
328
|
(0, build_utils_1.debug)(`Created symlink for "${pkgName}"`);
|
|
286
329
|
}
|
|
330
|
+
function isESM(path) {
|
|
331
|
+
// Figure out if the `remix.config` file is using ESM syntax
|
|
332
|
+
let isESM = false;
|
|
333
|
+
try {
|
|
334
|
+
(0, exports._require)(path);
|
|
335
|
+
}
|
|
336
|
+
catch (err) {
|
|
337
|
+
isESM = err.code === 'ERR_REQUIRE_ESM';
|
|
338
|
+
}
|
|
339
|
+
return isESM;
|
|
340
|
+
}
|
|
341
|
+
exports.isESM = isESM;
|
|
287
342
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vercel/remix-builder",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"homepage": "https://vercel.com/docs",
|
|
@@ -14,7 +14,6 @@
|
|
|
14
14
|
"defaults"
|
|
15
15
|
],
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@remix-run/dev": "npm:@vercel/remix-run-dev@1.18.1",
|
|
18
17
|
"@vercel/build-utils": "6.8.2",
|
|
19
18
|
"@vercel/nft": "0.22.5",
|
|
20
19
|
"@vercel/static-config": "2.0.17",
|
|
@@ -23,6 +22,7 @@
|
|
|
23
22
|
"ts-morph": "12.0.0"
|
|
24
23
|
},
|
|
25
24
|
"devDependencies": {
|
|
25
|
+
"@remix-run/dev": "npm:@vercel/remix-run-dev@1.19.1",
|
|
26
26
|
"@types/jest": "27.5.1",
|
|
27
27
|
"@types/node": "14.18.33",
|
|
28
28
|
"@types/semver": "7.3.13"
|