@maka/maka-cli 5.3.3 → 5.3.4
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|
|
@@ -40,7 +40,6 @@
|
|
|
40
40
|
"@aws-sdk/client-ecr": "^3.1111.0",
|
|
41
41
|
"@aws-sdk/client-route-53": "^3.1111.0",
|
|
42
42
|
"@aws-sdk/client-route-53-domains": "^3.1111.0",
|
|
43
|
-
"@babel/eslint-parser": "^7.25.9",
|
|
44
43
|
"@inquirer/prompts": "^8.5.2",
|
|
45
44
|
"@maka/tar": "^6.2.2",
|
|
46
45
|
"blessed": "^0.1.81",
|
|
@@ -52,7 +51,6 @@
|
|
|
52
51
|
"dotenv": "^17.4.2",
|
|
53
52
|
"ejs": "^6.0.1",
|
|
54
53
|
"elegant-spinner": "^3.0.0",
|
|
55
|
-
"eslint": "^9.13.0",
|
|
56
54
|
"http-proxy": "^1.18.1",
|
|
57
55
|
"humps": "^2.0.1",
|
|
58
56
|
"husky": "^9.1.6",
|
|
@@ -70,6 +68,7 @@
|
|
|
70
68
|
},
|
|
71
69
|
"devDependencies": {
|
|
72
70
|
"@aws-sdk/types": "^3.974.4",
|
|
71
|
+
"@babel/eslint-parser": "^7.25.9",
|
|
73
72
|
"@eslint/js": "^9.13.0",
|
|
74
73
|
"@types/blessed": "^0.1.25",
|
|
75
74
|
"@types/cli-color": "^2.0.6",
|
|
@@ -89,6 +88,7 @@
|
|
|
89
88
|
"concat-stream": "^2.0.0",
|
|
90
89
|
"concurrently": "^10.0.5",
|
|
91
90
|
"esbuild": "^0.28.2",
|
|
91
|
+
"eslint": "^9.13.0",
|
|
92
92
|
"globals": "^17.11.0",
|
|
93
93
|
"jest": "^30.4.2",
|
|
94
94
|
"mkdirp": "^3.0.1",
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
|
-
import {
|
|
3
|
-
import babelParser from '@babel/eslint-parser';
|
|
4
|
-
import { Log } from '../tools/log/log.class.js';
|
|
2
|
+
import { spawn } from 'child_process';
|
|
5
3
|
import { Command } from '../command.js';
|
|
4
|
+
function runLocalEslint(cwd, args) {
|
|
5
|
+
return new Promise((resolve, reject) => {
|
|
6
|
+
const isWin = process.platform === 'win32';
|
|
7
|
+
const eslintBin = path.join(cwd, 'node_modules', '.bin', isWin ? 'eslint.cmd' : 'eslint');
|
|
8
|
+
const child = spawn(eslintBin, args, { cwd, stdio: 'inherit', shell: true });
|
|
9
|
+
child.on('close', (code) => resolve(code ?? 1));
|
|
10
|
+
child.on('error', (err) => reject(err));
|
|
11
|
+
});
|
|
12
|
+
}
|
|
6
13
|
Command.create({
|
|
7
14
|
name: 'lint',
|
|
8
15
|
usage: 'maka lint',
|
|
@@ -85,38 +92,17 @@ Command.create({
|
|
|
85
92
|
context: { noRename: true }
|
|
86
93
|
});
|
|
87
94
|
}
|
|
88
|
-
const eslint = new ESLint({
|
|
89
|
-
fix: opts.fix,
|
|
90
|
-
cwd: appDirectory,
|
|
91
|
-
overrideConfigFile: eslintConfigPath,
|
|
92
|
-
overrideConfig: {
|
|
93
|
-
languageOptions: {
|
|
94
|
-
ecmaVersion: 'latest',
|
|
95
|
-
sourceType: 'module',
|
|
96
|
-
parser: babelParser,
|
|
97
|
-
parserOptions: {
|
|
98
|
-
ecmaFeatures: { jsx: true },
|
|
99
|
-
babelOptions: {
|
|
100
|
-
configFile: babelConfigPath // Point to babel.config.js
|
|
101
|
-
},
|
|
102
|
-
requireConfigFile: true
|
|
103
|
-
},
|
|
104
|
-
},
|
|
105
|
-
},
|
|
106
|
-
ignore: false,
|
|
107
|
-
});
|
|
108
95
|
const importsDirectory = path.join(appDirectory, 'imports/**/*.{js,jsx,tsx,ts}');
|
|
109
96
|
const clientDirectory = path.join(appDirectory, 'client');
|
|
110
97
|
const serverDirectory = path.join(appDirectory, 'server');
|
|
111
98
|
const libDirectory = path.join(appDirectory, 'lib');
|
|
112
|
-
const
|
|
113
|
-
if (opts.fix)
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
Log.bright(resultText);
|
|
99
|
+
const eslintArgs = ['--config', eslintConfigPath, '--no-ignore'];
|
|
100
|
+
if (opts.fix)
|
|
101
|
+
eslintArgs.push('--fix');
|
|
102
|
+
eslintArgs.push(importsDirectory, clientDirectory, serverDirectory, libDirectory);
|
|
103
|
+
const exitCode = await runLocalEslint(projectDirectory, eslintArgs);
|
|
104
|
+
if (exitCode !== 0) {
|
|
105
|
+
process.exit(exitCode);
|
|
120
106
|
}
|
|
121
107
|
}
|
|
122
108
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../src/commands/lint.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../src/commands/lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
const path = require("path");
|
|
1
2
|
const reactPlugin = require("eslint-plugin-react");
|
|
2
3
|
const cssPlugin = require("eslint-plugin-css");
|
|
3
4
|
const prettierPlugin = require("eslint-plugin-prettier");
|
|
4
5
|
const unusedImportsPlugin = require("eslint-plugin-unused-imports");
|
|
6
|
+
const babelParser = require("@babel/eslint-parser");
|
|
5
7
|
|
|
6
8
|
module.exports = [
|
|
7
9
|
{
|
|
@@ -15,8 +17,13 @@ module.exports = [
|
|
|
15
17
|
languageOptions: {
|
|
16
18
|
ecmaVersion: "latest",
|
|
17
19
|
sourceType: "module",
|
|
20
|
+
parser: babelParser,
|
|
18
21
|
parserOptions: {
|
|
19
22
|
ecmaFeatures: { jsx: true },
|
|
23
|
+
babelOptions: {
|
|
24
|
+
configFile: path.join(__dirname, "../app/babel.config.js"),
|
|
25
|
+
},
|
|
26
|
+
requireConfigFile: true,
|
|
20
27
|
},
|
|
21
28
|
},
|
|
22
29
|
rules: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
|
|
6
6
|
"description": "A command line tool for scaffolding Meteor 2.x applications using React.",
|
|
@@ -40,7 +40,6 @@
|
|
|
40
40
|
"@aws-sdk/client-ecr": "^3.1111.0",
|
|
41
41
|
"@aws-sdk/client-route-53": "^3.1111.0",
|
|
42
42
|
"@aws-sdk/client-route-53-domains": "^3.1111.0",
|
|
43
|
-
"@babel/eslint-parser": "^7.25.9",
|
|
44
43
|
"@inquirer/prompts": "^8.5.2",
|
|
45
44
|
"@maka/tar": "^6.2.2",
|
|
46
45
|
"blessed": "^0.1.81",
|
|
@@ -52,7 +51,6 @@
|
|
|
52
51
|
"dotenv": "^17.4.2",
|
|
53
52
|
"ejs": "^6.0.1",
|
|
54
53
|
"elegant-spinner": "^3.0.0",
|
|
55
|
-
"eslint": "^9.13.0",
|
|
56
54
|
"http-proxy": "^1.18.1",
|
|
57
55
|
"humps": "^2.0.1",
|
|
58
56
|
"husky": "^9.1.6",
|
|
@@ -70,6 +68,7 @@
|
|
|
70
68
|
},
|
|
71
69
|
"devDependencies": {
|
|
72
70
|
"@aws-sdk/types": "^3.974.4",
|
|
71
|
+
"@babel/eslint-parser": "^7.25.9",
|
|
73
72
|
"@eslint/js": "^9.13.0",
|
|
74
73
|
"@types/blessed": "^0.1.25",
|
|
75
74
|
"@types/cli-color": "^2.0.6",
|
|
@@ -89,6 +88,7 @@
|
|
|
89
88
|
"concat-stream": "^2.0.0",
|
|
90
89
|
"concurrently": "^10.0.5",
|
|
91
90
|
"esbuild": "^0.28.2",
|
|
91
|
+
"eslint": "^9.13.0",
|
|
92
92
|
"globals": "^17.11.0",
|
|
93
93
|
"jest": "^30.4.2",
|
|
94
94
|
"mkdirp": "^3.0.1",
|