Merge pull request #1161 from imolorhe/move-to-altair-angular

Move to altair-app

.appveyor.yml

@@ -43,7 +43,7 @@ test_script:
 # - npm --version
 # - npm run test-build
 - yarn --version
-- yarn test-build
+- yarn lerna run --scope altair-app test --stream
 
 build: off # We do not intend to build using MS Build
 

.hound.yml

@@ -1,4 +1,4 @@
 jshint:
-  config_file: .jshintrc
+  config_file: .github/.jshintrc
 scss:
-  config_file: .scss-lint.yml
+  config_file: .github/.scss-lint.yml

.travis.yml

@@ -27,20 +27,17 @@ before_install:
 before_script:
 - yarn global add @angular/cli karma lerna surge
 - yarn
-- yarn build
 - npm config set //registry.npmjs.org/:_authToken=${NPM_TOKEN}
 - yarn config set //registry.npmjs.org/:_authToken=${NPM_TOKEN}
 # - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc
 script:
-- ng lint
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-single-run; fi # Test altair itself
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn webdriver-update-ci; ng e2e --webdriver-update=false; fi # Run e2e test
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-all:ci; fi # All other tests e.g. lerna, electron, etc
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test:ci; fi # All other tests except e2e
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn lerna run --scope altair-app webdriver-update-ci; yarn lerna run --scope altair-app e2e:ci; fi # Run e2e test
 after_success:
   - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then if [ ! -z "$SURGE_TOKEN" ]; then chmod ugo+x bin/surge_deploy.sh; bin/surge_deploy.sh; fi fi
 before_deploy:
 - if [ ! -z "$TRAVIS_TAG" ]; then yarn build-electron; fi
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn build; fi # Need to generate files for deployment
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn build-app; fi # Need to generate files for deployment
 deploy:
 - provider: releases
   api_key:
@@ -59,7 +56,7 @@ deploy:
   on:
     branch: master
 - provider: surge
-  project: ./dist
+  project: ./packages/altair-app/dist
   domain: altair-gql-translate.surge.sh
   skip_cleanup: true
   on:

README.md

@@ -156,7 +156,7 @@ AltairGraphQL.init({
 
 ## Community 🙏🏾
 
-You can learn more about how to get help [here](community.md).
+You can learn more about how to get help [here](.github/community.md).
 
 ## Contributing
 

bin/chrome_ext.sh

@@ -13,7 +13,7 @@ rm altair.zip
 mkdir chrome-extension
 
 # Copy the files from the dist folder into the chrome-extension directory
-cp -r dist/* chrome-extension
+cp -r packages/altair-app/dist/* chrome-extension
 
 
 sed -i '' "s|</body>|<script src='js/init.js'></script></body>|g" ./chrome-extension/index.html

bin/package_electron_app.sh

@@ -20,9 +20,9 @@
 # Package the electron app
 # ./node_modules/electron-packager/cli.js . Altair --out=electron-builds --overwrite --icon=electron/logo.icns
 
-./node_modules/.bin/lerna bootstrap
+yarn lerna bootstrap
 
-./node_modules/.bin/lerna run --scope altair-electron build
+yarn lerna run --scope altair-electron build
 
 # Snippet:
 # Remove git tags

bin/publish_packages.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ng build --outputHashing=none --prod --aot --stats-json
+yarn ng build --outputHashing=none --prod --aot --stats-json
 
 # Get new tags from remote
 git fetch --tags
@@ -10,5 +10,5 @@ LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
 
 # Checkout latest tag
 # git checkout $LATEST_TAG
-lerna bootstrap
-lerna publish from-git --force-publish=* --no-git-tag-version --no-push --yes
+yarn lerna bootstrap
+yarn lerna publish from-git --force-publish=* --no-git-tag-version --no-push --yes

bin/publish_packages_local.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ng build --outputHashing=none --prod --aot --stats-json
+yarn ng build --outputHashing=none --prod --aot --stats-json
 
 # Get new tags from remote
 git fetch --tags
@@ -10,6 +10,6 @@ LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
 
 # Checkout latest tag
 git checkout $LATEST_TAG
-lerna bootstrap
-lerna publish from-git --force-publish=* --no-git-tag-version --no-push --yes
-git checkout staging
+yarn lerna bootstrap
+yarn lerna publish from-git --force-publish=* --no-git-tag-version --no-push --yes
+git checkout staging

bin/surge_deploy.sh

@@ -5,7 +5,7 @@
 REPO_SLUG_ARRAY=(${TRAVIS_REPO_SLUG//\// })
 REPO_OWNER=${REPO_SLUG_ARRAY[0]}
 REPO_NAME=${REPO_SLUG_ARRAY[1]}
-DEPLOY_PATH=./dist
+DEPLOY_PATH=.packages/altair-app/dist
 
 
 DEPLOY_SUBDOMAIN_UNFORMATTED_LIST=()

crowdin.yml

@@ -1,3 +1,3 @@
 files:
-  - source: /src/assets/i18n/default.json
-    translation: /src/assets/i18n/%locale%.json
+  - source: /packages/altair-app/src/assets/i18n/default.json
+    translation: /packages/altair-app/src/assets/i18n/%locale%.json

firebase.json

@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "public": "dist",
+    "public": "packages/altair-app/dist",
     "ignore": [
       "firebase.json",
       "**/.*",

lerna.json

@@ -4,5 +4,6 @@
   ],
   "version": "2.4.3",
   "registry": "https://registry.npmjs.org/",
-  "npmClient": "yarn"
+  "npmClient": "yarn",
+  "stream": true
 }

package.json

@@ -13,144 +13,26 @@
     "client"
   ],
   "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "start:prod": "node server",
-    "start:prod:translate": "node server --translate",
-    "build": "npm run generate-settings-schema-validator && node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --aot --stats-json",
-    "test": "ng test",
-    "test-single-run": "ng test --watch=false --code-coverage",
-    "test-build": "ng lint && npm run build && npm run test-single-run",
-    "test-all": "npm run build && lerna bootstrap && lerna run test --stream",
-    "test-all:ci": "start-server-and-test start-test-server http://localhost:5400/test test-all",
+    "test": "lerna bootstrap && lerna run test --stream",
+    "test:ci": "start-server-and-test start-test-server http://localhost:5400/test test",
     "start-test-server": "./bin/start_ci_test_server.sh",
-    "local-verify": "ng test --single-run && ng lint && ng e2e && yarn build && lerna bootstrap",
-    "lint": "ng lint",
-    "e2e": "ng e2e",
-    "heroku-postbuild": "npm run build",
-    "build-electron": "npm run build && lerna bootstrap && lerna run --scope altair build --stream",
-    "build-ext": "npm run build && ./bin/chrome_ext.sh",
-    "postinstall": "npm run generate-settings-schema-validator && opencollective postinstall",
+    "local-verify": "npm run build-app && lerna bootstrap",
+    "build-app": "lerna run --scope altair-app build --stream",
+    "build-electron": "lerna bootstrap && lerna run --scope altair build --stream",
+    "build-ext": "npm run build-app && ./bin/chrome_ext.sh",
+    "postinstall": "opencollective postinstall",
     "lerna-publish": "lerna publish from-git --force-publish=* --yes",
-    "publish-packages": "npm run build && lerna bootstrap && npm run lerna-publish",
-    "generate-settings-schema": "./node_modules/.bin/typescript-json-schema --ignoreErrors src/app/reducers/settings/settings.ts State > src/app/utils/settings.schema.json",
-    "compile-settings-schema-validator": "ajv compile -s src/app/utils/settings.schema.json -o src/app/utils/validate_settings_schema.js",
-    "generate-settings-schema-validator": "npm run generate-settings-schema && npm run compile-settings-schema-validator",
-    "webdriver-update-ci": "webdriver-manager update --standalone false --gecko false --versions.chrome=78.0.3904.70",
-    "snyk-protect": "snyk protect",
-    "analyze": "ng build --stats-json && npx webpack-bundle-analyzer dist/stats.json"
+    "publish-packages": "lerna bootstrap && npm run lerna-publish",
+    "snyk-protect": "snyk protect"
   },
   "engines": {
     "node": ">= 6.9.1"
   },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^8.1.2",
-    "@angular/cdk": "^8.1.1",
-    "@angular/cli": "^8.1.2",
-    "@angular/common": "^8.1.2",
-    "@angular/core": "^8.1.2",
-    "@angular/forms": "^8.1.2",
-    "@angular/http": "^7.2.15",
-    "@angular/platform-browser": "^8.1.2",
-    "@angular/platform-browser-dynamic": "^8.1.2",
-    "@angular/platform-server": "^8.1.2",
-    "@angular/router": "^8.1.2",
-    "@beyerleinf/ngx-dnd": "^8.0.2",
-    "@ctrl/ngx-codemirror": "^2.0.0",
-    "@ngrx/effects": "^8.1.0",
-    "@ngrx/store": "^8.1.0",
-    "@ngrx/store-devtools": "^8.1.0",
-    "@ngui/auto-complete": "^2.0.0",
-    "@ngx-translate/core": "^11.0.1",
-    "@ngx-translate/http-loader": "^4.0.0",
-    "@webcomponents/custom-elements": "^1.2.4",
-    "angular-feather": "6.0.4",
-    "body-parser": "^1.19.0",
-    "bootstrap": "^4.3.1",
-    "codemirror": "^5.48.0",
-    "codemirror-graphql": "^0.11.1",
-    "comment-regex": "^1.0.1",
-    "cookie-parser": "^1.4.4",
-    "core-js": "^3.1.4",
-    "curlup": "^1.0.0",
-    "dexie": "^2.0.4",
-    "express": "^4.17.1",
-    "file-dialog": "^0.0.8",
-    "file-saver": "^2.0.2",
-    "graphql": "^14.4.2",
-    "graphql-query-compress": "^1.2.2",
-    "marked": "^0.8.0",
-    "memoizee": "^0.4.14",
-    "mousetrap": "^1.6.3",
-    "mousetrap-global-bind": "^1.1.0",
-    "new-github-issue-url": "^0.2.1",
-    "ng-zorro-antd": "8.5.2",
-    "ngrx-store-localstorage": "^8.0.0",
-    "ngx-contextmenu": "^5.2.0",
-    "ngx-cookie-service": "^2.2.0",
-    "ngx-electron": "^2.1.1",
-    "ngx-markdown": "^8.1.0",
-    "ngx-pipes": "^2.5.6",
-    "ngx-popper": "^7.0.0",
-    "ngx-sortablejs": "^3.1.3",
-    "ngx-take-until-destroy": "^5.4.0",
-    "ngx-toastr": "^11.0.0",
-    "opencollective": "^1.0.3",
-    "popper.js": "^1.15.0",
-    "prettier": "^1.18.2",
-    "rxjs": "^6.5.2",
-    "snyk": "^1.195.0",
-    "sortablejs": "^1.10.0-rc3",
-    "subscriptions-transport-ws": "^0.9.16",
-    "sval": "^0.4.6",
-    "to-snake-case": "^1.0.0",
-    "uuid": "^3.3.2",
-    "valid-url": "^1.0.9",
-    "zone.js": "^0.9.1"
-  },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.21",
-    "@angular/compiler": "^8.1.2",
-    "@angular/compiler-cli": "^8.1.2",
-    "@types/chrome": "^0.0.90",
-    "@types/electron": "^1.6.10",
-    "@types/file-saver": "^2.0.1",
-    "@types/graphql": "^14.2.2",
-    "@types/jasmine": "3.5.0",
-    "@types/memoizee": "^0.4.3",
-    "@types/mousetrap": "^1.6.3",
-    "@types/node": "^13.1.0",
-    "@types/prettier": "^1.19.0",
-    "@types/to-snake-case": "^1.0.0",
-    "@types/uuid": "^3.4.6",
-    "ajv": "^6.10.2",
-    "ajv-cli": "^3.0.0",
-    "babel-plugin-transform-async-to-generator": "^6.24.1",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "codelyzer": "^5.1.0",
-    "jasmine-core": "^3.4.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^4.2.0",
-    "karma-chrome-launcher": "^3.0.0",
-    "karma-cli": "^2.0.0",
-    "karma-coverage-istanbul-reporter": "^2.0.5",
-    "karma-jasmine": "^2.0.1",
-    "karma-jasmine-html-reporter": "1.5.0",
     "lerna": "^3.16.0",
-    "ncp": "^2.0.0",
-    "ngrx-store-freeze": "^0.2.0",
-    "protractor": "^5.4.2",
-    "rxjs-tslint-rules": "^4.24.3",
+    "opencollective": "^1.0.3",
     "start-server-and-test": "^1.10.6",
-    "ts-mocks": "^2.6.1",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^3.4.5",
-    "typescript-json-schema": "^0.42.0",
+    "snyk": "^1.195.0",
     "web-ext": "^4.0.0"
   },
   "repository": {
@@ -170,5 +52,6 @@
     "url": "https://opencollective.com/altair",
     "logo": "https://opencollective.com/altair/logo.txt"
   },
-  "snyk": true
+  "snyk": true,
+  "private": true
 }