Skip to content

Commit

Permalink
Merge pull request #1668 from altair-graphql/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
imolorhe committed Sep 21, 2021
2 parents 7ec864c + fd40c59 commit 1fb5b83
Show file tree
Hide file tree
Showing 75 changed files with 7,170 additions and 5,791 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
node-version: [12.x]
node-version: [14.x]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -27,6 +27,7 @@ jobs:
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
- run: yarn --frozen-lockfile
- uses: browser-actions/setup-chrome@latest
- uses: nick-invision/retry@v2
with:
timeout_minutes: 15
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
node-version: [12.x]
node-version: [14.x]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x
- run: bin/deploy_docs.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x
- run: yarn --frozen-lockfile
- run: yarn build:ci
- name: Deploy to translate surge.sh
Expand Down
2 changes: 1 addition & 1 deletion chrome-ext-files/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Altair GraphQL Client",
"short_name": "Altair",
"description": "The only graphQL client you'll ever need.",
"version": "4.0.9",
"version": "4.0.10",
"icons": {
"16": "assets/img/altair_logo_128.png",
"48": "assets/img/altair_logo_128.png",
Expand Down
2 changes: 1 addition & 1 deletion cwex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ manifestOptions:
name: Altair GraphQL Client
short_name: Altair
description: A beautiful feature-rich GraphQL client for all platforms
version: 4.0.9
version: 4.0.10
icons:
16: assets/img/altair_logo_128.png
48: assets/img/altair_logo_128.png
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "4.0.9",
"version": "4.0.10",
"registry": "https://registry.npmjs.org/",
"npmClient": "yarn",
"stream": true
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "altair",
"version": "4.0.9",
"version": "4.0.10",
"license": "MIT",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
"description": "The best graphQL client you will ever need",
Expand Down
52 changes: 52 additions & 0 deletions packages/altair-app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
module.exports = {
root: true,
ignorePatterns: [
"projects/**/*"
],
overrides: [
{
files: [
"*.ts"
],
parserOptions: {
project: [
"tsconfig.json",
"e2e/tsconfig.json"
],
tsconfigRootDir: __dirname,
createDefaultProgram: true
},
extends: [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
rules: {
'@angular-eslint/component-selector': [
"error",
{
prefix: "app",
style: "kebab-case",
type: "element"
}
],
'@angular-eslint/directive-selector': [
"error",
{
prefix: "app",
style: "camelCase",
type: "attribute"
}
]
}
},
{
files: [
"*.html"
],
extends: [
"plugin:@angular-eslint/template/recommended"
],
rules: {}
}
]
}
55 changes: 34 additions & 21 deletions packages/altair-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
"maximumWarning": "6kb"
}
],
"optimization": true,
"optimization": {
"scripts": true,
"styles": {
"minify": true,
"inlineCritical": false
},
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
Expand All @@ -55,19 +62,23 @@
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"development": {}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "altair:build"
},
"options": {},
"configurations": {
"production": {
"browserTarget": "altair:build:production"
},
"development": {
"browserTarget": "altair:build:development"
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
Expand Down Expand Up @@ -99,14 +110,12 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json",
"tsconfig.worker.json"
],
"exclude": []
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
Expand All @@ -121,15 +130,16 @@
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "altair:serve"
}
},
"configurations": {}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
"lintFilePatterns": [
"e2e/**/*.ts",
"e2e/**/*.html"
]
}
}
}
Expand All @@ -145,5 +155,8 @@
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"defaultCollection": "@angular-eslint/schematics"
}
}
}
43 changes: 43 additions & 0 deletions packages/altair-app/e2e/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"extends": "../.eslintrc.js",
"ignorePatterns": [
"!**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"e2e/tsconfig.app.json",
"e2e/tsconfig.spec.json",
"e2e/e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"style": "kebab-case"
}
]
}
},
{
"files": [
"*.html"
],
"rules": {}
}
]
}

0 comments on commit 1fb5b83

Please sign in to comment.