Skip to content

Commit 24f693e

Browse files
authored
Merge pull request #1084 from apptools-lab/fix/update-generator
feat: support new dot file and files field in package.json
2 parents 7ca4dfb + cb0bacd commit 24f693e

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,4 @@ jobs:
2828
- name: Upload coverage to Codecov
2929
uses: codecov/codecov-action@v1
3030
with:
31-
fail_ci_if_error: true
32-
31+
fail_ci_if_error: false

packages/generate-project/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# `@iceworks/generate-project`
22

3+
## 2.0.5
4+
5+
- [fix] support custom files in package.json when generating project
6+
- [fix] support new files generating of dot filenames
7+
38
## 2.0.4
49

510
- [fix] do not remove publishConfig in package.json

packages/generate-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@iceworks/generate-project",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"description": "Generator project",
55
"files": [
66
"lib/"

packages/generate-project/src/formatFilename.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ export default function formatFilename(filename: string) {
1111
'_eslintignore',
1212
'_stylelintrc.js',
1313
'_stylelintrc.cjs',
14+
'_stylelintrc.mjs',
1415
'_stylelintrc',
1516
'_stylelintignore',
1617
'_editorconfig',
1718
'_prettierrc.js',
1819
'_prettierignore',
20+
'_prettierrc.mjs',
21+
'_prettierrc.mts',
1922
];
2023
if (dotFilenames.indexOf(filename) !== -1) {
2124
// _eslintrc.js -> .eslintrc.js

packages/generate-project/src/formatPkgJson.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ export default async function formatPkgJson(projectDir: string) {
1414
}
1515

1616
function deleteFields(pkgJsonContent: Record<string, any>) {
17-
delete pkgJsonContent.files;
17+
if (pkgJsonContent.npmFiles) {
18+
pkgJsonContent.files = pkgJsonContent.npmFiles;
19+
} else {
20+
delete pkgJsonContent.files;
21+
}
22+
delete pkgJsonContent.npmFiles;
1823

1924
return pkgJsonContent;
2025
}

0 commit comments

Comments
 (0)