From dc8958440e623bccc52821e0ba64fe52e2a5541d Mon Sep 17 00:00:00 2001 From: David Wheatley <hi@davwheat.dev> Date: Fri, 30 Jul 2021 12:18:20 +0100 Subject: [PATCH] Use organization Prettier config (#2967) * Use organization Prettier config * Bump version to 1.0.0 * Update workflow * Use npm ci and package.json script --- framework/core/.github/workflows/lint.yml | 8 ++++++-- framework/core/js/.prettierrc.json | 6 ------ framework/core/js/package-lock.json | 13 +++++++++++++ framework/core/js/package.json | 2 ++ 4 files changed, 21 insertions(+), 8 deletions(-) delete mode 100644 framework/core/js/.prettierrc.json diff --git a/framework/core/.github/workflows/lint.yml b/framework/core/.github/workflows/lint.yml index 04441d5c9..9c593e3aa 100644 --- a/framework/core/.github/workflows/lint.yml +++ b/framework/core/.github/workflows/lint.yml @@ -23,6 +23,10 @@ jobs: with: node-version: "14" - - name: Check JS formatting - run: npx prettier --check src + - name: Install JS dependencies + run: npm ci + working-directory: ./js + + - name: Check JS formatting + run: npm run format-check working-directory: ./js diff --git a/framework/core/js/.prettierrc.json b/framework/core/js/.prettierrc.json deleted file mode 100644 index 944d65352..000000000 --- a/framework/core/js/.prettierrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "printWidth": 150, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "es5" -} diff --git a/framework/core/js/package-lock.json b/framework/core/js/package-lock.json index 8c3f5f7c0..97ee47fad 100644 --- a/framework/core/js/package-lock.json +++ b/framework/core/js/package-lock.json @@ -22,6 +22,7 @@ }, "devDependencies": { "@babel/preset-typescript": "^7.13.0", + "@flarum/prettier-config": "^1.0.0", "@types/jquery": "^3.5.5", "@types/mithril": "^2.0.7", "@types/punycode": "^2.1.0", @@ -1477,6 +1478,12 @@ "to-fast-properties": "^2.0.0" } }, + "node_modules/@flarum/prettier-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@flarum/prettier-config/-/prettier-config-1.0.0.tgz", + "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==", + "dev": true + }, "node_modules/@polka/url": { "version": "1.0.0-next.12", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz", @@ -8870,6 +8877,12 @@ "to-fast-properties": "^2.0.0" } }, + "@flarum/prettier-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@flarum/prettier-config/-/prettier-config-1.0.0.tgz", + "integrity": "sha512-3/AcliIi5jPt4i7COb5hsLv6hm4EeXT9yI9I2EuEvhPi2QR+O9Y/8wrqRuO5mDkRzCIhUY+mjIL/f9770Zwfqg==", + "dev": true + }, "@polka/url": { "version": "1.0.0-next.12", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz", diff --git a/framework/core/js/package.json b/framework/core/js/package.json index 2e17c875c..6d3c1a345 100644 --- a/framework/core/js/package.json +++ b/framework/core/js/package.json @@ -1,6 +1,7 @@ { "private": true, "name": "@flarum/core", + "prettier": "@flarum/prettier-config", "dependencies": { "@askvortsov/rich-icu-message-formatter": "^0.1.0", "@ultraq/icu-message-formatter": "^0.10.1", @@ -18,6 +19,7 @@ }, "devDependencies": { "@babel/preset-typescript": "^7.13.0", + "@flarum/prettier-config": "^1.0.0", "@types/jquery": "^3.5.5", "@types/mithril": "^2.0.7", "@types/punycode": "^2.1.0",