@maka/maka-cli 5.3.8 → 5.3.9
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/bundle/typescript/package.json +1 -1
- package/bundle/typescript/src/commands/lint.js +5 -1
- package/bundle/typescript/src/commands/lint.js.map +1 -1
- package/bundle/typescript/src/generators/component.js +19 -8
- package/bundle/typescript/src/generators/component.js.map +1 -1
- package/bundle/typescript/src/templates/react/component/component.js.jsx +7 -2
- package/bundle/typescript/src/templates/react/component/component.js.tsx +10 -4
- package/bundle/typescript/src/templates/react/hook/hook.js.tsx +2 -1
- package/bundle/typescript/src/templates/react/test/test.js.jsx +1 -1
- package/bundle/typescript/src/templates/react/test/test.js.tsx +1 -1
- package/bundle/typescript/src/templates/service/eslint/babel.config.js +2 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.9",
|
|
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.",
|
|
@@ -38,6 +38,8 @@ Command.create({
|
|
|
38
38
|
try {
|
|
39
39
|
const appDirectory = this.fsi.findAppDirectory();
|
|
40
40
|
const projectDirectory = this.fsi.findProjectDirectory();
|
|
41
|
+
const config = this.cfg.getMakaProjectConfig();
|
|
42
|
+
const isTypescript = config.engines.js === 'ts' || config.engines.js === 'tsx';
|
|
41
43
|
// Babel just shipped a major v8: @babel/core, @babel/preset-env,
|
|
42
44
|
// @babel/preset-react, @babel/eslint-parser, and
|
|
43
45
|
// @babel/plugin-transform-runtime all now resolve "latest" to a v8
|
|
@@ -58,6 +60,8 @@ Command.create({
|
|
|
58
60
|
await this.pkg.installNpmPackage(missingBabel7Deps.map((pkg) => `${pkg}@^7`).join(' '), { cwd: appDirectory, saveDev: false });
|
|
59
61
|
}
|
|
60
62
|
const babel7DevDeps = ['@babel/preset-env', '@babel/preset-react', '@babel/eslint-parser'];
|
|
63
|
+
if (isTypescript)
|
|
64
|
+
babel7DevDeps.push('@babel/preset-typescript');
|
|
61
65
|
const missingBabel7DevDeps = babel7DevDeps.filter((pkg) => !hasOwnDep(pkg));
|
|
62
66
|
if (missingBabel7DevDeps.length > 0) {
|
|
63
67
|
await this.pkg.installNpmPackage(missingBabel7DevDeps.map((pkg) => `${pkg}@^7`).join(' '), { cwd: appDirectory, saveDev: true });
|
|
@@ -108,7 +112,7 @@ Command.create({
|
|
|
108
112
|
srcPath: 'eslint/babel.config.js',
|
|
109
113
|
destPath: babelConfigPath,
|
|
110
114
|
framework: 'service',
|
|
111
|
-
context: { noRename: true }
|
|
115
|
+
context: { noRename: true, isTypescript }
|
|
112
116
|
});
|
|
113
117
|
}
|
|
114
118
|
const importsDirectory = path.join(appDirectory, 'imports/**/*.{js,jsx,tsx,ts}');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../src/commands/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAMxC,SAAS,cAAc,CAAC,GAAW,EAAE,IAAc;IACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAChD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,YAAY,EAAE,CAAC;IACf,SAAS,EAAE;QACT,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,iDAAiD,EAAE;QAC/F,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,kCAAkC,EAAE;KACpF;IACD,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,yCAAyC;IACpD,WAAW,EACX;;;;;;;;;;GAUC;IACD,QAAQ,EAAE;QACR,iBAAiB;KAClB;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAe;IAChD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../src/commands/lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,17 +60,28 @@ Generator.create({
|
|
|
60
60
|
isComponent: true,
|
|
61
61
|
withTranslations: config.features.withTranslations
|
|
62
62
|
};
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
if (config.features?.withHooks) {
|
|
64
|
+
await this.scaffold.template({
|
|
65
|
+
srcPath: 'hook/hook.js',
|
|
66
|
+
destPath: pathToTemplate + '.js',
|
|
67
|
+
context,
|
|
68
|
+
framework: 'react',
|
|
69
|
+
config
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
await this.scaffold.template({
|
|
74
|
+
srcPath: 'component/component.js',
|
|
75
|
+
destPath: pathToTemplate + '.js',
|
|
76
|
+
context,
|
|
77
|
+
framework: 'react',
|
|
78
|
+
config
|
|
79
|
+
});
|
|
80
|
+
}
|
|
70
81
|
if (config.engines.test !== 'none') {
|
|
71
82
|
await this.scaffold.template({
|
|
72
83
|
srcPath: 'test/test.js',
|
|
73
|
-
destPath: pathToTemplate + '.tests.js',
|
|
84
|
+
destPath: pathToTemplate + '.app-tests.js',
|
|
74
85
|
context,
|
|
75
86
|
framework: 'react',
|
|
76
87
|
config
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/generators/component.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/generators/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,8 @@ class <%= className %> extends Component {
|
|
|
41
41
|
/**
|
|
42
42
|
* This is the main render method, and will rerun anytime either this.state or this.props is changed.
|
|
43
43
|
*/
|
|
44
|
-
render() {<% if
|
|
44
|
+
render() {<% if(clientGraphql === 'apollo') { %>
|
|
45
|
+
// Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations) { %>
|
|
45
46
|
const { t } = this.props;<% } %>
|
|
46
47
|
return (
|
|
47
48
|
<div id="<%= cssCaseName %>">
|
|
@@ -50,5 +51,9 @@ class <%= className %> extends Component {
|
|
|
50
51
|
);
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
|
-
|
|
54
|
+
<% if (withTranslations) { %>
|
|
55
|
+
const <%= className %>WithTranslation = withTranslation()(<%= className %>);
|
|
56
|
+
export { <%= className %>WithTranslation as <%= className %> };
|
|
57
|
+
<% } else { %>
|
|
54
58
|
export { <%= className %> };
|
|
59
|
+
<% } %>
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as React from 'react';<% if (withTranslations) { %>
|
|
2
|
-
import { withTranslation } from 'react-i18next';<% } %>
|
|
2
|
+
import { withTranslation, WithTranslation } from 'react-i18next';<% } %>
|
|
3
3
|
<% if (isLayout) { %>
|
|
4
4
|
import { Outlet } from 'react-router-dom';
|
|
5
5
|
<% }%>
|
|
6
6
|
|
|
7
|
-
interface I<%= className %> {
|
|
7
|
+
interface I<%= className %><% if (withTranslations) { %> extends WithTranslation<% } %> {
|
|
8
8
|
props: object;
|
|
9
9
|
state: object;
|
|
10
10
|
}
|
|
@@ -28,6 +28,7 @@ class <%= className %> extends React.Component<I<%= className %>> {
|
|
|
28
28
|
*/
|
|
29
29
|
constructor(props: I<%= className %>) {
|
|
30
30
|
super(props);
|
|
31
|
+
this.state = {};
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
/**
|
|
@@ -46,7 +47,8 @@ class <%= className %> extends React.Component<I<%= className %>> {
|
|
|
46
47
|
/**
|
|
47
48
|
* This is the main render method, and will rerun anytime either this.state or this.props is changed.
|
|
48
49
|
*/
|
|
49
|
-
render() {<% if
|
|
50
|
+
render() {<% if(clientGraphql === 'apollo') { %>
|
|
51
|
+
// Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations) { %>
|
|
50
52
|
const { t } = this.props;<% } %>
|
|
51
53
|
return (
|
|
52
54
|
<div id="<%= cssCaseName %>">
|
|
@@ -55,5 +57,9 @@ class <%= className %> extends React.Component<I<%= className %>> {
|
|
|
55
57
|
);
|
|
56
58
|
}
|
|
57
59
|
}
|
|
58
|
-
|
|
60
|
+
<% if (withTranslations) { %>
|
|
61
|
+
const <%= className %>WithTranslation = withTranslation()(<%= className %>);
|
|
62
|
+
export { <%= className %>WithTranslation as <%= className %> };
|
|
63
|
+
<% } else { %>
|
|
59
64
|
export { <%= className %> };
|
|
65
|
+
<% } %>
|
|
@@ -5,7 +5,8 @@ import { Outlet } from 'react-router-dom';
|
|
|
5
5
|
<% }%>
|
|
6
6
|
|
|
7
7
|
function <%= className %>(props) {
|
|
8
|
-
<% if
|
|
8
|
+
<% if(clientGraphql === 'apollo') { %>
|
|
9
|
+
//const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations) { %>
|
|
9
10
|
const { t } = useTranslation();<% } %>
|
|
10
11
|
|
|
11
12
|
return (
|
|
@@ -31,7 +31,7 @@ describe('<<%= className %>/>', function() {
|
|
|
31
31
|
</MockedProvider>
|
|
32
32
|
);<% } else { %>
|
|
33
33
|
const <%=camelCaseName%> = render(<<%= className %>/>);<% } %>
|
|
34
|
-
const testMessage = <% if (isLayout) { %>''<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
34
|
+
const testMessage = <% if (isLayout) { %>''<% } else if (withTranslations) { %>'<h2>example</h2>'<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
35
35
|
const node = <%=camelCaseName%>.container.querySelector('#<%=cssCaseName%>');
|
|
36
36
|
<% if (test === 'mocha') { %>expect(node.innerHTML).equals(testMessage);<% } else { %>expect(node.innerHTML).toBe(testMessage);<% } %>
|
|
37
37
|
});
|
|
@@ -31,7 +31,7 @@ describe('<<%= className %>/>', function() {
|
|
|
31
31
|
</MockedProvider>
|
|
32
32
|
);<% } else { %>
|
|
33
33
|
const <%=camelCaseName%> = render(<<%= className %>/>);<% } %>
|
|
34
|
-
const testMessage = <% if (isLayout) { %>''<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
34
|
+
const testMessage = <% if (isLayout) { %>''<% } else if (withTranslations) { %>'<h2>example</h2>'<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
|
|
35
35
|
const node = <%=camelCaseName%>.container.querySelector('#<%=cssCaseName%>');
|
|
36
36
|
<% if (test === 'mocha') { %>expect(node.innerHTML).equals(testMessage);<% } else { %>expect(node.innerHTML).toBe(testMessage);<% } %>
|
|
37
37
|
});
|
|
@@ -3,7 +3,8 @@ module.exports = {
|
|
|
3
3
|
presets: [
|
|
4
4
|
'meteor',
|
|
5
5
|
'@babel/preset-env',
|
|
6
|
-
['@babel/preset-react', { runtime: 'automatic' }]
|
|
6
|
+
['@babel/preset-react', { runtime: 'automatic' }],<% if (isTypescript) { %>
|
|
7
|
+
'@babel/preset-typescript',<% } %>
|
|
7
8
|
],
|
|
8
9
|
plugins: [
|
|
9
10
|
'@babel/plugin-syntax-jsx',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maka/maka-cli",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.9",
|
|
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.",
|