@netlify/build-info 7.14.2 → 7.14.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.
- package/lib/frameworks/framework.d.ts +4 -2
- package/lib/frameworks/framework.js +23 -9
- package/lib/frameworks/framework.js.map +1 -1
- package/lib/frameworks/hydrogen.d.ts +1 -0
- package/lib/frameworks/hydrogen.js +3 -8
- package/lib/frameworks/hydrogen.js.map +1 -1
- package/lib/frameworks/remix.d.ts +1 -0
- package/lib/frameworks/remix.js +3 -8
- package/lib/frameworks/remix.js.map +1 -1
- package/lib/get-framework.js +2 -0
- package/lib/get-framework.js.map +1 -1
- package/package.json +2 -2
|
@@ -29,8 +29,10 @@ export type Detection = {
|
|
|
29
29
|
version?: SemVer;
|
|
30
30
|
};
|
|
31
31
|
packageJSON?: PackageJson;
|
|
32
|
-
/** The config file that is associated with the framework */
|
|
32
|
+
/** The absolute path to config file that is associated with the framework */
|
|
33
33
|
config?: string;
|
|
34
|
+
/** The name of config file that is associated with the framework */
|
|
35
|
+
configName?: string;
|
|
34
36
|
};
|
|
35
37
|
export type FrameworkInfo = ReturnType<Framework['toJSON']>;
|
|
36
38
|
export interface Framework {
|
|
@@ -110,7 +112,7 @@ export declare function filterByRelevance(detected: DetectedFramework[]): Detect
|
|
|
110
112
|
* 3. an npm dependency was specified but matched over the config file (least accurate)
|
|
111
113
|
*/
|
|
112
114
|
export declare function sortFrameworksBasedOnAccuracy(a: DetectedFramework, b: DetectedFramework): number;
|
|
113
|
-
/** Merges a list of detection results based on accuracy to get the one with the highest accuracy */
|
|
115
|
+
/** Merges a list of detection results based on accuracy to get the one with the highest accuracy that still contains information provided by all other detections */
|
|
114
116
|
export declare function mergeDetections(detections: Array<Detection | undefined>): Detection | undefined;
|
|
115
117
|
export declare abstract class BaseFramework implements Framework {
|
|
116
118
|
/** The current project inside we want to detect the framework */
|
|
@@ -42,11 +42,23 @@ export function sortFrameworksBasedOnAccuracy(a, b) {
|
|
|
42
42
|
}
|
|
43
43
|
return sort;
|
|
44
44
|
}
|
|
45
|
-
/** Merges a list of detection results based on accuracy to get the one with the highest accuracy */
|
|
45
|
+
/** Merges a list of detection results based on accuracy to get the one with the highest accuracy that still contains information provided by all other detections */
|
|
46
46
|
export function mergeDetections(detections) {
|
|
47
|
-
|
|
48
|
-
.filter(
|
|
49
|
-
|
|
47
|
+
const definedDetections = detections
|
|
48
|
+
.filter(function isDetection(d) {
|
|
49
|
+
return Boolean(d);
|
|
50
|
+
})
|
|
51
|
+
.sort((a, b) => (a.accuracy > b.accuracy ? -1 : a.accuracy < b.accuracy ? 1 : 0));
|
|
52
|
+
if (definedDetections.length === 0) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
return definedDetections.slice(1).reduce((merged, detection) => {
|
|
56
|
+
merged.config = merged.config ?? detection.config;
|
|
57
|
+
merged.configName = merged.configName ?? detection.configName;
|
|
58
|
+
merged.package = merged.package ?? detection.package;
|
|
59
|
+
merged.packageJSON = merged.packageJSON ?? detection.packageJSON;
|
|
60
|
+
return merged;
|
|
61
|
+
}, definedDetections[0]);
|
|
50
62
|
}
|
|
51
63
|
export class BaseFramework {
|
|
52
64
|
project;
|
|
@@ -158,6 +170,7 @@ export class BaseFramework {
|
|
|
158
170
|
// otherwise the npm dependency should have already triggered the detection
|
|
159
171
|
accuracy: this.npmDependencies.length === 0 ? Accuracy.ConfigOnly : Accuracy.Config,
|
|
160
172
|
config,
|
|
173
|
+
configName: this.project.fs.basename(config),
|
|
161
174
|
};
|
|
162
175
|
}
|
|
163
176
|
}
|
|
@@ -169,13 +182,14 @@ export class BaseFramework {
|
|
|
169
182
|
* - if `configFiles` is set, one of the files must exist
|
|
170
183
|
*/
|
|
171
184
|
async detect() {
|
|
172
|
-
// we can force frameworks as well
|
|
173
|
-
if (this.detected?.accuracy === Accuracy.Forced) {
|
|
174
|
-
return this;
|
|
175
|
-
}
|
|
176
185
|
const npm = await this.detectNpmDependency();
|
|
177
186
|
const config = await this.detectConfigFile(this.configFiles ?? []);
|
|
178
|
-
this.detected = mergeDetections([
|
|
187
|
+
this.detected = mergeDetections([
|
|
188
|
+
// we can force frameworks as well
|
|
189
|
+
this.detected?.accuracy === Accuracy.Forced ? this.detected : undefined,
|
|
190
|
+
npm,
|
|
191
|
+
config,
|
|
192
|
+
]);
|
|
179
193
|
if (this.detected) {
|
|
180
194
|
return this;
|
|
181
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framework.js","sourceRoot":"","sources":["../../src/frameworks/framework.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAG9C,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAGrE,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,oDAAwC,CAAA;IACxC,yCAA6B,CAAA;IAC7B,oCAAwB,CAAA;AAC1B,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB;AAED,MAAM,CAAN,IAAY,QAMX;AAND,WAAY,QAAQ;IAClB,2CAAU,CAAA;IACV,qCAAO,CAAA;IACP,mDAAc,CAAA;IACd,2CAAU,CAAA;IACV,mDAAc,CAAA;AAChB,CAAC,EANW,QAAQ,KAAR,QAAQ,QAMnB;
|
|
1
|
+
{"version":3,"file":"framework.js","sourceRoot":"","sources":["../../src/frameworks/framework.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export class Hydrogen extends BaseFramework {
|
|
|
29
29
|
id = 'hydrogen';
|
|
30
30
|
name = 'Hydrogen';
|
|
31
31
|
npmDependencies = ['@shopify/hydrogen'];
|
|
32
|
+
configFiles = [...VITE_CONFIG_FILES, ...CLASSIC_COMPILER_CONFIG_FILES];
|
|
32
33
|
category = Category.SSG;
|
|
33
34
|
logo = {
|
|
34
35
|
default: '/logos/hydrogen/default.svg',
|
|
@@ -38,22 +39,16 @@ export class Hydrogen extends BaseFramework {
|
|
|
38
39
|
async detect() {
|
|
39
40
|
await super.detect();
|
|
40
41
|
if (this.detected) {
|
|
41
|
-
|
|
42
|
-
if (viteDetection) {
|
|
43
|
-
this.detected = viteDetection;
|
|
42
|
+
if (this.detected.configName && VITE_CONFIG_FILES.includes(this.detected.configName)) {
|
|
44
43
|
this.dev = VITE_DEV;
|
|
45
44
|
this.build = VITE_BUILD;
|
|
46
45
|
return this;
|
|
47
46
|
}
|
|
48
|
-
|
|
49
|
-
if (classicCompilerDetection) {
|
|
50
|
-
this.detected = classicCompilerDetection;
|
|
47
|
+
else {
|
|
51
48
|
this.dev = CLASSIC_COMPILER_DEV;
|
|
52
49
|
this.build = CLASSIC_COMPILER_BUILD;
|
|
53
50
|
return this;
|
|
54
51
|
}
|
|
55
|
-
// If neither config file exists, it can't be a valid Hydrogen site for Netlify anyway.
|
|
56
|
-
return;
|
|
57
52
|
}
|
|
58
53
|
}
|
|
59
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hydrogen.js","sourceRoot":"","sources":["../../src/frameworks/hydrogen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAgC,MAAM,gBAAgB,CAAA;AAEtF,MAAM,6BAA6B,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACzD,MAAM,oBAAoB,GAAG;IAC3B,OAAO,EAAE,qCAAqC;CAC/C,CAAA;AACD,MAAM,sBAAsB,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,QAAQ;CACpB,CAAA;AAED,MAAM,iBAAiB,GAAG;IACxB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;CAClB,CAAA;AACD,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,sBAAsB;IAC/B,IAAI,EAAE,IAAI;CACX,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,8EAA8E;IAC9E,uGAAuG;IACvG,OAAO,EAAE,kBAAkB;IAC3B,SAAS,EAAE,aAAa;CACzB,CAAA;AAED,MAAM,OAAO,QAAS,SAAQ,aAAa;IAChC,EAAE,GAAG,UAAU,CAAA;IACxB,IAAI,GAAG,UAAU,CAAA;IACjB,eAAe,GAAG,CAAC,mBAAmB,CAAC,CAAA;IACvC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAA;IAEvB,IAAI,GAAG;QACL,OAAO,EAAE,6BAA6B;QACtC,KAAK,EAAE,6BAA6B;QACpC,IAAI,EAAE,6BAA6B;KACpC,CAAA;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,
|
|
1
|
+
{"version":3,"file":"hydrogen.js","sourceRoot":"","sources":["../../src/frameworks/hydrogen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAgC,MAAM,gBAAgB,CAAA;AAEtF,MAAM,6BAA6B,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACzD,MAAM,oBAAoB,GAAG;IAC3B,OAAO,EAAE,qCAAqC;CAC/C,CAAA;AACD,MAAM,sBAAsB,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,QAAQ;CACpB,CAAA;AAED,MAAM,iBAAiB,GAAG;IACxB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;CAClB,CAAA;AACD,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,sBAAsB;IAC/B,IAAI,EAAE,IAAI;CACX,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,8EAA8E;IAC9E,uGAAuG;IACvG,OAAO,EAAE,kBAAkB;IAC3B,SAAS,EAAE,aAAa;CACzB,CAAA;AAED,MAAM,OAAO,QAAS,SAAQ,aAAa;IAChC,EAAE,GAAG,UAAU,CAAA;IACxB,IAAI,GAAG,UAAU,CAAA;IACjB,eAAe,GAAG,CAAC,mBAAmB,CAAC,CAAA;IACvC,WAAW,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,6BAA6B,CAAC,CAAA;IACtE,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAA;IAEvB,IAAI,GAAG;QACL,OAAO,EAAE,6BAA6B;QACtC,KAAK,EAAE,6BAA6B;QACpC,IAAI,EAAE,6BAA6B;KACpC,CAAA;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrF,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAA;gBACnB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAA;gBACvB,OAAO,IAAyB,CAAA;YAClC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,GAAG,oBAAoB,CAAA;gBAC/B,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAA;gBACnC,OAAO,IAAyB,CAAA;YAClC,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
package/lib/frameworks/remix.js
CHANGED
|
@@ -40,6 +40,7 @@ export class Remix extends BaseFramework {
|
|
|
40
40
|
'@remix-run/netlify-edge',
|
|
41
41
|
];
|
|
42
42
|
excludedNpmDependencies = ['@shopify/hydrogen'];
|
|
43
|
+
configFiles = [...VITE_CONFIG_FILES, ...CLASSIC_COMPILER_CONFIG_FILES];
|
|
43
44
|
category = Category.SSG;
|
|
44
45
|
logo = {
|
|
45
46
|
default: '/logos/remix/default.svg',
|
|
@@ -49,22 +50,16 @@ export class Remix extends BaseFramework {
|
|
|
49
50
|
async detect() {
|
|
50
51
|
await super.detect();
|
|
51
52
|
if (this.detected) {
|
|
52
|
-
|
|
53
|
-
if (viteDetection) {
|
|
54
|
-
this.detected = viteDetection;
|
|
53
|
+
if (this.detected.configName && VITE_CONFIG_FILES.includes(this.detected.configName)) {
|
|
55
54
|
this.dev = VITE_DEV;
|
|
56
55
|
this.build = VITE_BUILD;
|
|
57
56
|
return this;
|
|
58
57
|
}
|
|
59
|
-
|
|
60
|
-
if (classicCompilerDetection) {
|
|
61
|
-
this.detected = classicCompilerDetection;
|
|
58
|
+
else {
|
|
62
59
|
this.dev = CLASSIC_COMPILER_DEV;
|
|
63
60
|
this.build = CLASSIC_COMPILER_BUILD;
|
|
64
61
|
return this;
|
|
65
62
|
}
|
|
66
|
-
// If neither config file exists, it can't be a valid Remix site for Netlify anyway.
|
|
67
|
-
return;
|
|
68
63
|
}
|
|
69
64
|
}
|
|
70
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remix.js","sourceRoot":"","sources":["../../src/frameworks/remix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAgC,MAAM,gBAAgB,CAAA;AAEtF,MAAM,6BAA6B,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACzD,MAAM,oBAAoB,GAAG;IAC3B,OAAO,EAAE,aAAa;CACvB,CAAA;AACD,MAAM,sBAAsB,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,QAAQ;CACpB,CAAA;AAED,MAAM,iBAAiB,GAAG;IACxB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;CAClB,CAAA;AACD,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,gBAAgB;IACzB,IAAI,EAAE,IAAI;CACX,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,OAAO,EAAE,kBAAkB;IAC3B,SAAS,EAAE,cAAc;CAC1B,CAAA;AAED,MAAM,OAAO,KAAM,SAAQ,aAAa;IAC7B,EAAE,GAAG,OAAO,CAAA;IACrB,IAAI,GAAG,OAAO,CAAA;IACd,eAAe,GAAG;QAChB,kBAAkB;QAClB,gBAAgB;QAChB,2BAA2B;QAC3B,wBAAwB;QACxB,6BAA6B;QAC7B,wBAAwB;QACxB,8DAA8D;QAC9D,OAAO;QACP,8BAA8B;QAC9B,oBAAoB;QACpB,yBAAyB;KAC1B,CAAA;IACD,uBAAuB,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC/C,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAA;IAEvB,IAAI,GAAG;QACL,OAAO,EAAE,0BAA0B;QACnC,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,uBAAuB;KAC9B,CAAA;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,
|
|
1
|
+
{"version":3,"file":"remix.js","sourceRoot":"","sources":["../../src/frameworks/remix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAgC,MAAM,gBAAgB,CAAA;AAEtF,MAAM,6BAA6B,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACzD,MAAM,oBAAoB,GAAG;IAC3B,OAAO,EAAE,aAAa;CACvB,CAAA;AACD,MAAM,sBAAsB,GAAG;IAC7B,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,QAAQ;CACpB,CAAA;AAED,MAAM,iBAAiB,GAAG;IACxB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;CAClB,CAAA;AACD,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,gBAAgB;IACzB,IAAI,EAAE,IAAI;CACX,CAAA;AACD,MAAM,UAAU,GAAG;IACjB,OAAO,EAAE,kBAAkB;IAC3B,SAAS,EAAE,cAAc;CAC1B,CAAA;AAED,MAAM,OAAO,KAAM,SAAQ,aAAa;IAC7B,EAAE,GAAG,OAAO,CAAA;IACrB,IAAI,GAAG,OAAO,CAAA;IACd,eAAe,GAAG;QAChB,kBAAkB;QAClB,gBAAgB;QAChB,2BAA2B;QAC3B,wBAAwB;QACxB,6BAA6B;QAC7B,wBAAwB;QACxB,8DAA8D;QAC9D,OAAO;QACP,8BAA8B;QAC9B,oBAAoB;QACpB,yBAAyB;KAC1B,CAAA;IACD,uBAAuB,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC/C,WAAW,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,6BAA6B,CAAC,CAAA;IACtE,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAA;IAEvB,IAAI,GAAG;QACL,OAAO,EAAE,0BAA0B;QACnC,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,uBAAuB;KAC9B,CAAA;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;QAEpB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrF,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAA;gBACnB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAA;gBACvB,OAAO,IAAyB,CAAA;YAClC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,GAAG,oBAAoB,CAAA;gBAC/B,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAA;gBACnC,OAAO,IAAyB,CAAA;YAClC,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
package/lib/get-framework.js
CHANGED
|
@@ -10,6 +10,8 @@ export async function getFramework(frameworkId, project) {
|
|
|
10
10
|
if (detected) {
|
|
11
11
|
return detected;
|
|
12
12
|
}
|
|
13
|
+
// this indicate that framework's custom "detect" method doesn't honor the forced framework
|
|
14
|
+
throw new Error(`Forced framework "${frameworkId}" was not detected.`);
|
|
13
15
|
}
|
|
14
16
|
const frameworkIds = frameworkList
|
|
15
17
|
.map(({ id }) => id)
|
package/lib/get-framework.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-framework.js","sourceRoot":"","sources":["../src/get-framework.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAqB,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAiB,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGjE,mEAAmE;AACnE,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,WAA0B,EAAE,OAAgB;IAC7E,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,WAAW,CAAC,CAAA;IAEpE,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,QAAQ,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;QAClD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;QAEzC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAA;QACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-framework.js","sourceRoot":"","sources":["../src/get-framework.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAqB,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAiB,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGjE,mEAAmE;AACnE,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,WAA0B,EAAE,OAAgB;IAC7E,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,WAAW,CAAC,CAAA;IAEpE,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,QAAQ,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;QAClD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;QAEzC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,2FAA2F;QAC3F,MAAM,IAAI,KAAK,CAAC,qBAAqB,WAAW,qBAAqB,CAAC,CAAA;IACxE,CAAC;IAED,MAAM,YAAY,GAAG,aAAa;SAC/B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;SACnB,IAAI,EAAE;SACN,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,WAAW,2BAA2B,YAAY,EAAE,CAAC,CAAA;AAC7F,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@netlify/build-info",
|
|
3
|
-
"version": "7.14.
|
|
3
|
+
"version": "7.14.3",
|
|
4
4
|
"description": "Build info utility",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"engines": {
|
|
74
74
|
"node": "^14.16.0 || >=16.0.0"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "c7dc1e805b4f9cde9e9d71802aecd052e28221cb"
|
|
77
77
|
}
|