diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 38d37654..d846cca7 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -1,9 +1,6 @@ name: Check JavaScript for conformance with Prettier -on: - push: - paths: - - 'datasette/static/*' +on: [push] jobs: prettier: @@ -15,9 +12,11 @@ jobs: name: Configure npm caching with: path: ~/.npm - key: ${{ runner.os }}-npm-${{ hashFiles('**/workflows/prettier.yml') }} + key: ${{ runner.OS }}-npm-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-npm- + ${{ runner.OS }}-npm- + - name: Install dependencies + run: npm ci - name: Run prettier run: |- - npx prettier --check 'datasette/static/*[!.min].js' + npx --no-install prettier --check 'datasette/static/*[!.min].js' diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..06623e6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,32 @@ +{ + "name": "datasette", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "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 new file mode 100644 index 00000000..67452d2f --- /dev/null +++ b/package.json @@ -0,0 +1,7 @@ +{ + "name": "datasette", + "private": true, + "devDependencies": { + "prettier": "^2.2.1" + } +}