testea/test-repo
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source 
# Conflicts:
#	.github/workflows/dev-test.yml
#	jest.config.mjs
#	package.json
#	scripts/vendors/vendor-meta.json
#	scripts/vendors/vendors.mjs
#	src/cli/format.js
#	src/cli/options/create-minimist-options.js
#	src/cli/options/parse-cli-arguments.js
#	src/cli/usage.js
#	src/cli/utils.js
#	src/common/create-ignorer.js
#	src/common/load-plugins.js
#	src/config/resolve-config.js
#	src/index.js
#	src/language-css/utils/css-units.evaluate.js
#	src/language-html/ast.js
#	src/language-html/print-preprocess.js
#	src/language-html/utils/index.js
#	src/main/multiparser.js
#	tests/format/markdown/auto-link/jsfmt.spec.js
#	tests/integration/__tests__/__snapshots__/config-resolution.js.snap
#	tests/integration/__tests__/__snapshots__/with-config-precedence.js.snap
#	tests/integration/__tests__/file-info.js
#	yarn.lock
This commit is contained in:
fisker Cheung committed 2022-04-25 14:28:27 +08:00
2 parents 001f8fb086 586a4b2a87
commit a85f38f096
142 files changed
+2792 -1992
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/bundler-friendly.yml
+2 -2
View File
@@ -30,7 +30,7 @@ jobs:
run: yarn build
- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist
path: dist
@@ -50,7 +50,7 @@ jobs:
uses: actions/setup-node@v2.5.1
- name: Download Artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
.github/workflows/dev-test.yml
+9 -8
View File
@@ -19,20 +19,21 @@ jobs:
- "macos-latest"
- "windows-latest"
node:
- "18"
- "16"
- "14"
include:
# only enable coverage on the fastest job
- os: "ubuntu-latest"
node: "16"
node: "18"
ENABLE_CODE_COVERAGE: true
FULL_TEST: true
CHECK_TEST_PARSERS: true
# exclude:
# - os: "macos-latest"
# node: "14"
# - os: "windows-latest"
# node: "14"
exclude:
- os: "macos-latest"
node: "16"
- os: "windows-latest"
node: "16"
env:
ENABLE_CODE_COVERAGE: ${{ matrix.ENABLE_CODE_COVERAGE }}
FULL_TEST: ${{ matrix.FULL_TEST }}
@@ -75,7 +76,7 @@ jobs:
run: yarn c8 yarn test:format --maxWorkers=2
- name: Upload Coverage
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.0
if: ${{ matrix.ENABLE_CODE_COVERAGE }}
with:
fail_ci_if_error: true
@@ -87,7 +88,7 @@ jobs:
# PRETTIER_FALLBACK_RESOLVE: true
# - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
# uses: codecov/codecov-action@v2.1.0
# uses: codecov/codecov-action@v3.1.0
# if: ${{ matrix.ENABLE_CODE_COVERAGE }}
# with:
# fail_ci_if_error: true
.github/workflows/prod-test.yml
+10 -5
View File
@@ -28,7 +28,7 @@ jobs:
run: yarn build
- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dist
path: dist
@@ -50,7 +50,7 @@ jobs:
run: yarn install --frozen-lockfile
- name: Download Artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
@@ -68,16 +68,21 @@ jobs:
- "macos-latest"
- "windows-latest"
node:
- "18"
- "16"
- "14"
- "12"
include:
- os: "ubuntu-latest"
node: "16"
node: "18"
FULL_TEST: true
exclude:
- os: "macos-latest"
node: "16"
- os: "macos-latest"
node: "14"
- os: "windows-latest"
node: "16"
- os: "windows-latest"
node: "14"
env:
@@ -103,7 +108,7 @@ jobs:
run: yarn install --frozen-lockfile
- name: Download Artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist
@@ -145,7 +150,7 @@ jobs:
node-version: "0.10.48"
- name: Download Artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: dist
path: dist