Site Summary Window

.codeclimate.yml

@@ -7,6 +7,11 @@ plugins:
     enabled: true
   fixme:
     enabled: true
+  eslint:
+    enabled: true
+    config:
+      extensions:
+        - .ts
 exclude_patterns:
   - Pods
   - Extern

.envrc

@@ -6,12 +6,11 @@ export XCODE_XIP_FILE=$HOME/Downloads/Xcode_12.2.xip
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export S3_BUCKET="downloads.dev.beamapp.co"
+export S3_PROD_BUCKET="downloads.beamapp.co"
 export AWS_DEFAULT_REGION="eu-west-3"
-export API_BASE_URL="https://api.beamapp.co"
 export PUBLIC_HOSTNAME="app.beamapp.co"
 export SENTRY_HOSTNAME="o477543.ingest.sentry.io"
-export SENTRY_PROJECT="5518785"
-export SCHEME="Beam release"
+export SENTRY_PROJECT="beam-macos"
 export CERT_USERNAME="dev@beamapp.co"
 export TEAM_ID="X87W5M786F"
 export TEAM_NAME="Beam"
@@ -22,8 +21,17 @@ export CERT_OWNER_NAME="Beam"
 export XCODE_INSTALL_USER="dev@beamapp.co"
 export XCODE_VERSION="12.4"
 export XCODE_VERSION_FOR_MACOS_10="12.4"
-export XCODE_VERSION_FOR_MACOS_11="12.5.1"
+export XCODE_VERSION_FOR_MACOS_11="13.2.1"
+export XCODE_VERSION_FOR_MACOS_12="13.2.1"
 export RUBY_VERSION="2.7.2"
-export PNS_STATUS="0"
 export FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT=120
 export BROWSING_TREE_URL="https://beam-python-paul.herokuapp.com/browsing-tree/"
+export PUBLIC_API_EMBED_URL="https://api-proxy.beamapp.co/.netlify/functions/embed"
+export PUBLIC_API_PUBLISH_URL="https://public.beamapp.co"
+export PUBLIC_BUILD_RELEASE_NOTES_URL="https://public.beamapp.co/beam/note/d9205b52-c669-42ce-8af1-91cf25fe23c2/beam-changelog"
+export BROWSING_TREE_API_SYNC_ENABLED=false
+export FIREBASE_PROJECT_ID="iron-figure-294514"
+export FIREBASE_DEV_PROJECT_ID="beamdev-335416"
+export FACEBOOK_APP_ID="1686416238414574"
+export WEB_ONBOARDING_URL="https://welcometour.beamapp.co"
+export MOCK_HTTP_PORT=9980

.eslintrc.js

@@ -0,0 +1,40 @@
+/* eslint-env node */
+module.exports = {
+  root: true,
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    "ecmaVersion": 12,
+    "sourceType": "module"
+  },
+  plugins: [
+    "@typescript-eslint",
+    "unused-imports"
+  ],
+  env: {
+    browser: true
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  rules: {
+    "@typescript-eslint/no-var-requires": ["warn"],
+    "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
+    "@typescript-eslint/no-this-alias": ["off"],
+    semi: ["warn", "never"],
+    quotes: ["warn", "double"],
+    "comma-dangle": ["warn", "never"],
+    "no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
+    "unused-imports/no-unused-vars": [
+      "warn",
+      {
+        "vars": "all",
+        "varsIgnorePattern": "^_",
+        "args": "after-used",
+        "argsIgnorePattern": "^_"
+      }
+    ]
+  },
+  "ignorePatterns": ["*_prod.js", "*.config.js", "dist", "Beam/Classes/Components/Readability/Readability.js"]
+}

.gitattributes

@@ -0,0 +1,6 @@
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.db filter=lfs diff=lfs merge=lfs -text
+*.db-wal filter=lfs diff=lfs merge=lfs -text
+*.db-shm filter=lfs diff=lfs merge=lfs -text
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

.gitignore

@@ -3,11 +3,6 @@
 # Learn more about .gitignore:
 #     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
 
-## Point and Shoot
-Beam/Classes/Components/PointAndShoot/**/.parcel-cache/
-Beam/Classes/Components/PointAndShoot/**/*.js.map
-Beam/Classes/Components/PointAndShoot/**/*_prod.*
-
 package-lock.json
 ## Pods
 Pods/
@@ -81,7 +76,7 @@ iOSInjectionProject/
 # Node artifact files
 node_modules/
 scripts/decrypt/node/node_modules/
-dist/
+
 
 # Compiled Java class files
 *.class
@@ -97,14 +92,16 @@ dist/
 
 # Maven
 target/
-dist/
 
 # JetBrains IDE
 .idea/
 
 # VScode IDE
 .vscode/
 
+# Nova IDE
+.nova
+
 # Unit test reports
 TEST*.xml
 **/coverage/*
@@ -149,7 +146,25 @@ fastlane/codequality_report_gitlab.json
 fastlane/swiftlint.json
 
 # Generated JS files
-/Beam/Classes/Components/PointAndShoot/index_prod.css
-/Beam/Classes/Components/PointAndShoot/index_prod.js
 **/junit.xml
 /Beam/Classes/Components/PointAndShoot/test.http
+BeamCore/Configuration/EnvironmentVariables_generated.swift
+
+# allure_report
+allure-report/
+
+# Yarn
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Webpack build cache
+.temp_cache
+
+# JS filelists generated with build_xcfilelist_web.sh
+WebFileList_input.xcfilelist
+WebFileList_output.xcfilelist

.gitlab-ci.yml

@@ -1,48 +1,42 @@
 stages:
-  - test
   - build
-  - notarize
-  - dmg
-  - zip
+  - test
   - deploy
 
 variables:
   LC_ALL: "en_US.UTF-8"
   LANG: "en_US.UTF-8"
   GIT_STRATEGY: fetch
-  # We do this manually instead, for private repos
-  # GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: recursive
   GIT_BRANCH: "$CI_COMMIT_REF_NAME"
   GIT_DEPTH: 10
+  GITLAB_PENSO_TOKEN: GITLAB_ACCESS_TOKEN
   # Need to enable custom_build_dir feature
   # That generates IO errors
   # GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_NAME
 
-cache:
-  key:
-    files:
-      - Extern/libgit2
-  paths:
-    - Extern/libgit2/build/libgit2.a
-
 include:
   - local: '.gitlab/ci/before-script-template.yml'
   - local: '.gitlab/ci/gitlab-ci-test.yml'
-  - local: '.gitlab/ci/gitlab-ci-dmg.yml'
-  - local: '.gitlab/ci/gitlab-ci-zip.yml'
   - local: '.gitlab/ci/gitlab-ci-build.yml'
-  - local: '.gitlab/ci/gitlab-ci-notarize.yml'
+ # - local: '.gitlab/ci/gitlab-ci-fix-dmg.yml'
   - local: '.gitlab/ci/gitlab-ci-deploy.yml'
-  - local: '.gitlab/ci/gitlab-ci-release.yml'
+  - local: '.gitlab/ci/gitlab-ci-publish.yml'
   - template: Code-Quality.gitlab-ci.yml
 
 code_quality:
+  before_script:
+    - date
+    - echo "${CI_JOB_ID}"
   rules:
     - if: '$CODE_QUALITY_DISABLED'
       when: never
-    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+      when: never
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     - if: '$CI_COMMIT_BRANCH == "develop"'
+    - if: '$CI_COMMIT_BRANCH =~ /^beta-.+/'
+    - if: '$CI_COMMIT_BRANCH =~ /^release-.+/'
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
   timeout: 10 minutes
   artifacts:

.gitlab/ci/before-script-template.yml

@@ -1,18 +1,14 @@
 default:
   before_script:
+    - top -l 1 | grep -E "^CPU|^Phys|^Load|^MemRegions"
     - date
     - echo "${CI_JOB_ID}"
     - echo "Application logs will be at ${HOME}/Library/Containers/co.beamapp.macos/Data/Library/Logs/Beam/*.log"
     - echo "${PATH}"
     - pwd
     - unset cd
+    - scripts/delete-pipeline.sh
     - direnv allow
     - eval "$(direnv export bash)"
     - eval "$(rbenv init -)"
-    - scripts/install_xcode.sh
     - bundle install
-    # This is actually to be done once per CI or ~/.gitconfig gets messed up
-    # - git config --global url."https://${GITLAB_USERNAME}:${GITLAB_ACCESS_TOKEN}@gitlab.com/".insteadOf "git@gitlab.com:"
-    - scripts/move_libgit2_step1.sh
-    - git submodule sync && git submodule update --init
-    - scripts/move_libgit2_step2.sh

.gitlab/ci/gitlab-ci-build.yml

@@ -1,19 +1,86 @@
+swift lint:
+  timeout: 5 minutes
+  dependencies: []
+  stage: build
+  variables:
+    GIT_SUBMODULE_STRATEGY: none
+  artifacts:
+    when: always
+    paths:
+      - fastlane/codequality_report.json
+    reports:
+      codequality: fastlane/codequality_report.json
+  script:
+    - bundle exec fastlane lint
+  rules:
+    - if: '$SWIFT_LINT_DISABLED'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+  tags:
+    - macos-mono
+
 build:macos:
-  timeout: 10 minutes
+  timeout: 15 minutes
   dependencies: []
   stage: build
   artifacts:
-    expire_in: 7d
+    expire_in: 14d
     paths:
       - builds/
-  only:
-    - merge_requests
-    - master
-    - develop
+  rules:
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH == "develop"'
+    - if: '$CI_COMMIT_BRANCH =~ /^beta-.+/'
+    - if: '$CI_COMMIT_BRANCH =~ /^release-.+/'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
   script:
-    - time bundle exec fastlane beta
+    - |-
+        time bundle exec fastlane build
+        if [[ ! ${BUILD_DMG_DISABLED} ]]
+        then
+          bundle exec fastlane notarize_build
+          ./scripts/build_dmg.sh
+        fi
+        if [[ ! ${BUILD_ZIP_DISABLED} ]]
+        then
+          ./scripts/build_zip.sh
+        fi
+        if [[ ! ${SENTRY_DISABLED} ]]
+        then
+          bundle exec fastlane ping_sentry --verbose
+        fi
   tags:
-    - macos
+    - macos-mono
   interruptible: true
   retry:
     max: 2
+
+cherry_pick_to_develop:
+  image: registry.gitlab.com/beamgroup/beam/curl-jq
+  before_script:
+    - date
+  dependencies: []
+  stage: build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$CI_COMMIT_BRANCH =~ /^beta-.+/'
+    - if: '$CI_COMMIT_BRANCH =~ /^release-.+/'
+  script:
+    - scripts/handle_cherry_pick.sh
+  after_script:
+    - if [ ${CI_JOB_STATUS} == "failed" ]; then source ./scripts/cherry_pick_failure_slack_notif.sh; share_slack_update; fi
+  interruptible: true
+  allow_failure: true