Skip to content

Commit 8575810

Browse files
committed
fix(windows): slash before format
1 parent 2083a33 commit 8575810

File tree

3 files changed

+16
-201
lines changed

3 files changed

+16
-201
lines changed

src/template.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,14 @@ export interface CopyConfig {
8787
export async function copy(args: CopyConfig) {
8888
const templateFiles = await globby(slash(args.templateDir), { dot: true });
8989
for (const sourcePath of templateFiles) {
90-
const relativePath = path.relative(args.templateDir, slash(sourcePath));
91-
const targetPath = slash(
92-
format(path.resolve(args.packageDir, relativePath), args.view)
93-
).replace(/\/gitignore$/, '/.gitignore'); // https://github.com/uetchy/create-create-app/issues/38
90+
const relativePath = path.relative(args.templateDir, sourcePath);
91+
const targetPath = format(
92+
slash(path.resolve(args.packageDir, relativePath)),
93+
args.view
94+
).replace(/gitignore$/, '.gitignore'); // https://github.com/uetchy/create-create-app/issues/38
9495
prepareDirectory(targetPath);
9596

96-
let sourceData = fs.readFileSync(slash(sourcePath));
97+
let sourceData = fs.readFileSync(sourcePath);
9798
let targetData = sourceData;
9899
if (isUtf8(sourceData)) {
99100
targetData = Buffer.from(format(sourceData, args.view));

tests/index.test.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,15 @@ test('template', async () => {
5151
'Test-config',
5252
])
5353
);
54-
expect(readFileSync(join(baseDir, 'test', 'test.code-workspace'), 'utf-8'))
55-
.toBe(`{
56-
"name": "test"
57-
}
58-
`);
54+
expect(
55+
readFileSync(join(baseDir, 'test', 'test.code-workspace'), 'utf-8')
56+
).toContain(`"name": "test"`);
5957
expect(
6058
readFileSync(
61-
join(baseDir, 'test', 'Test-config', 'README-macOS.md'),
59+
join(baseDir, 'test', 'Test-config', 'README-MACOS.md'),
6260
'utf-8'
6361
)
64-
).toBe(`# README (macOS)
65-
`);
62+
).toContain(`# README (macOS)`);
6663
expect(stdout).toContain('Ok you chose macOS');
6764
}, 300000);
6865

0 commit comments

Comments
 (0)