Skip to content

Commit

Permalink
Merge branch 'staging' into l10n_staging
Browse files Browse the repository at this point in the history
  • Loading branch information
imolorhe committed Feb 12, 2020
2 parents f62a143 + 141bfed commit 48f07ee
Show file tree
Hide file tree
Showing 13 changed files with 299 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at samuelimolo4real@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at altair@sirmuel.design. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -15,6 +15,7 @@ out/
*.nex
src/app/utils/settings.schema.json
src/app/utils/validate_settings_schema.js
extension-builds/

dist
build
Expand Down
10 changes: 10 additions & 0 deletions bin/ext-update-index.js
@@ -0,0 +1,10 @@
const path = require('path');
const fs = require('fs');
module.exports = ({ extensionFilesDir }) => {
const indexFilePath = path.resolve(extensionFilesDir, 'index.html');
const indexFileStr = fs.readFileSync(indexFilePath, 'utf8');
const output = indexFileStr.replace('</body>', `<script src='js/init.js'></script></body>`);

fs.writeFileSync(indexFilePath, output, 'utf8');
console.log('Updated index.html');
};
33 changes: 33 additions & 0 deletions cwex.yml
@@ -0,0 +1,33 @@
include:
- packages/altair-app/dist/*
- chrome-ext-files/*
exclude:
- dist\/stats\.json
- dist\/assets\/img\/readme
outDir: extension-builds
beforeCompile: bin/ext-update-index.js
manifestOptions:
name: Altair GraphQL Client
shortName: Altair
description: A beautiful feature-rich GraphQL client for all platforms
version: 2.4.3
icons:
16: assets/img/altair_logo_128.png
48: assets/img/altair_logo_128.png
128: assets/img/altair_logo_128.png
browserAction:
defaultIcon: assets/img/altair_logo_128.png
permissions:
- http://*/
- https://*/
- tabs
- storage
- notifications
contentSecurityPolicy: "script-src 'self' 'unsafe-inline' 'sha256-oPmnC5nXVn+02vhnLdwVkTp/s4vphtZzgjwEBldwPHs=' 'sha256-I9mRIuFvittlnAABX/bWvVih++ioTekeCFcwe4j3YTo=' https://cdn.jsdelivr.net; object-src 'self';"
backgroundOptions:
scripts:
- js/background.js
settingsOptions:
page: options.html
openInTab: false
offlineEnabled: true
2 changes: 1 addition & 1 deletion docs/_config.yml
Expand Up @@ -16,7 +16,7 @@
title: Altair GraphQL Client
short_title: Altair GraphQL
logo_url: /assets/img/altair.svg
email: samuelimolo4real@gmail.com
email: altair@sirmuel.design
download_link: https://github.com/imolorhe/altair/releases/latest
description: > # this means to ignore newlines until "baseurl:"
A beautiful feature-rich GraphQL Client IDE for all platforms. Available for MacOS, Windows, Linux, Chrome, Firefox.
Expand Down
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -2,7 +2,7 @@
"name": "altair",
"version": "2.4.3",
"license": "MIT",
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
"description": "The best graphQL client you will ever need",
"homepage": "https://imolorhe.github.io/altair/",
"keywords": [
Expand All @@ -29,10 +29,11 @@
"node": ">= 6.9.1"
},
"devDependencies": {
"cwex": "^1.0.0",
"lerna": "^3.16.0",
"opencollective": "^1.0.3",
"start-server-and-test": "^1.10.6",
"snyk": "^1.195.0",
"start-server-and-test": "^1.10.6",
"web-ext": "^4.0.0"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/altair-app/package.json
Expand Up @@ -4,7 +4,7 @@
"description": "Contains the altair app",
"main": "dist/main.js",
"license": "MIT",
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
"homepage": "https://imolorhe.github.io/altair/",
"scripts": {
"ng": "ng",
Expand Down
2 changes: 1 addition & 1 deletion packages/altair-electron/package.json
Expand Up @@ -4,7 +4,7 @@
"version": "2.4.3",
"description": "Electron wrapper for Altair",
"main": "index.js",
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
"license": "MIT",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/altair-express-middleware/package.json
Expand Up @@ -24,7 +24,7 @@
"express",
"middleware"
],
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design)",
"license": "MIT",
"bugs": {
"url": "https://github.com/imolorhe/altair/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/altair-koa-middleware/package.json
Expand Up @@ -24,7 +24,7 @@
"express",
"middleware"
],
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design)",
"license": "MIT",
"bugs": {
"url": "https://github.com/imolorhe/altair/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/altair-static/package.json
Expand Up @@ -22,7 +22,7 @@
"graphql",
"static"
],
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design)",
"license": "MIT",
"bugs": {
"url": "https://github.com/imolorhe/altair/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-altair-graphql/package.json
Expand Up @@ -18,7 +18,7 @@
"altair",
"graphql"
],
"author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
"author": "Samuel Imolorhe <altair@sirmuel.design> (https://sirmuel.design/)",
"license": "MIT",
"bugs": {
"url": "https://github.com/imolorhe/altair/issues"
Expand Down

0 comments on commit 48f07ee

Please sign in to comment.