From ba2c209fcedf5b5b6788036bb2ad7b186ccc889f Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Wed, 20 Oct 2021 15:48:05 +0300 Subject: [PATCH] chore(workflow): add lint step --- .github/workflows/build.yml | 46 +++++++++++++++++++++++++++++++++++++ api/package.json | 9 +++----- package.json | 14 +++++++++++ 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 package.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3c233a..98b4d3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,25 @@ on: pull_request: jobs: + lint: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [12.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 Dependencies + run: npm ci + - name: Check Api Code Style + run: npm run lint-api + - name: Check Web Code Style + run: npm run lint-web build-api: runs-on: ubuntu-latest @@ -32,3 +51,30 @@ jobs: run: npm run build env: CI: true + build-web: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [12.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 Dependencies + working-directory: ./web + run: npm ci + - name: Check Code Style + working-directory: ./web + run: npm run lint + - name: Run Unit Tests + working-directory: ./web + run: npm test + - name: Build Package + working-directory: ./web + run: npm run build + env: + CI: true diff --git a/api/package.json b/api/package.json index 13d4716..4ecd2a0 100644 --- a/api/package.json +++ b/api/package.json @@ -1,7 +1,7 @@ { - "name": "server", + "name": "api", "version": "0.0.1", - "description": "SASjs server", + "description": "Api of SASjs server", "main": "./src/server.ts", "scripts": { "start": "nodemon ./src/server.ts", @@ -9,9 +9,7 @@ "build": "rimraf build && tsc", "semantic-release": "semantic-release -d", "prepare": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true", - "test": "mkdir -p tmp && jest --coverage", - "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", - "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"" + "test": "mkdir -p tmp && jest --coverage" }, "release": { "branches": [ @@ -32,7 +30,6 @@ "@types/supertest": "^2.0.11", "jest": "^27.0.6", "nodemon": "^2.0.7", - "prettier": "^2.3.1", "rimraf": "^3.0.2", "semantic-release": "^17.4.3", "supertest": "^6.1.3", diff --git a/package.json b/package.json new file mode 100644 index 0000000..5308b05 --- /dev/null +++ b/package.json @@ -0,0 +1,14 @@ +{ + "name": "server", + "version": "0.0.1", + "description": "NodeJS wrapper for calling the SAS binary executable", + "scripts": { + "lint-api:fix": "npx prettier --write \"api/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", + "lint-api": "npx prettier --check \"api/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", + "lint-web:fix": "npx prettier --write \"web/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", + "lint-web": "npx prettier --check \"web/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"" + }, + "devDependencies": { + "prettier": "^2.3.1" + } +} \ No newline at end of file