Skip to content

Commit 37c29e3

Browse files
committed
revert
1 parent fc44524 commit 37c29e3

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<a href="https://npmjs.com/package/@selemondev/create-vue3-app">
1313
<img alt="npm-downloads-src" src="https://img.shields.io/npm/dm/@selemondev/create-vue3-app.svg?style=flat&colorA=020420&colorB=00DC82" />
1414
</a>
15-
<a href="https://pkg-size.dev/@selemondev/create-vue3-app@0.0.7">
16-
<img src="https://pkg-size.dev/badge/bundle/841364" title="Bundle size for @selemondev/create-vue3-app">
17-
</a>
1815
</p>
1916

2017
The Next Generation Vue Scaffolding Tool powered by Vite 🛠️

src/utils/ejsRender.ts

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
import ejs from "ejs";
22
import fs from 'fs-extra'
33
import path from "path";
4-
import { format as prettierFormatter } from "prettier/standalone"
5-
import parserBabel from "prettier/parser-babel";
6-
import parserEstree from "prettier/plugins/estree";
4+
import { format, resolveConfig } from "prettier";
5+
import { fileURLToPath } from "node:url";
6+
import { dirname } from "path";
77
import options from '../core/utils/vue/options'
88

99
// formatting the code
1010

1111
export async function ejsRender(filePath: string, name: string): Promise<void> {
1212
try {
13+
const __filename = fileURLToPath(import.meta.url);
14+
const __dirname = dirname(__filename);
1315
let prettierCode: string = '';
1416

17+
const language = options.useTypeScript ? 'vue-ts' : 'vue-js';
18+
19+
const templatePath = path.resolve(__dirname, `../template/${language}`)
20+
1521
const file = path.parse(filePath);
1622

1723
const dest = path.resolve(process.cwd(), name)
@@ -24,39 +30,37 @@ export async function ejsRender(filePath: string, name: string): Promise<void> {
2430

2531
const code = ejs.render(templateCode.toString(), options);
2632

27-
const extensionName = path.extname(filePath).replace(/[.]/g, '')
33+
const extname = path.extname(filePath).replace(/[.]/g, '')
34+
const opts = await resolveConfig(templatePath)
2835

2936
try {
30-
switch (extensionName) {
37+
switch (extname) {
3138
case 'ts':
3239
case 'tsx':
3340
case 'jsx':
3441
case 'js':
35-
prettierCode = await prettierFormatter(code, {
42+
prettierCode = await format(code, {
3643
parser: 'babel',
37-
plugins: [parserBabel, parserEstree]
44+
...opts
3845
});
3946
break;
4047
case 'json':
41-
prettierCode = await prettierFormatter(code, {
48+
prettierCode = await format(code, {
4249
parser: "json",
43-
plugins: [parserBabel, parserEstree]
50+
...opts
4451
});
4552
break;
4653
case 'cjs':
47-
prettierCode = await prettierFormatter(code, {
54+
prettierCode = await format(code, {
4855
parser: "babel",
49-
plugins: [parserBabel, parserEstree]
56+
...opts
5057
});
5158
break;
5259
case 'toml':
53-
prettierCode = code
54-
break;
55-
case '':
5660
prettierCode = code
5761
break
5862
default:
59-
prettierCode = await prettierFormatter(code, { parser: extensionName })
63+
prettierCode = await format(code, { parser: extname })
6064
break
6165
}
6266
} catch (err) {

0 commit comments

Comments
 (0)