diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 1b763c88..4f10362e 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -4,11 +4,11 @@ on: push: paths: - ".github/workflows/prettier.yml" - - "docs/**" + - "**" pull_request: paths: - ".github/workflows/prettier.yml" - - "docs/**" + - "**" jobs: prettier: @@ -16,8 +16,5 @@ jobs: steps: - uses: actions/checkout@v2 - uses: bahmutov/npm-install@v1 - with: - working-directory: docs - name: Prettier check run: npm run prettier:check - working-directory: docs diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..c3f34429 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,6 @@ +build +node_modules +docs/.docusaurus +/modules +/tools +/zephyr \ No newline at end of file diff --git a/docs/.prettierrc.js b/.prettierrc.js similarity index 100% rename from docs/.prettierrc.js rename to .prettierrc.js diff --git a/docs/.prettierignore b/docs/.prettierignore deleted file mode 100644 index d6fb34a7..00000000 --- a/docs/.prettierignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -build -.docusaurus \ No newline at end of file diff --git a/docs/package-lock.json b/docs/package-lock.json index 0e48a97b..00f72261 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -26,7 +26,6 @@ "eslint-plugin-mdx": "^1.8.2", "eslint-plugin-react": "^7.21.5", "null-loader": "^3.0.0", - "prettier": "2.1.2", "string-replace-loader": "2.3" } }, @@ -11060,18 +11059,6 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, - "node_modules/prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/pretty-error": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", @@ -26707,12 +26694,6 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, - "prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", - "dev": true - }, "pretty-error": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", diff --git a/docs/package.json b/docs/package.json index 5249bcff..24dd8cd2 100644 --- a/docs/package.json +++ b/docs/package.json @@ -9,9 +9,7 @@ "swizzle": "docusaurus swizzle", "deploy": "docusaurus deploy", "clear": "docusaurus clear", - "lint": "eslint . --ext js,jsx,md,mdx", - "prettier:check": "prettier --check .", - "prettier:format": "prettier --write ." + "lint": "eslint . --ext js,jsx,md,mdx" }, "dependencies": { "@docusaurus/core": "^2.0.0-alpha.66", @@ -45,7 +43,6 @@ "eslint-plugin-mdx": "^1.8.2", "eslint-plugin-react": "^7.21.5", "null-loader": "^3.0.0", - "prettier": "2.1.2", "string-replace-loader": "2.3" } } diff --git a/package-lock.json b/package-lock.json index 0b7adaff..4ce8f9ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,29 @@ "packages": { "": { "version": "0.0.0", - "devDependencies": {} + "devDependencies": { + "prettier": "2.2.1" + } + }, + "node_modules/prettier": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", + "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + } + } + }, + "dependencies": { + "prettier": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", + "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "dev": true } } } diff --git a/package.json b/package.json index bc0c8345..f551aa88 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,11 @@ "name": "zmk", "version": "0.0.0", "private": true, - "scripts": {}, - "dependencies": {}, - "devDependencies": {} + "scripts": { + "prettier:check": "prettier --check .", + "prettier:format": "prettier --write ." + }, + "devDependencies": { + "prettier": "2.2.1" + } }