Skip to content

Commit a42ee03

Browse files
frankpaganfrankpagan
committed
fix: webpack.config and devdependencies
1 parent 4743b98 commit a42ee03

File tree

10 files changed

+428
-374
lines changed

10 files changed

+428
-374
lines changed

‎src/addMeta.js‎

Lines changed: 74 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,82 @@
1-
const fs = require('fs')
2-
const path = require("path")
3-
const util = require('node:util');
4-
const exec = util.promisify(require('node:child_process').exec);
1+
const fs = require("fs");
2+
const path = require("path");
3+
const util = require("node:util");
4+
const exec = util.promisify(require("node:child_process").exec);
55

66
module.exports = async function addMeta(repos, failed, directory) {
7-
let packageManager;
8-
for (let i = 0; i < repos.length; i++) {
9-
repos[i].name = path.basename(repos[i].path);
10-
repos[i].plainName = repos[i].name.substring(9);
7+
let packageManager;
8+
for (let i = 0; i < repos.length; i++) {
9+
repos[i].name = path.basename(repos[i].path);
10+
repos[i].plainName = repos[i].name.substring(9);
1111

12-
if (directory) {
13-
repos[i].absolutePath = path.resolve(directory, repos[i].path);
14-
const parsedPath = path.parse(repos[i].absolutePath);
15-
repos[i].directory = parsedPath.dir
16-
}
12+
if (directory) {
13+
repos[i].absolutePath = path.resolve(directory, repos[i].path);
14+
const parsedPath = path.parse(repos[i].absolutePath);
15+
repos[i].directory = parsedPath.dir;
16+
}
1717

18-
let packagejson = path.resolve(repos[i].absolutePath, 'package.json');
19-
if (!fs.existsSync(packagejson)) {
20-
console.error('package json not found for', repos[i].name);
21-
failed.push({
22-
name: repos[i].name,
23-
des: 'package json not found'
24-
})
25-
} else {
18+
let packagejson = path.resolve(repos[i].absolutePath, "package.json");
19+
if (!fs.existsSync(packagejson)) {
20+
console.error("package json not found for", repos[i].name);
21+
failed.push({
22+
name: repos[i].name,
23+
error: "package json not found"
24+
});
25+
} else {
26+
let packageObj;
27+
try {
28+
packageObj = require(packagejson);
29+
} catch (err) {
30+
console.error("packageObj", err.message);
31+
}
2632

27-
let packageObj
28-
try {
29-
packageObj = require(packagejson);
30-
}
31-
catch (err) {
32-
console.error('packageObj', err.message)
33-
}
33+
repos[i].packageName = packageObj.name;
3434

35+
repos[i].deps = Object.keys(
36+
packageObj["dependencies"] || {}
37+
).filter((packageName) => packageName.startsWith("@cocreate/"));
38+
repos[i].devDeps = Object.keys(
39+
packageObj["devDependencies"] || {}
40+
).filter((packageName) => packageName.startsWith("@cocreate/"));
3541

36-
repos[i].packageName = packageObj.name;
42+
if (!repos[i].packageManager) {
43+
if (packageManager) repos[i].packageManager = packageManager;
44+
else {
45+
repos[i].packageManager = "npm";
46+
let lockFile = path.resolve(
47+
repos[i].absolutePath,
48+
"package-lock.json"
49+
);
50+
if (!fs.existsSync(lockFile)) {
51+
lockFile = path.resolve(
52+
repos[i].absolutePath,
53+
"pnpm-lock.yaml"
54+
);
55+
if (fs.existsSync(lockFile))
56+
repos[i].packageManager = "pnpm";
57+
else {
58+
lockFile = path.resolve(
59+
repos[i].absolutePath,
60+
"yarn.lock"
61+
);
62+
if (fs.existsSync(lockFile))
63+
repos[i].packageManager = "yarn";
64+
else {
65+
try {
66+
const { error } = await exec(
67+
"yarn --version"
68+
);
69+
if (!error)
70+
repos[i].packageManager = "yarn";
71+
} catch (e) {}
72+
}
73+
}
74+
packageManager = repos[i].packageManager;
75+
}
76+
}
77+
}
78+
}
79+
}
3780

38-
repos[i].deps = Object.keys(packageObj['dependencies'] || {})
39-
.filter(packageName => packageName.startsWith('@cocreate/'));
40-
repos[i].devDeps = Object.keys(packageObj['devDependencies'] || {})
41-
.filter(packageName => packageName.startsWith('@cocreate/'));
42-
43-
if (!repos[i].packageManager) {
44-
if (packageManager)
45-
repos[i].packageManager = packageManager
46-
else {
47-
repos[i].packageManager = 'npm'
48-
let lockFile = path.resolve(repos[i].absolutePath, 'package-lock.json');
49-
if (!fs.existsSync(lockFile)) {
50-
lockFile = path.resolve(repos[i].absolutePath, 'pnpm-lock.yaml');
51-
if (fs.existsSync(lockFile))
52-
repos[i].packageManager = 'pnpm'
53-
else {
54-
lockFile = path.resolve(repos[i].absolutePath, 'yarn.lock');
55-
if (fs.existsSync(lockFile))
56-
repos[i].packageManager = 'yarn'
57-
else {
58-
try {
59-
const { error } = await exec('yarn --version');
60-
if (!error)
61-
repos[i].packageManager = 'yarn'
62-
} catch(e) {
63-
64-
}
65-
}
66-
}
67-
packageManager = repos[i].packageManager
68-
}
69-
}
70-
}
71-
}
72-
}
73-
74-
return repos
75-
}
81+
return repos;
82+
};

‎src/coc.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ async function main(config = {}, repos = null, directory = null) {
6666
const repoUrl =
6767
packageObj.repository &&
6868
packageObj.repository.url.substring(12);
69+
const repoEntry = packageObj.main;
6970
repos = [
7071
{
7172
path: repoPath,
72-
repo: repoUrl
73+
repo: repoUrl,
74+
entry: repoEntry
7375
}
7476
];
7577
directory = path.dirname(packageJsonPath);
@@ -98,7 +100,7 @@ async function main(config = {}, repos = null, directory = null) {
98100
);
99101
for (const failure of failed) {
100102
console.log(
101-
color.red + `${failure.name}: ${failure.des}` + color.reset
103+
color.red + `${failure.name}: ${failure.error}` + color.reset
102104
);
103105
}
104106

‎src/commands/acme.js‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
const { requestCertificate } = require('@cocreate/acme')
1+
const { requestCertificate } = require("@cocreate/acme");
22

33
module.exports = async function nginx(repos, args) {
4-
let failed = [];
5-
6-
try {
7-
if (args.length) {
8-
if (args[0] === 'create') {
9-
args.shift()
10-
await createServer(args);
11-
} else if (args[0] === 'delete') {
12-
args.shift()
13-
await deleteServer(args);
14-
} else
15-
await createServer(args);
16-
}
17-
} catch (err) {
18-
failed.push({ name: 'GENERAL', des: err.message });
19-
console.error(err.red);
20-
} finally {
21-
return failed;
22-
}
23-
24-
}
4+
let failed = [];
255

6+
try {
7+
if (args.length) {
8+
if (args[0] === "create") {
9+
args.shift();
10+
await createServer(args);
11+
} else if (args[0] === "delete") {
12+
args.shift();
13+
await deleteServer(args);
14+
} else await createServer(args);
15+
}
16+
} catch (err) {
17+
failed.push({ name: "GENERAL", error: err.message });
18+
console.error(err.red);
19+
} finally {
20+
return failed;
21+
}
22+
};

‎src/commands/bump.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function getVersions(filePath) {
7272
const promise = exec(`npm view ${key} version`)
7373
.then((versionObj) => versionObj.stdout.trim())
7474
.catch((error) => {
75-
failed.push({ name: key, des: error.message });
75+
failed.push({ name: key, error: error.message });
7676
console.error(
7777
`Failed fetching version for ${key}: ${error.message}`
7878
);
@@ -85,7 +85,7 @@ function getVersions(filePath) {
8585
const errorMessage = `Path doesn't exist: ${filePath}`;
8686
failed.push({
8787
name: "get version",
88-
des: errorMessage
88+
error: errorMessage
8989
});
9090
console.error(errorMessage);
9191
}
@@ -147,7 +147,7 @@ function updateVersion(filePath) {
147147
const errorMessage = `Path doesn't exist: ${filePath}`;
148148
failed.push({
149149
name: "update version",
150-
des: errorMessage
150+
error: errorMessage
151151
});
152152
console.error(errorMessage);
153153
}

‎src/commands/clone.js‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
1-
const spawn = require('../spawn');
2-
const path = require('path');
3-
let fs = require('fs');
1+
const spawn = require("../spawn");
2+
const path = require("path");
3+
let fs = require("fs");
44

55
module.exports = async function gitClone(repos, args) {
6-
const failed = [];
7-
const cwdPath = path.resolve(process.cwd());
6+
const failed = [];
7+
const cwdPath = path.resolve(process.cwd());
88

9-
for (let i = 0; i < repos.length; i++) {
10-
// TODO: Check if path exist and if git.config or package.json exist continue
11-
if (cwdPath !== repos[i].absolutePath) {
12-
if (!fs.existsSync(repos[i].directory))
13-
fs.mkdirSync(repos[i].directory);
9+
for (let i = 0; i < repos.length; i++) {
10+
// TODO: Check if path exist and if git.config or package.json exist continue
11+
if (cwdPath !== repos[i].absolutePath) {
12+
if (!fs.existsSync(repos[i].directory))
13+
fs.mkdirSync(repos[i].directory);
1414

15-
if (!repos[i].repo.startsWith('http://') && !repos[i].repo.startsWith('https://'))
16-
repos[i].repo = 'https://' + repos[i].repo
15+
if (
16+
!repos[i].repo.startsWith("http://") &&
17+
!repos[i].repo.startsWith("https://")
18+
)
19+
repos[i].repo = "https://" + repos[i].repo;
1720

18-
let exitCode = await spawn('git', ['clone', `${repos[i].repo}`], { stdio: 'inherit', cwd: repos[i].directory })
19-
if (exitCode !== 0) {
20-
failed.push({ name: repos[i].name, des: `cloning failed` })
21-
}
21+
let exitCode = await spawn("git", ["clone", `${repos[i].repo}`], {
22+
stdio: "inherit",
23+
cwd: repos[i].directory
24+
});
25+
if (exitCode !== 0) {
26+
failed.push({ name: repos[i].name, error: `cloning failed` });
27+
}
28+
}
29+
}
2230

23-
}
24-
}
25-
26-
return failed;
27-
28-
}
31+
return failed;
32+
};

‎src/commands/install.js‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
const addMeta = require('../addMeta');
1+
const addMeta = require("../addMeta");
22

3-
module.exports = async function(repos, args) {
4-
let failed = [];
5-
try {
6-
let cloneFailed = await require('./clone.js')(repos, args)
7-
if (cloneFailed)
8-
failed.push(cloneFailed)
3+
module.exports = async function (repos, args) {
4+
let failed = [];
5+
try {
6+
let cloneFailed = await require("./clone.js")(repos, args);
7+
if (cloneFailed) failed.push(cloneFailed);
98

10-
repos = await addMeta(repos, failed)
9+
repos = await addMeta(repos, failed);
1110

12-
let symlinkFailed = await require('./symlink.js')(repos, args)
13-
if (symlinkFailed)
14-
failed.push(symlinkFailed)
15-
16-
let linkFailed = await require('./link.js')(repos, args)
17-
if (linkFailed)
18-
failed.push(linkFailed)
19-
20-
} catch (err) {
21-
console.error(err);
22-
failed.push({ name: 'general', des: err.message })
23-
}
24-
return failed;
25-
}
11+
let symlinkFailed = await require("./symlink.js")(repos, args);
12+
if (symlinkFailed) failed.push(symlinkFailed);
13+
14+
let linkFailed = await require("./link.js")(repos, args);
15+
if (linkFailed) failed.push(linkFailed);
16+
} catch (err) {
17+
console.error(err);
18+
failed.push({ name: "general", error: err.message });
19+
}
20+
return failed;
21+
};

0 commit comments

Comments
 (0)