v5.0.0-beta.1

* add pre-commit

* add pre-commit hook

* rename to prettier-sql package.json

* update index.html

* update README

* rename webpack

* add release-it

* release-it json

* add webpack workflow

* add --ignore-scripts flag to skip prepare

* remove travis config

* move test step before build

* add workflow to develop and master push

* add coveralls

* update README.md

* update version

Author: inferrinizzard

.github/workflows/coveralls.yaml

@@ -0,0 +1,32 @@
+name: Coveralls
+
+on:
+  push:
+    branches: [master, develop]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install
+        run: yarn install --ignore-scripts
+
+      - name: Test
+        run: yarn test --coverage
+
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/webpack.yaml

@@ -0,0 +1,30 @@
+name: NodeJS with Webpack
+
+on:
+  pull_request:
+    branches: [master, develop]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install
+        run: yarn install --ignore-scripts
+
+      - name: Test
+        run: yarn test
+
+      - name: Build
+        run: yarn build

.release-it.json

@@ -0,0 +1,36 @@
+{
+	"hooks": {},
+	"git": {
+		"changelog": "git log --pretty=format:\"* %s (%h)\" ${latestTag}...HEAD",
+		"requireCleanWorkingDir": true,
+		"requireBranch": "master",
+		"requireUpstream": true,
+		"requireCommits": false,
+		"addUntrackedFiles": false,
+		"commit": false,
+		"tag": true,
+		"tagAnnotation": "${version}",
+		"push": true,
+		"pushArgs": ["--follow-tags"],
+		"pushRepo": ""
+	},
+	"npm": {
+		"publish": true,
+		"publishPath": ".",
+		"publishArgs": [],
+		"tag": null,
+		"otp": null,
+		"ignoreVersion": true,
+		"skipChecks": false,
+		"timeout": 10
+	},
+	"github": {
+		"release": true,
+		"releaseName": "${version}",
+		"releaseNotes": "git log --pretty=format:\"* %s (%h)\" ${latestTag}...HEAD",
+		"preRelease": true,
+		"draft": false,
+		"skipChecks": false,
+		"web": true
+	}
+}

.travis.yml

@@ -1,4 +1,4 @@
-# SQL Formatter [![NPM version](https://img.shields.io/npm/v/sql-formatter.svg)](https://npmjs.com/package/sql-formatter) [![Build Status](https://travis-ci.org/zeroturnaround/sql-formatter.svg?branch=master)](https://travis-ci.org/zeroturnaround/sql-formatter) [![Coverage Status](https://coveralls.io/repos/github/zeroturnaround/sql-formatter/badge.svg?branch=master)](https://coveralls.io/github/zeroturnaround/sql-formatter?branch=master)
+# SQL Formatter [![NPM version](https://img.shields.io/npm/v/prettier-sql.svg)](https://npmjs.com/package/prettier-sql) ![Dev Build](https://github.com/github/docs/actions/workflows/webpack.yaml/badge.svg?event=push&branch=develop) ![Prod Build](https://github.com/github/docs/actions/workflows/webpack.yaml/badge.svg?event=push&branch=master) [![Coverage Status](https://coveralls.io/repos/github/inferrinizzard/prettier-sql/badge.svg?branch=master)](https://coveralls.io/github/inferrrinizzard/prettier-sql?branch=master)
 
 **SQL Formatter** is a JavaScript library for pretty-printing SQL queries.
 It started as a port of a [PHP Library][], but has since considerably diverged.
@@ -21,7 +21,7 @@ It does not support:
 - Stored procedures.
 - Changing of the delimiter type to something else than `;`.
 
-→ [Try the demo.](https://zeroturnaround.github.io/sql-formatter/)
+→ [Try the demo.](https://inferrinizzard.github.io/prettier-sql/)
 
 # Table of contents
 
@@ -37,15 +37,15 @@ It does not support:
 Get the latest version from NPM:
 
 ```sh
-npm install sql-formatter
+npm install prettier-sql
 ```
 
 ## Usage
 
 ### Usage as library
 
 ```js
-import { format } from 'sql-formatter';
+import { format } from 'prettier-sql';
 
 console.log(format('SELECT * FROM tbl'));
 ```
@@ -97,11 +97,11 @@ WHERE
 
 ### Usage from command line
 
-The CLI tool will be installed under `sql-formatter`
-and may be invoked via `npx sql-formatter`:
+The CLI tool will be installed under `prettier-sql`
+and may be invoked via `npx prettier-sql`:
 
 ```sh
-sql-formatter -h
+prettier-sql -h
 ```
 
 ```
@@ -128,7 +128,7 @@ By default, the tool takes queries from stdin and processes them to stdout but
 one can also name an input file name or use the `--output` option.
 
 ```sh
-echo 'select * from tbl where id = 3' | sql-formatter
+echo 'select * from tbl where id = 3' | prettier-sql
 ```
 
 ```sql
@@ -184,7 +184,7 @@ npm run check
 
 ## License
 
-[MIT](https://github.com/zeroturnaround/sql-formatter/blob/master/LICENSE)
+[MIT](https://github.com/inferrinizzard/prettier-sql/blob/master/LICENSE)
 
 [php library]: https://github.com/jdorn/sql-formatter
 [standard sql]: https://en.wikipedia.org/wiki/SQL:2011

README.md

@@ -4,17 +4,17 @@
 	<head>
 		<meta charset="utf-8" />
 
-		<title>SQL formatter</title>
-		<meta name="description" content="A whitespace formatter for different query languages" />
+		<title>Prettier SQL Formatter</title>
+		<meta property="og:title" content="Prettier SQL" />
 
-		<meta property="og:title" content="SQL Formatter" />
+		<meta name="description" content="A whitespace formatter for different query languages" />
 		<meta
 			property="og:description"
 			content="A whitespace formatter for different query languages"
 		/>
-		<meta property="og:url" content="https://zeroturnaround.github.io/sql-formatter" />
+		<meta property="og:url" content="https://inferrinizzard.github.io/prettier-sql" />
 
-		<link rel="shortcut icon" href="https://static.zeroturnaround.com/theme55/images/favicon.ico" />
+		<!-- <link rel="shortcut icon" href="https://static.inferrinizzard.com/theme55/images/favicon.ico" /> -->
 
 		<link href="https://fonts.googleapis.com/css?family=Roboto+Mono" rel="stylesheet" />
 
@@ -81,14 +81,14 @@
 
 	<body>
 		<header>
-			<h1>SQL Formatter</h1>
+			<h1>Prettier SQL Formatter</h1>
 
 			<div class="buttons">
-				<a href="https://www.npmjs.com/package/sql-formatter">
-					<img src="https://img.shields.io/npm/v/sql-formatter.svg" height="18" />
+				<a href="https://www.npmjs.com/package/prettier-sql">
+					<img src="https://img.shields.io/npm/v/prettier-sql.svg" height="18" />
 				</a>
 				<iframe
-					src="https://ghbtns.com/github-btn.html?user=zeroturnaround&repo=sql-formatter&type=star&count=true"
+					src="https://ghbtns.com/github-btn.html?user=inferrinizzard&repo=prettier-sql&type=star&count=true"
 					frameborder="0"
 					scrolling="0"
 					width="120px"
@@ -134,13 +134,13 @@ <h1>SQL Formatter</h1>
 		</main>
 
 		<!-- Load from local (for development) -->
-		<script type="text/javascript" src="dist/sql-formatter.js"></script>
+		<script type="text/javascript" src="dist/prettier-sql.js"></script>
 		<!-- Fallback to reading from npm -->
 		<script>
 			window.sqlFormatter ||
 				document.write(
 					unescape(
-						'%3Cscript type="text/javascript" src="https://unpkg.com/sql-formatter@latest/dist/sql-formatter.min.js"%3E%3C/script%3E'
+						'%3Cscript type="text/javascript" src="https://unpkg.com/prettier-sql@latest/dist/prettier-sql.min.js"%3E%3C/script%3E'
 					)
 				);
 		</script>

index.html

@@ -1,11 +1,11 @@
 {
-	"name": "sql-formatter",
-	"version": "5.0.0-beta",
+	"name": "prettier-sql",
+	"version": "5.0.0-beta.1",
 	"description": "Format whitespace in a SQL query to make it more readable",
 	"license": "MIT",
 	"main": "lib/sqlFormatter.js",
 	"bin": {
-		"sql-formatter": "./bin/sqlfmt.js"
+		"prettier-sql": "./bin/sqlfmt.js"
 	},
 	"keywords": [
 		"sql",
@@ -71,12 +71,15 @@
 		"build:umd:min": "webpack --config webpack.prod.js",
 		"build": "npm run build:commonjs && npm run build:umd && npm run build:umd:min"
 	},
+	"pre-commit": [
+		"fix"
+	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/zeroturnaround/sql-formatter.git"
+		"url": "https://github.com/inferrinizzard/prettier-sql.git"
 	},
 	"bugs": {
-		"url": "https://github.com/zeroturnaround/sql-formatter/issues"
+		"url": "https://github.com/inferrinizzard/prettier-sql/issues"
 	},
 	"dependencies": {
 		"argparse": "^2.0.1"
@@ -102,7 +105,9 @@
 		"eslint-plugin-import": "^2.22.0",
 		"eslint-plugin-prettier": "^3.1.4",
 		"jest": "^26.1.0",
+		"pre-commit": "^1.2.2",
 		"prettier": "^2.0.5",
+		"release-it": "^14.11.7",
 		"rimraf": "^3.0.2",
 		"typescript": "^4.3.5",
 		"webpack": "^4.43.0",

package.json

@@ -4,7 +4,7 @@ module.exports = {
 	entry: './src/sqlFormatter.ts',
 	output: {
 		path: path.join(__dirname, 'dist'),
-		filename: 'sql-formatter.js',
+		filename: 'prettier-sql.js',
 		library: 'sqlFormatter',
 		libraryTarget: 'umd',
 	},

webpack.common.js

@@ -5,6 +5,6 @@ module.exports = merge(common, {
 	mode: 'production',
 	devtool: 'source-map',
 	output: {
-		filename: 'sql-formatter.min.js',
+		filename: 'prettier-sql.min.js',
 	},
 });