Skip to content
Merged
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Commits to leave out of git blame: formatting only. GitHub reads this file; a clone sets
# git config blame.ignoreRevsFile .git-blame-ignore-revs

# Phase 1 of the ES6 conversion, step 10: the one Prettier run over the converted modules
fac32eef19572baff3c9e0ef3e6b44c13cc3025d
18 changes: 4 additions & 14 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,9 @@ test/test238.json
build/

test/lib/
test/coverage/
src/generated/

# Converted modules keep their old indentation until the end of Phase 1 (context/roadmap-phase-1.md)
src/engine/
src/utils/
src/data/
src/select/
src/expression/
src/functions/
src/graph/
src/statements/
src/console/
src/dialects/
src/formats/
src/storage/
src/worker/
# The head and tail of the worker concatenation (build.js) are not files Prettier can parse
src/worker/start.js
src/worker/finish.js
2 changes: 1 addition & 1 deletion docs/src-map.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Source map of the ES6 conversion

One row per numbered file that has moved (`context/roadmap.md`, "The source map"): where its code lives now, what the module exports, and what the wrap added. A fix made against the old file on `develop` is redone in the module this table names when the merge cannot carry it. The body of a moved file keeps its indentation until the end of Phase 1, so git sees the move; the similarity column is `git diff -M --stat` between the file before the move and the module after the wrap.
One row per numbered file that has moved (`context/roadmap.md`, "The source map"): where its code lives now, what the module exports, and what the wrap added. The similarity column is git's figure at the wrap commit, before step 10 formatted every converted module with Prettier in one commit (its hash is in `.git-blame-ignore-revs`, so blame still reaches the numbered files). A fix made against the old file on `develop` is redone in the module this table names when the merge cannot carry it. The body of a moved file keeps its indentation until the end of Phase 1, so git sees the move; the similarity column is `git diff -M --stat` between the file before the move and the module after the wrap.

| Old file | Module | Exports | Installed | Added by the wrap | Similarity |
| --- | --- | --- | --- | --- | --- |
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"test-ci": "(yarn test-format-all || 1) && yarn test-only && yarn install-g && alasql 'select 1 as Succes'",
"test-only": "bun test --dots --preload ./test/bun-setup.js ./test/test[0-9]*.js ./test/test-*.js",
"test-browser": "node test/browserTestRunner.js 7387",
"test-parity": "yarn build-only && bun test/parity/run.js record ref --ref --if-missing && bun test/parity/run.js record new --once && bun test/parity/run.js compare ref new",
"test-parity": "yarn build-only && bun test/parity/run.js record ref-044ab07a --ref 044ab07a --if-missing && bun test/parity/run.js record new --once && bun test/parity/run.js compare ref-044ab07a new",
"test-parity-smoke": "node test/parity/smoke.js --node=$(which node) --pack",
"test-cover": "# istanbul cover -x 'lib/zt/zt.js' --dir test/coverage _mocha",
"build": "yarn format && yarn build-only",
Expand All @@ -40,7 +40,7 @@
"format": "yarn pretty-since-dev --write",
"format-all": "yarn pretty-all --write",
"test-format": "yarn pretty-since-dev --list-different || (echo 'Please correct file formatting using `yarn format` and try again.' && exit 1)",
"test-format-all": "prettier --list-different '{.,src,test}/*.{js,ts,json}' || (echo 'Please correct file formatting using `yarn format-all` and try again.' && exit 1)",
"test-format-all": "prettier --list-different '{.,src,test}/**/*.{js,ts,json}' || (echo 'Please correct file formatting using `yarn format-all` and try again.' && exit 1)",
"pretty-since-dev": "{ git diff --name-only --diff-filter=d origin/develop ; git diff --name-only --diff-filter=d --staged origin/develop ; } | sort | uniq | grep -vE '^dist/|^test/coverage|^lib/|.min.js$' | grep -E '\\.(scss|css|js|ts|vue|json)$' | xargs npx prettier",
"pretty-commit": "{ git diff --name-only --diff-filter=d ; git diff --name-only --diff-filter=d --staged ; } | sort | uniq | grep -vE '^dist/|^test/coverage|^lib/|.min.js$' | grep -E '\\.(scss|css|js|ts|vue|json)$' | xargs npx prettier",
"pretty-all": "git ls-tree --full-tree --name-only -r HEAD | grep -vE '^dist/|^test/coverage|^lib/|.min.js$' | grep -E '\\.(scss|css|js|ts|vue|json)$' | xargs npx prettier",
Expand Down
Loading
Loading