diff --git a/.editorconfig b/.editorconfig index 7ef9c59b7..105d8d7d1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,3 +16,11 @@ trim_trailing_whitespace = false block_comment_start = /** block_comment = * block_comment_end = */ + +[*.{d.ts,patch,editorconfig}] +charset = unset +indent_style = unset +indent_size = unset +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset \ No newline at end of file diff --git a/.eslintignore b/.eslintignore index 19a7c4a0d..d21b895c0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,3 +7,4 @@ storybook-static/ _site-dev _site docs/_merged_* +patches/ diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index ca66be255..8cc1b9af6 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -72,7 +72,7 @@ jobs: strategy: matrix: node-version: [12.x, 14.x] - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] steps: - uses: actions/checkout@v2 diff --git a/scripts/sort-package-json.js b/scripts/sort-package-json.js index 2f46efc7f..3db020857 100644 --- a/scripts/sort-package-json.js +++ b/scripts/sort-package-json.js @@ -1,8 +1,8 @@ /* eslint-disable import/no-extraneous-dependencies */ const { exec } = require('child_process'); -const defaults = require('prettier-package-json/src/defaultOptions'); +const defaults = require('prettier-package-json/build/defaultOptions'); -const currOrder = defaults.keyOrder; +const currOrder = defaults.defaultOptions.keyOrder; // move version from position 11 to position 3 currOrder.splice(3, 0, currOrder.splice(11, 1)[0]);