Skip to content

Commit ac81974

Browse files
author
Matthias Tylkowski
committed
fix formatting
1 parent 51a2149 commit ac81974

File tree

4 files changed

+48
-49
lines changed

4 files changed

+48
-49
lines changed

packages/adapter-node/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ export default function (opts = {}) {
4646
);
4747

4848
const optimized_package_json = builder.generatePackageJson();
49-
writeFileSync(
50-
`${out}/package.json`,
51-
optimized_package_json
52-
);
49+
writeFileSync(`${out}/package.json`, optimized_package_json);
5350

5451
const pkg = JSON.parse(optimized_package_json);
5552

packages/kit/src/core/adapt/builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export function create_builder({ config, build_data, routes, prerendered, log })
118118
return generate_package_json({
119119
build_data,
120120
cwd: process.cwd()
121-
})
121+
});
122122
},
123123

124124
getBuildDirectory(name) {

packages/kit/src/core/generate_package_json/index.js

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,59 @@ import path from 'node:path';
88
* cwd: string;
99
* }} opts
1010
*/
11-
export function generate_package_json({build_data, cwd}) {
11+
export function generate_package_json({ build_data, cwd }) {
12+
const package_json_text = fs.readFileSync(path.resolve(cwd, 'package.json'), 'utf8');
13+
const package_json = JSON.parse(package_json_text);
14+
const dependences_with_versions = Object.assign(
15+
{},
16+
package_json.devDependencies || {},
17+
package_json.dependencies || {}
18+
);
1219

13-
const package_json_text = fs.readFileSync(path.resolve(cwd, 'package.json'), 'utf8');
14-
const package_json = JSON.parse(package_json_text);
15-
const dependences_with_versions = Object.assign(
16-
{},
17-
package_json.devDependencies || {},
18-
package_json.dependencies || {}
19-
);
20+
const dependencies = Object.keys(dependences_with_versions);
2021

21-
const dependencies = Object.keys(dependences_with_versions);
22+
/** @type {Set<string>} */
23+
const dependencies_set = new Set(dependencies);
2224

23-
/** @type {Set<string>} */
24-
const dependencies_set = new Set(dependencies);
25+
const prod_package_json = Object.assign({}, package_json);
26+
delete prod_package_json.devDependencies;
27+
delete prod_package_json.scripts;
28+
prod_package_json.dependencies = {};
2529

26-
const prod_package_json = Object.assign({}, package_json);
27-
delete prod_package_json.devDependencies;
28-
delete prod_package_json.scripts;
29-
prod_package_json.dependencies = {};
30+
const chunks = [build_data.client.chunks, build_data.server.chunks].flat();
31+
if (chunks.length > 0) {
32+
/** @type {string[]} */
33+
const dependency_names = filter_import_packages(chunks, dependencies_set);
34+
dependency_names.sort();
35+
prod_package_json.dependencies = create_dependency_object(
36+
dependency_names,
37+
dependences_with_versions
38+
);
39+
}
3040

31-
const chunks = [build_data.client.chunks, build_data.server.chunks].flat();
32-
if(chunks.length > 0) {
33-
/** @type {string[]} */
34-
const dependency_names = filter_import_packages(chunks, dependencies_set);
35-
dependency_names.sort();
36-
prod_package_json.dependencies = create_dependency_object(dependency_names, dependences_with_versions);
37-
}
38-
39-
return JSON.stringify(prod_package_json, null, 2);
41+
return JSON.stringify(prod_package_json, null, 2);
4042
}
4143
/**
4244
*
4345
* @param {import('rollup').OutputChunk[]} chunks
4446
* @param {Set<string>} dependencies_set
4547
*/
4648
function filter_import_packages(chunks, dependencies_set) {
47-
/** @type {string[]} */
48-
const import_names = chunks.reduce((/** @type {string[]} */ deps, chunk) => {
49-
if(chunk.imports.length > 0) {
50-
for(let i = 0; i < chunk.imports.length; i++) {
51-
const importName = chunk.imports[i];
52-
if(dependencies_set.has(importName)) {
53-
deps.push(importName);
54-
}
55-
}
56-
}
49+
/** @type {string[]} */
50+
const import_names = chunks.reduce((/** @type {string[]} */ deps, chunk) => {
51+
if (chunk.imports.length > 0) {
52+
for (let i = 0; i < chunk.imports.length; i++) {
53+
const importName = chunk.imports[i];
54+
if (dependencies_set.has(importName)) {
55+
deps.push(importName);
56+
}
57+
}
58+
}
5759

58-
return deps;
59-
}, []);
60+
return deps;
61+
}, []);
6062

61-
return import_names;
63+
return import_names;
6264
}
6365

6466
/**
@@ -67,11 +69,11 @@ function filter_import_packages(chunks, dependencies_set) {
6769
* @param {{[key: string]: string}} dependences_with_versions
6870
*/
6971
function create_dependency_object(dependency_names, dependences_with_versions) {
70-
/** @type {{[key: string]: string}} */
71-
const dependencies = {};
72-
for(let i = 0; i < dependency_names.length; i++) {
73-
dependencies[dependency_names[i]] = dependences_with_versions[dependency_names[i]];
74-
}
72+
/** @type {{[key: string]: string}} */
73+
const dependencies = {};
74+
for (let i = 0; i < dependency_names.length; i++) {
75+
dependencies[dependency_names[i]] = dependences_with_versions[dependency_names[i]];
76+
}
7577

76-
return dependencies;
78+
return dependencies;
7779
}

packages/kit/src/exports/vite/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ function kit() {
410410
package_json_path,
411411
generate_package_json({
412412
build_data,
413-
cwd,
413+
cwd
414414
})
415415
);
416416

0 commit comments

Comments
 (0)