From a16412016132018aa61cc119b9748e5e1e81f086 Mon Sep 17 00:00:00 2001 From: sahiti Date: Wed, 5 Jun 2024 18:50:03 +0530 Subject: [PATCH] Github workflow change for 1.33.x --- .github/dependabot.yml | 15 -- .github/workflows/build.yml | 99 ------------- .github/workflows/deck-oes.yml | 6 +- .github/workflows/package-bump-pr.yml | 118 --------------- .github/workflows/pr.yml | 77 ---------- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 139 ------------------ .../manifestStatus/DeployStatus.tsx | 2 +- yarn.lock | 29 ++-- 9 files changed, 17 insertions(+), 470 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/package-bump-pr.yml delete mode 100644 .github/workflows/pr.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index e342a140b76..00000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: 2 -updates: - - package-ecosystem: 'npm' - directory: '/' - schedule: - interval: daily - allow: - - dependency-name: '@spinnaker/kayenta' - - dependency-name: '@spinnaker/styleguide' - - dependency-name: '@spinnaker/presentation' - # Maintain dependencies for GitHub Actions - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "monthly" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 9ed713abc6f..00000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,99 +0,0 @@ -name: Branch Build - -on: - push: - branches: - - master - - release-* - -env: - GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g - CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker - NODE_VERSION: 14.21.3 - -permissions: - contents: read - -jobs: - branch-build: - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: Get yarn cache - id: yarn-cache - run: echo "dir=$(yarn cache dir)" >> $GIHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'zulu' - cache: 'gradle' - - - name: Prepare build variables - id: build_variables - run: | - echo REPO=${GITHUB_REPOSITORY##*/} >> $GIHUB_OUTPUT - echo VERSION="$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-${GITHUB_REF_NAME}-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')" >> $GIHUB_OUTPUT - - - name: Build - env: - ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew build --stacktrace - - - name: Login to GAR - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/login-action@v2 - # use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1 - with: - registry: us-docker.pkg.dev - username: _json_key - password: ${{ secrets.GAR_JSON_KEY }} - - - name: Build and publish slim container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.slim - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-slim" - - - name: Build and publish ubuntu container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.ubuntu - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu" diff --git a/.github/workflows/deck-oes.yml b/.github/workflows/deck-oes.yml index b53ecf3f9a4..8bb474fa3a7 100644 --- a/.github/workflows/deck-oes.yml +++ b/.github/workflows/deck-oes.yml @@ -4,7 +4,7 @@ on: workflow_call: push: branches: - - OES-1.30.1 + - OES-1.33.x env: GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g @@ -29,8 +29,8 @@ jobs: id: build_variables run: | echo ::set-output name=REPO::ubi8-deck-cve - #echo ::set-output name=VERSION::"1.30.1$(date --utc +'%Y%m%d')" - echo ::set-output name=VERSION::"1.30.1" + #echo ::set-output name=VERSION::"1.33.x$(date --utc +'%Y%m%d')" + echo ::set-output name=VERSION::"1.33.x" echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)" echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")" - name: Login to Quay diff --git a/.github/workflows/package-bump-pr.yml b/.github/workflows/package-bump-pr.yml deleted file mode 100644 index 7b5cf76149c..00000000000 --- a/.github/workflows/package-bump-pr.yml +++ /dev/null @@ -1,118 +0,0 @@ -name: Create package bump PR - -concurrency: - group: create-package-bump-pr - cancel-in-progress: true - -on: - push: - branches: - - 'master' - tags: - - '@spinnaker/*' - -env: - NODE_VERSION: 14.21.3 - -jobs: - build: - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: master - - - name: git - configure commit user - run: | - git config user.name spinnakerbot - git config user.email spinnakerbot@spinnaker.io - git checkout master - - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: yarn - get cache dir - id: yarn-cache - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: yarn - Install Dependencies - run: yarn --frozen-lockfile - - - name: lerna - Bump packages - id: lerna_bump - run: | - scripts/gha_bump_packages.sh - env: - COMMIT_SHA: ${{ github.sha }} - - name: gha - get bumped packages - id: bumps - run: | - scripts/gha_output_bumped_packages.sh - scripts/gha_output_changelog.sh - env: - PACKAGE_BUMP_COMMIT_HASH: ${{ steps.lerna_bump.outputs.packageBumpCommitHash }} - PEERDEP_BUMP_COMMIT_HASH: ${{ steps.lerna_bump.outputs.peerdepBumpCommitHash }} - - name: Create Pull Request - id: createpullrequest - uses: peter-evans/create-pull-request@v4 - with: - token: '${{ secrets.SPINNAKERBOT_PERSONAL_ACCESS_TOKEN }}' - commit-message: 'chore(package): Publish ${{ steps.bumps.outputs.bumps }}' - title: 'Publish packages to NPM' - labels: publish - body: | - ### This PR bumps the version(s) of all Deck package(s) that have unpublished changes. - - ${{ steps.bumps.outputs.changelog }} - - --- - - This PR bumps each package to the next semver version (patch/minor/major) based on the commit messages of unpublished changes using [Conventional Commits](https://conventionalcommits.org). - - - fix: patch release - - feat: minor release - - BREAKING CHANGE: major release - - It also updates dependency versions in other packages in the monorepo which depend on the bumped package(s). - - After this PR is merged, Github Actions will publish any bumped packages to the NPM registry. - - _Auto-generated by `.github/workflows/package-bump-pr.yml`_ - - - name: Close package bump due to no changes - if: ${{ steps.lerna_bump.outputs.packageBumpCommitHash == '' && steps.createpullrequest.outputs.pull-request-number != '' }} - uses: actions/github-script@v6.4.0 - with: - github-token: '${{ secrets.SPINNAKERBOT_PERSONAL_ACCESS_TOKEN }}' - script: | - const { owner, repo } = context.repo; - const pull_number = ${{ steps.createpullrequest.outputs.pull-request-number }}; - await github.pulls.update({ owner, repo, pull_number, state: 'closed' }); - - - name: Approve package bump - if: ${{ steps.lerna_bump.outputs.packageBumpCommitHash != '' && steps.createpullrequest.outputs.pull-request-number != '' }} - uses: actions/github-script@v6.4.0 - with: - github-token: '${{ secrets.SPINNAKERBOT_TOKEN }}' - script: | - const { owner, repo } = context.repo; - const pull_number = ${{ steps.createpullrequest.outputs.pull-request-number }}; - const users = ['spinnakerbot', 'spinnakerbot2']; - - const reviews = await github.pulls.listReviews({ owner, repo, pull_number }); - const approved = reviews.data.some((review) => users.includes(review.user.login) && review.state == 'APPROVED'); - - if (!approved) { - await github.pulls.createReview({ owner, repo, pull_number, event: 'APPROVE' }); - } diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index 7d2870c48c8..00000000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: PR Build - -on: [ pull_request ] - -env: - GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g - CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker - NODE_VERSION: 14.21.3 - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: Get yarn cache - id: yarn-cache - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'zulu' - cache: 'gradle' - - - name: Prepare build variables - id: build_variables - run: | - echo REPO=${GITHUB_REPOSITORY##*/} >> $GITHUB_OUTPUT - echo VERSION="$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-pr-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT - - - name: Build - env: - ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }} - run: ./gradlew build - - - name: Build slim container image - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.slim - platforms: linux/amd64,linux/arm64 - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-slim" - - - name: Build ubuntu container image - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.ubuntu - platforms: linux/amd64,linux/arm64 - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d534206a3ae..e79fcc03523 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish packages to NPM on: push: branches: - - 'master' + - 'OES-1.33.x' paths: - 'packages/*/package.json' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index bdbdbf3f969..00000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,139 +0,0 @@ -name: Release - -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+" - -env: - GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g - CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker - NODE_VERSION: 14.21.3 - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: Get yarn cache - id: yarn-cache - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'zulu' - cache: 'gradle' - - name: Assemble release info - id: release_info - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - . .github/workflows/release_info.sh ${{ github.event.repository.full_name }} - echo CHANGELOG=$(echo -e "${CHANGELOG}") >> $GITHUB_OUTPUT - echo SKIP_RELEASE=${SKIP_RELEASE} >> $GITHUB_OUTPUT - echo IS_CANDIDATE=${IS_CANDIDATE} >> $GITHUB_OUTPUT - echo RELEASE_VERSION=${RELEASE_VERSION} >> $GITHUB_OUTPUT - - name: Prepare build variables - id: build_variables - run: | - echo REPO=${GITHUB_REPOSITORY##*/} >> $GITHUB_OUTPUT - echo VERSION="$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT - - name: Release build - env: - ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }} - ORG_GRADLE_PROJECT_nexusPublishEnabled: true - ORG_GRADLE_PROJECT_nexusUsername: ${{ secrets.NEXUS_USERNAME }} - ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.NEXUS_PASSWORD }} - ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }} - ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }} - run: | - ./gradlew --info build - - name: Publish apt packages to Google Artifact Registry - env: - ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }} - ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true - GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }} - run: | - ./gradlew --info publishDebToArtifactRegistry - - name: Login to Google Cloud - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: 'google-github-actions/auth@v1' - # use service account flow defined at: https://github.com/google-github-actions/upload-cloud-storage#authenticating-via-service-account-key-json - with: - credentials_json: '${{ secrets.GAR_JSON_KEY }}' - - name: Upload halconfig profiles to GCS - # https://console.cloud.google.com/storage/browser/halconfig - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: 'google-github-actions/upload-cloud-storage@v1' - with: - path: 'halconfig/' - destination: 'halconfig/${{ steps.build_variables.outputs.REPO }}/${{ steps.release_info.outputs.RELEASE_VERSION }}' - parent: false - - name: Login to GAR - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/login-action@v2 - # use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1 - with: - registry: us-docker.pkg.dev - username: _json_key - password: ${{ secrets.GAR_JSON_KEY }} - - name: Build and publish slim container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.slim - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-slim" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-slim" - - name: Build and publish ubuntu container image - # Only run this on repositories in the 'spinnaker' org, not on forks. - if: startsWith(github.repository, 'spinnaker/') - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile.ubuntu - platforms: linux/amd64,linux/arm64 - push: true - tags: | - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu" - "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu" - - name: Create release - if: steps.release_info.outputs.SKIP_RELEASE == 'false' - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.event.repository.name }} ${{ github.ref }} - body: | - ${{ steps.release_info.outputs.CHANGELOG }} - draft: false - prerelease: ${{ steps.release_info.outputs.IS_CANDIDATE }} diff --git a/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx b/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx index 3d7bf9dbaea..5c94d83c877 100644 --- a/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx +++ b/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx @@ -90,7 +90,7 @@ export class DeployStatus extends React.Component {SETTINGS.feature.multiBlockFailureMessages ? ( - stage.failureMessages.map((failureMessage) => ( + stage.failureMessages.map((failureMessage: any) => ( diff --git a/yarn.lock b/yarn.lock index 8a114e7146a..3d3034a9dea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3510,22 +3510,22 @@ resolved "https://registry.yarnpkg.com/@spinnaker/core/-/core-0.0.549.tgz#e7246140825705e6d295c30010de4f71a78d1670" integrity sha512-8EDwICoaqOtWFYQHvSNrTNh0ksIEVp9i/GueClvHbrcSRxYOqPDxQcSs3RGihxahjlfXIi7zjqvK0aDvSYBo0w== -"@spinnaker/kayenta@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@spinnaker/kayenta/-/kayenta-2.0.0.tgz#0fc18a641ee2577c21c0bdf5eb24ac1a5ab1caf5" - integrity sha512-h0Vu1X6wXBJwqXfrosc4d3DbyWuv7u7cSfMAt+BPFcbu3qU9Ua2TF9jSGRcMvI0Vo3C+fC+HxufvKJh7ZQ83vg== +"@spinnaker/kayenta@2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@spinnaker/kayenta/-/kayenta-2.1.0.tgz#d2a3c02034ea38014ae1565724b2e4d7a36dd593" + integrity sha512-8HhcEFjjibPCGxzkKZ6KPIo0lBAFHa8GSEUILmp5AN2IkGIB98OKRCZ7bwg0LOg+BnW8g1a9TydZE2OkQA26Mg== dependencies: "@uirouter/core" "6.0.4" "@uirouter/react" "1.0.2" "@uirouter/react-hybrid" "1.0.2" angular-ui-bootstrap "^2.5.0" - ansi_up "^4.0.4" + ansi_up "^5.0.0" bootstrap "3.4.1" class-autobind-decorator "^2.2.1" human-readable-ids "^1.0.4" lodash "4.17.21" lodash-decorators "4.5.0" - lodash-es "4.17.15" + lodash-es "4.17.21" memoize-one "^4.0.2" ngimport "^0.6.0" react "~16.14.0" @@ -4762,7 +4762,7 @@ angular2react@3.0.2: lodash.kebabcase "^4.1.1" ngimport "^1.0.0" -angular@1.6.10, angular@1.8.0, angular@1.8.3, angular@>=1.5, angular@>=1.5.0: +angular@1.6.10, angular@1.8.0, angular@>=1.5, angular@>=1.5.0: version "1.8.0" resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51" integrity sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg== @@ -4863,10 +4863,10 @@ ansi_up@5.1.0: resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-5.1.0.tgz#9cf10e6d359bb434bdcfab5ae4c3abfe1617b6db" integrity sha512-3wwu+nJCKBVBwOCurm0uv91lMoVkhFB+3qZQz3U11AmAdDJ4tkw1sNPWJQcVxMVYwe0pGEALOjSBOxdxNc+pNQ== -ansi_up@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-4.0.4.tgz#5b8c35f0b02e4476f3f18cf89c3bf48d15d054f6" - integrity sha512-vRxC8q6QY918MbehO869biJW4tiunJdjOhi5fpY6NLOliBQlZhOkKgABJKJqH+JZfb/WfjvjN1chLWI6tODerw== +ansi_up@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-5.2.1.tgz#9437082c7ad4975c15ec57d30a6b55da295bee36" + integrity sha512-5bz5T/7FRmlxA37zDXhG6cAwlcZtfnmNLDJra66EEIT3kYlw5aPJdbkJEhm59D6kA4Wi5ict6u6IDYHJaQlH+g== any-observable@^0.3.0: version "0.3.0" @@ -12180,12 +12180,7 @@ lodash-decorators@4.5.0: dependencies: tslib "^1.7.1" -lodash-es@4.17.15: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" - integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== - -lodash-es@^4.17.11, lodash-es@^4.17.21, lodash-es@^4.2.1: +lodash-es@4.17.21, lodash-es@^4.17.11, lodash-es@^4.17.21, lodash-es@^4.2.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==