diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45399b2cf..e60d38b49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,5 +28,4 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - fail_ci_if_error: true - \ No newline at end of file + fail_ci_if_error: false diff --git a/packages/generate-project/CHANGELOG.md b/packages/generate-project/CHANGELOG.md index 9a6e07588..f553e5648 100644 --- a/packages/generate-project/CHANGELOG.md +++ b/packages/generate-project/CHANGELOG.md @@ -1,5 +1,10 @@ # `@iceworks/generate-project` +## 2.0.5 + +- [fix] support custom files in package.json when generating project +- [fix] support new files generating of dot filenames + ## 2.0.4 - [fix] do not remove publishConfig in package.json diff --git a/packages/generate-project/package.json b/packages/generate-project/package.json index 668a46e63..cfe0a2241 100644 --- a/packages/generate-project/package.json +++ b/packages/generate-project/package.json @@ -1,6 +1,6 @@ { "name": "@iceworks/generate-project", - "version": "2.0.4", + "version": "2.0.5", "description": "Generator project", "files": [ "lib/" diff --git a/packages/generate-project/src/formatFilename.ts b/packages/generate-project/src/formatFilename.ts index 5995d0448..f1881d051 100644 --- a/packages/generate-project/src/formatFilename.ts +++ b/packages/generate-project/src/formatFilename.ts @@ -11,11 +11,14 @@ export default function formatFilename(filename: string) { '_eslintignore', '_stylelintrc.js', '_stylelintrc.cjs', + '_stylelintrc.mjs', '_stylelintrc', '_stylelintignore', '_editorconfig', '_prettierrc.js', '_prettierignore', + '_prettierrc.mjs', + '_prettierrc.mts', ]; if (dotFilenames.indexOf(filename) !== -1) { // _eslintrc.js -> .eslintrc.js diff --git a/packages/generate-project/src/formatPkgJson.ts b/packages/generate-project/src/formatPkgJson.ts index 341284fc6..378dd2db8 100644 --- a/packages/generate-project/src/formatPkgJson.ts +++ b/packages/generate-project/src/formatPkgJson.ts @@ -14,7 +14,12 @@ export default async function formatPkgJson(projectDir: string) { } function deleteFields(pkgJsonContent: Record) { - delete pkgJsonContent.files; + if (pkgJsonContent.npmFiles) { + pkgJsonContent.files = pkgJsonContent.npmFiles; + } else { + delete pkgJsonContent.files; + } + delete pkgJsonContent.npmFiles; return pkgJsonContent; }