diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..7d146f00a4 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,13 @@ + +node_modules/ + +# output directories +dist/ +ts-dist/ + + +# We don't need prettier here +*.md +*.yaml +*.yml +guides/ diff --git a/.prettierrc.json b/.prettierrc.json index d440171380..d6531530cd 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,25 @@ { - "singleQuote": true, - "trailingComma": "es5", - "printWidth": 100 + "printWidth": 100, + "plugins": [], + "overrides": [ + { + "files": ["**/*.{js,ts,cjs,mjs,cts,mts,cts}"], + "options": { + "singleQuote": true, + "trailingComma": "es5" + } + }, + { + "files": ["*.json"], + "options": { + "singleQuote": false + } + }, + { + "files": ["*.hbs"], + "options": { + "singleQuote": false + } + } + ] } diff --git a/.watchmanconfig b/.watchmanconfig index 55db62769e..bfc5548862 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,4 +1,4 @@ { "fsevents_latency": 0.02, - "ignore_dirs": [ "tmp" ] + "ignore_dirs": ["tmp"] } diff --git a/benchmark/benchmarks/krausest/index.html b/benchmark/benchmarks/krausest/index.html index 8c330daa39..654973d711 100644 --- a/benchmark/benchmarks/krausest/index.html +++ b/benchmark/benchmarks/krausest/index.html @@ -5,7 +5,7 @@ krausest benchmark diff --git a/benchmark/benchmarks/krausest/lib/components/Application.hbs b/benchmark/benchmarks/krausest/lib/components/Application.hbs index 14a919d8d6..69c8c99ad2 100644 --- a/benchmark/benchmarks/krausest/lib/components/Application.hbs +++ b/benchmark/benchmarks/krausest/lib/components/Application.hbs @@ -1,6 +1,6 @@
- {{#each @items as |item|}}{{/each}} -
+ {{#each @items as |item|}}{{/each}} + -
+ \ No newline at end of file diff --git a/benchmark/benchmarks/krausest/lib/components/Row.hbs b/benchmark/benchmarks/krausest/lib/components/Row.hbs index 21f1298de4..323bfa2f00 100644 --- a/benchmark/benchmarks/krausest/lib/components/Row.hbs +++ b/benchmark/benchmarks/krausest/lib/components/Row.hbs @@ -1,6 +1,9 @@ {{@item.id}} {{@item.label}} - + - + \ No newline at end of file diff --git a/benchmark/bin/control.js b/benchmark/bin/control.js index c476f26c0a..61304ad222 100644 --- a/benchmark/bin/control.js +++ b/benchmark/bin/control.js @@ -1,4 +1,3 @@ - const express = require('express'); const app = express(); diff --git a/benchmark/bin/experiment.js b/benchmark/bin/experiment.js index 11bbb5ca0b..08079a4a37 100644 --- a/benchmark/bin/experiment.js +++ b/benchmark/bin/experiment.js @@ -1,4 +1,3 @@ - const express = require('express'); const app = express(); diff --git a/benchmark/lib/build.js b/benchmark/lib/build.js index 03a806f23f..0315a2cb58 100644 --- a/benchmark/lib/build.js +++ b/benchmark/lib/build.js @@ -1,6 +1,5 @@ // @ts-check - const path = require('path'); const rollup = /** @type {{rollup: import("rollup").rollup}} */ ( /** @type {unknown} */ @@ -42,7 +41,6 @@ async function build(dist, out) { }), terser({ compress: { - negate_iife: false, sequences: 0, }, diff --git a/bin/package.json b/bin/package.json index 7b52d9822e..486b31a09b 100644 --- a/bin/package.json +++ b/bin/package.json @@ -2,17 +2,18 @@ "name": "@glimmer-workspace/bin", "private": true, "dependencies": { - "puppeteer-chromium-resolver": "^20.0.0", - "chalk": "^5.2.0", - "execa": "^7.1.1", - "js-yaml": "^4.1.0", - "glob": "^10.2.3", "@types/glob": "^8.1.0", "@types/js-yaml": "^4.0.5", "@types/node": "^18.16.7", - "@types/puppeteer-chromium-resolver": "workspace:^" + "@types/puppeteer-chromium-resolver": "workspace:^", + "chalk": "^5.2.0", + "execa": "^7.1.1", + "glob": "^10.2.3", + "js-yaml": "^4.1.0", + "puppeteer-chromium-resolver": "^20.0.0" }, "devDependencies": { + "eslint": "^8.54.0", "esno": "^0.16.3" }, "engines": { @@ -25,4 +26,4 @@ "test:lint": "eslint .", "test:types": "tsc --noEmit -p ./tsconfig.json" } -} \ No newline at end of file +} diff --git a/index.html b/index.html index 1c25f9143b..90d872e547 100644 --- a/index.html +++ b/index.html @@ -10,19 +10,19 @@ // Do this first so that `@glimmer-workspace/integration-tests` will see the global // `QUnit`. We should change the code structure here so that we don't // rely on the global to bootstrap QUnit, but this is fine for now. - const QUnit = await import('qunit'); + const QUnit = await import("qunit"); QUnit.config.autostart = false;