hash
stringlengths
40
40
date
stringdate
2016-01-01 23:11:19
2025-03-21 19:56:31
author
stringclasses
133 values
commit_message
stringlengths
13
137
is_merge
bool
1 class
masked_commit_message
stringlengths
5
116
type
stringclasses
11 values
git_diff
stringlengths
113
3.11M
bb4c9c82e8036abdd5a1e5efa221b031967b8b12
2023-06-15 19:29:43
Angular Robot
build: update all non-major dependencies
false
update all non-major dependencies
build
diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 5cf965afe66a..bb7fedaa8246 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -13,7 +13,7 @@ jobs: assistant_to_the_branch_manager: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - uses: angular/dev-infra/github-actions/branch-manager@2ec31a92100367a52100fca54d5e8c7c78cb149c diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index ea7346a72025..240ac89f9036 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -12,14 +12,14 @@ jobs: labels: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: angular/dev-infra/github-actions/commit-message-based-labels@2ec31a92100367a52100fca54d5e8c7c78cb149c with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - uses: angular/dev-infra/github-actions/post-approval-changes@2ec31a92100367a52100fca54d5e8c7c78cb149c with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d1ad2d758691..32ad94e095c3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false diff --git a/WORKSPACE b/WORKSPACE index f89e5619b340..ad34e27f8980 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -22,8 +22,8 @@ http_archive( http_archive( name = "build_bazel_rules_nodejs", - sha256 = "94070eff79305be05b7699207fbac5d2608054dd53e6109f7d00d923919ff45a", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.2/rules_nodejs-5.8.2.tar.gz"], + sha256 = "5dd1e5dea1322174c57d3ca7b899da381d516220793d0adef3ba03b9d23baa8e", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.3/rules_nodejs-5.8.3.tar.gz"], ) load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies") diff --git a/package.json b/package.json index b12a29c68962..6fe87deb276a 100644 --- a/package.json +++ b/package.json @@ -116,8 +116,8 @@ "@types/yargs": "^17.0.20", "@types/yargs-parser": "^21.0.0", "@types/yarnpkg__lockfile": "^1.1.5", - "@typescript-eslint/eslint-plugin": "5.59.9", - "@typescript-eslint/parser": "5.59.9", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", "@vitejs/plugin-basic-ssl": "1.0.1", "@yarnpkg/lockfile": "1.1.0", "ajv": "8.12.0", @@ -127,7 +127,7 @@ "babel-loader": "9.1.2", "babel-plugin-istanbul": "6.1.1", "bootstrap": "^4.0.0", - "browserslist": "4.21.7", + "browserslist": "4.21.8", "buffer": "6.0.3", "cacache": "17.1.3", "chokidar": "3.5.3", @@ -135,8 +135,8 @@ "critters": "0.0.18", "css-loader": "6.8.1", "debug": "^4.1.1", - "esbuild": "0.17.19", - "esbuild-wasm": "0.17.19", + "esbuild": "0.18.3", + "esbuild-wasm": "0.18.3", "eslint": "8.42.0", "eslint-config-prettier": "8.8.0", "eslint-plugin-header": "3.1.1", @@ -167,7 +167,7 @@ "magic-string": "0.30.0", "mini-css-extract-plugin": "2.7.6", "mrmime": "1.0.1", - "ng-packagr": "16.1.0-rc.0", + "ng-packagr": "16.1.0", "node-fetch": "^2.2.0", "npm": "^8.11.0", "npm-package-arg": "10.1.0", @@ -179,15 +179,15 @@ "piscina": "3.2.0", "popper.js": "^1.14.1", "postcss": "8.4.24", - "postcss-loader": "7.3.2", + "postcss-loader": "7.3.3", "prettier": "^2.0.0", "protractor": "~7.0.0", "puppeteer": "18.2.1", "quicktype-core": "23.0.47", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.63.2", - "sass-loader": "13.3.1", + "sass": "1.63.4", + "sass-loader": "13.3.2", "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.8.1-linux.tar.gz", "semver": "7.5.1", "shelljs": "^0.8.5", @@ -197,7 +197,7 @@ "spdx-satisfies": "^5.0.0", "symbol-observable": "4.0.0", "tar": "^6.1.6", - "terser": "5.17.7", + "terser": "5.18.0", "text-table": "0.2.0", "tree-kill": "1.2.2", "ts-node": "^10.9.1", @@ -206,9 +206,9 @@ "verdaccio": "5.25.0", "verdaccio-auth-memory": "^10.0.0", "vite": "4.3.9", - "webpack": "5.86.0", + "webpack": "5.87.0", "webpack-dev-middleware": "6.1.1", - "webpack-dev-server": "4.15.0", + "webpack-dev-server": "4.15.1", "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0", "yargs": "17.7.2", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 34aedb799eea..11909a2ca45b 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -27,13 +27,13 @@ "autoprefixer": "10.4.14", "babel-loader": "9.1.2", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.7", + "browserslist": "4.21.8", "cacache": "17.1.3", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", "critters": "0.0.18", "css-loader": "6.8.1", - "esbuild-wasm": "0.17.19", + "esbuild-wasm": "0.18.3", "fast-glob": "3.2.12", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", @@ -52,27 +52,27 @@ "picomatch": "2.3.1", "piscina": "3.2.0", "postcss": "8.4.24", - "postcss-loader": "7.3.2", + "postcss-loader": "7.3.3", "resolve-url-loader": "5.0.0", "rxjs": "7.8.1", - "sass": "1.63.2", - "sass-loader": "13.3.1", + "sass": "1.63.4", + "sass-loader": "13.3.2", "semver": "7.5.1", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.17.7", + "terser": "5.18.0", "text-table": "0.2.0", "tree-kill": "1.2.2", "tslib": "2.5.3", "vite": "4.3.9", - "webpack": "5.86.0", + "webpack": "5.87.0", "webpack-dev-middleware": "6.1.1", - "webpack-dev-server": "4.15.0", + "webpack-dev-server": "4.15.1", "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0" }, "optionalDependencies": { - "esbuild": "0.17.19" + "esbuild": "0.18.3" }, "peerDependencies": { "@angular/compiler-cli": "^16.1.0", diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json index e5653259ba23..70b51c61165f 100644 --- a/packages/angular_devkit/build_webpack/package.json +++ b/packages/angular_devkit/build_webpack/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@angular-devkit/core": "0.0.0-PLACEHOLDER", "node-fetch": "2.6.7", - "webpack": "5.86.0" + "webpack": "5.87.0" }, "peerDependencies": { "webpack": "^5.30.0", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index bd2224cbf5e8..9a80f60533d9 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -31,6 +31,6 @@ "@angular/compiler": "16.1.0", "@angular/compiler-cli": "16.1.0", "typescript": "5.1.3", - "webpack": "5.86.0" + "webpack": "5.87.0" } } diff --git a/yarn.lock b/yarn.lock index adc6a3ecb38b..ee0085361a8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -180,6 +180,20 @@ dependencies: tslib "^2.3.0" +"@angular/[email protected]": + version "16.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-16.1.0.tgz#50cddc9524b945e9739e9daf86df1df4c8382232" + integrity sha512-t/fam7YdY6sINP0IAmt3cWQ0KUndhm457i4e0uZH+NVeBzItvBQggmrl+UhXslg/iFEyHohtyrjZKnGSzgkzKg== + dependencies: + "@babel/core" "7.21.8" + "@jridgewell/sourcemap-codec" "^1.4.14" + chokidar "^3.0.0" + convert-source-map "^1.5.1" + reflect-metadata "^0.1.2" + semver "^7.0.0" + tslib "^2.3.0" + yargs "^17.2.1" + "@angular/[email protected]": version "16.1.0-rc.0" resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-16.1.0-rc.0.tgz#d13ed6169f522ce84d491f70dcaea3d9c8b91019" @@ -194,6 +208,13 @@ tslib "^2.3.0" yargs "^17.2.1" +"@angular/[email protected]": + version "16.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-16.1.0.tgz#e3f3de9accbd5c2fe4aefc29406c5b1db47e3a8e" + integrity sha512-lQ8pZmfQpAevUbd1BO7snkS8LX4D8HADcdNMnFY/JmSDnb2Kt9VG56uX2HMq8mjyWdqy8E7ggwRi0wFWT5G23Q== + dependencies: + tslib "^2.3.0" + "@angular/[email protected]": version "16.1.0-rc.0" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-16.1.0-rc.0.tgz#30658079f91a2abf6e7562c4c378b4193953ac4d" @@ -1676,111 +1697,221 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd" integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.3.tgz#c8118069fb69d5057772dc028f84bcff9e9fd908" + integrity sha512-PgabCsoaEEnnOiF6rUhOBXgYoLFIrHWP6mfLOzuQ1oZ1lwBdTL0hp5ivC4K3Kvz3BD8EipjeQo6l0aty3nr4qQ== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d" integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.3.tgz#7904d8326fd7168debfd4a80b9bf867486d4204c" + integrity sha512-QOn3VIlL6Qv1eHBpQB/s7simaZgGss2ASyxDOwYSLmc6vD0uuizZkuYawHmuLjWEm5wPwp0JQWhbpaYwwGevYw== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1" integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.3.tgz#824c4abb0f2ebeeee97a9a992ab7ac002cffc959" + integrity sha512-1OkJf8wNX1W5ucbp5HrK+z42b9DINb4ix59oJH/PIsh9cyFMqjgRKtCBXg0zEWhkmP1k3egdfrnS7cDTpLH43g== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276" integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.3.tgz#958da842603418539d7227f34130698fa34cf76e" + integrity sha512-57aofORpY7wDAuMs6DeqpmgSnVfZ63RgGbR/BHdOSTqJgYvHDCMY7/o1myFntl3k0YxtLE3WAm56nMf4qy3UDw== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb" integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.3.tgz#bdd2f75e6d53b3e47d542e2557a7e636cc4eea3a" + integrity sha512-NVBqMnxT9qvgu7Z322LUDlwjh4GDk6wEePyAQnHF9noxik/WvLFmr5v3Vgz5LSvqFducLCxsdmLztKhdpFW0Gg== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2" integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.3.tgz#155fbdfdfa7b3689a0ce6bec563ede1ec629c5ef" + integrity sha512-XiLK1AsCk2wKxN7j8h9GXXCs8FPZhp07U0rnpwRkAVSVGgLaIWYSqpTRzKjAfqJiZlp+XKo1HwsmDdICEKB3Dg== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4" integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.3.tgz#c1a268389a4e8147b55bad8325521563202fa3b9" + integrity sha512-xyITfrF0G3l1gwR79hvNCCWKQ/16uK14xNNPFgzjbIqF4EpBvhO6l3jrWxXFUW51z6dVIl2Szh3x3uIbBWzH1Q== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb" integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.3.tgz#accaa7cbc56979db18c2c5df15e2280bd3a8ad69" + integrity sha512-lsKUYVd8L/j2uNs8dhMjMsKC5MHYh77gR9EThu7YCeeFz1XpIkx1I4a7mhoVfPS2VPVD1pMCh+PgxuAHUcEmXw== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a" integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.3.tgz#e3c03cfbedd3a59464dacf31f1dbd91f0e637543" + integrity sha512-fc/T0QHMzvmnlF+kfD6bHLB8u+17gg13260p/E86yYjVoKNFjonL/+Y0GGQjMbFUas9QijqOa7pcR00a9RNkwg== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a" integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.3.tgz#b6c8c55be4d472af77c060c31a52121187d52e71" + integrity sha512-EyfGWeOwRqK5Xj18vok0qv8IFBZ1/+hKV+cqD44oVhGsxHo9TmPtoSiDrWn8Sa2swq/VuO5Aiog6YPDj81oIkA== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72" integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.3.tgz#d3152c9cb8d3ff6271fe356ec42c9f5c849572ae" + integrity sha512-PwXkcl3t0kSeYH5RuJIeh/fHOzKZd+ZdifAWzpVO+9TLWArutTFBJvOSkTZ3CcqQqNrTj1Qyo6nqE8MQj/a7cQ== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289" integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.3.tgz#088aa0f909509adb5ea086255f7f654ce8d88074" + integrity sha512-CRVkkSXf5GQcq7Am2a2tdIn85oqi/bkjuPvhNqcdeTgI0xgNbqLnEPRy2AEGkRuaJWB5uCX1IC4sqnY8ET14Yg== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7" integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.3.tgz#3022bc526f53b37fe324d25f4ff8e228e7a48dd7" + integrity sha512-t7zK1Cheh0xvzfZbimztiE0wGnpV+YRsBg3tefcEBN3O4GzgLu6fFpA5HxEyVm3hHZW1jAC4OhoGEp7C5Ii6Eg== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09" integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.3.tgz#4c00374dbe733456d6fff567521463b977ce4a66" + integrity sha512-fUZPtyCYih6y4lDYdSM4Yoax4nS7aH0/XixJStys+9tfp5cAlIAZhEVKOOdeGXmQn0IEyiUtlIsPnfObbeDQfQ== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829" integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.3.tgz#4eeef68a641308abf023b9bd2d7c7e60133394c5" + integrity sha512-oIcK2LqHWqfMERqjvaKJ3QJmycHn723HsXIv5gH4iGfmePfSj+gi0ZQv2h4bHUg2bs2gJtV0DlIjGhEuvdgxLw== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4" integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.3.tgz#5bc57407bcb7626128345f0846f15a6db7263802" + integrity sha512-RW9lpfZ6XZ6f5to2DJPvt0f/4RXEW229Xf++quVoW+YbnPrcapIJChtD/AmZ8cK3hglO/hXxJjs21pV0/l7L5w== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462" integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.3.tgz#878fd523afe75e7352edf6d6f258d7bbf7c5db1a" + integrity sha512-piZ2oBoaq58pKZvhgdV6PemlL30Uhd9GmmOkIGZYgChwNcyVSSl6iMEJxMzU7x44Lk9q+hJ6a343M/iVEMEvxA== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691" integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.3.tgz#6df3068374393713186d14fac66c3228737527e7" + integrity sha512-vaMfouYTz/4tKdQsXDccqhV6wgPEr+hfuxdNU5Pl/vQxYTsqcXv5DYEa5Z1RAxCoua5aEB+Uj5V7VT/bM92wxw== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273" integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.3.tgz#9e85422620b8972f02489ec04329492dd04dae13" + integrity sha512-Fa3rNQQ9q1qwy9u2cdDvuGKy3jmPnPPMDdyy/qbn5d395Pb9hjLYiPzX9BozXMPJDlCNofSY7jN3miM9gyAdHA== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f" integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.3.tgz#21336b42038fffc7dcacb201683701499ce9ecd7" + integrity sha512-LPJC8ub+9uzyC6ygVmp00dAqet1q1DsZ/OldGIIBt+y+Ctd1OfnKNlzQgXK8nxwY1G8fAhklFSeSRRgAUJnR0w== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03" integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.3.tgz#3ca7b08a837512f271308e72e81841154baf4f5b" + integrity sha512-WtUyRspyxZR6NTc2HG4xd9Wvz8lP4C6OUY1gAqisrf151HvXIxsK0mfAacFJNS7EN2wvPTgjP+SM8vgBOx5+zA== + "@esbuild/[email protected]": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061" integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA== +"@esbuild/[email protected]": + version "0.18.3" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.3.tgz#735999f2dc838a0a7cf86fb0d45cc8fc941316fb" + integrity sha512-Z8qCK4BkBm40j5KUM4NrkxYQS0R12cBO1NBVtI4vws6uwh1n/VaNu31Hm+n2cJUWdFbfH57PBghkhm9yLgmPfw== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -3593,7 +3724,7 @@ anymatch "^3.0.0" source-map "^0.6.0" -"@types/ws@*", "@types/ws@^8.5.1": +"@types/ws@*", "@types/ws@^8.5.1", "@types/ws@^8.5.5": version "8.5.5" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== @@ -3631,15 +3762,15 @@ dependencies: "@types/node" "*" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz#2604cfaf2b306e120044f901e20c8ed926debf15" - integrity sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f" + integrity sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.9" - "@typescript-eslint/type-utils" "5.59.9" - "@typescript-eslint/utils" "5.59.9" + "@typescript-eslint/scope-manager" "5.59.11" + "@typescript-eslint/type-utils" "5.59.11" + "@typescript-eslint/utils" "5.59.11" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -3647,72 +3778,72 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.9.tgz#a85c47ccdd7e285697463da15200f9a8561dd5fa" - integrity sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.11.tgz#af7d4b7110e3068ce0b97550736de455e4250103" + integrity sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA== dependencies: - "@typescript-eslint/scope-manager" "5.59.9" - "@typescript-eslint/types" "5.59.9" - "@typescript-eslint/typescript-estree" "5.59.9" + "@typescript-eslint/scope-manager" "5.59.11" + "@typescript-eslint/types" "5.59.11" + "@typescript-eslint/typescript-estree" "5.59.11" debug "^4.3.4" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz#eadce1f2733389cdb58c49770192c0f95470d2f4" - integrity sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz#5d131a67a19189c42598af9fb2ea1165252001ce" + integrity sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q== dependencies: - "@typescript-eslint/types" "5.59.9" - "@typescript-eslint/visitor-keys" "5.59.9" + "@typescript-eslint/types" "5.59.11" + "@typescript-eslint/visitor-keys" "5.59.11" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz#53bfaae2e901e6ac637ab0536d1754dfef4dafc2" - integrity sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz#5eb67121808a84cb57d65a15f48f5bdda25f2346" + integrity sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g== dependencies: - "@typescript-eslint/typescript-estree" "5.59.9" - "@typescript-eslint/utils" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.11" + "@typescript-eslint/utils" "5.59.11" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.9.tgz#3b4e7ae63718ce1b966e0ae620adc4099a6dcc52" - integrity sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1" + integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA== -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz#6bfea844e468427b5e72034d33c9fffc9557392b" - integrity sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz#b2caaa31725e17c33970c1197bcd54e3c5f42b9f" + integrity sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA== dependencies: - "@typescript-eslint/types" "5.59.9" - "@typescript-eslint/visitor-keys" "5.59.9" + "@typescript-eslint/types" "5.59.11" + "@typescript-eslint/visitor-keys" "5.59.11" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.9.tgz#adee890107b5ffe02cd46fdaa6c2125fb3c6c7c4" - integrity sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.11.tgz#9dbff49dc80bfdd9289f9f33548f2e8db3c59ba1" + integrity sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.9" - "@typescript-eslint/types" "5.59.9" - "@typescript-eslint/typescript-estree" "5.59.9" + "@typescript-eslint/scope-manager" "5.59.11" + "@typescript-eslint/types" "5.59.11" + "@typescript-eslint/typescript-estree" "5.59.11" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/[email protected]": - version "5.59.9" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz#9f86ef8e95aca30fb5a705bb7430f95fc58b146d" - integrity sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q== +"@typescript-eslint/[email protected]": + version "5.59.11" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz#dca561ddad169dc27d62396d64f45b2d2c3ecc56" + integrity sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA== dependencies: - "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/types" "5.59.11" eslint-visitor-keys "^3.3.0" "@verdaccio/[email protected]": @@ -4693,7 +4824,7 @@ browser-sync@^2.27.7: ua-parser-js "^1.0.33" yargs "^17.3.1" -browserslist@*, [email protected], browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: +browserslist@*, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: version "4.21.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.7.tgz#e2b420947e5fb0a58e8f4668ae6e23488127e551" integrity sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA== @@ -4713,6 +4844,16 @@ [email protected]: node-releases "^2.0.8" update-browserslist-db "^1.0.10" [email protected]: + version "4.21.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.8.tgz#db2498e1f4b80ed199c076248a094935860b6017" + integrity sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw== + dependencies: + caniuse-lite "^1.0.30001502" + electron-to-chromium "^1.4.428" + node-releases "^2.0.12" + update-browserslist-db "^1.0.11" + browserstack@^1.5.1: version "1.6.1" resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3" @@ -4862,6 +5003,11 @@ caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.300014 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz#f7e4a76eb1d2d585340f773767be1fefc118dca8" integrity sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg== +caniuse-lite@^1.0.30001502: + version "1.0.30001503" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz#88b6ff1b2cf735f1f3361dc1a15b59f0561aa398" + integrity sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -5278,7 +5424,7 @@ [email protected], cors@~2.8.5: object-assign "^4" vary "^1" -cosmiconfig@^8.1.3: +cosmiconfig@^8.1.3, cosmiconfig@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== @@ -5741,6 +5887,11 @@ electron-to-chromium@^1.4.284, electron-to-chromium@^1.4.411: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.427.tgz#67e8069f7a864fc092fe2e09f196e68af5cb88a1" integrity sha512-HK3r9l+Jm8dYAm1ctXEWIC+hV60zfcjS9UA5BDlYvnI5S7PU/yytjpvSrTNrSSRRkuu3tDyZhdkwIczh+0DWaw== +electron-to-chromium@^1.4.428: + version "1.4.431" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.431.tgz#47990d6e43465d69aa1fbd0abdec43114946edd0" + integrity sha512-m232JTVmCawA2vG+1azVxhKZ9Sv1Q//xxNv5PkP5rWxGgQE8c3CiZFrh8Xnp+d1NmNxlu3QQrGIfdeW5TtXX5w== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -5807,7 +5958,7 @@ engine.io@~6.4.2: engine.io-parser "~5.0.3" ws "~8.11.0" -enhanced-resolve@^5.14.0, enhanced-resolve@^5.14.1: +enhanced-resolve@^5.14.0: version "5.14.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3" integrity sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow== @@ -5815,6 +5966,14 @@ enhanced-resolve@^5.14.0, enhanced-resolve@^5.14.1: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" @@ -5946,6 +6105,11 @@ [email protected], esbuild-wasm@^0.17.0: resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.17.19.tgz#c528495c5363c34a4671fa55404e2b0ba85566ba" integrity sha512-X9UQEMJMZXwlGCfqcBmJ1jEa+KrLfd+gCBypO/TSzo5hZvbVwFqpxj1YCuX54ptTF75wxmrgorR4RL40AKtLVg== [email protected]: + version "0.18.3" + resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.18.3.tgz#a6c91cc388c51cfe11bea2c69d1d9ece3b73f299" + integrity sha512-96VLLjRtD3UMLhBoosmUsiyte2rr3egVbdHp0ql+sGwPLmKYxaZpfLNFZkiPGGCtML6pl14waJ+qTAfeqw59MA== + [email protected], esbuild@^0.17.0, esbuild@^0.17.5: version "0.17.19" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955" @@ -5974,6 +6138,34 @@ [email protected], esbuild@^0.17.0, esbuild@^0.17.5: "@esbuild/win32-ia32" "0.17.19" "@esbuild/win32-x64" "0.17.19" [email protected]: + version "0.18.3" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.3.tgz#a0c480cec5c3ee9808ad0949811687f608ac708d" + integrity sha512-eadWJC4CRpj93+miO5ZBlvCv+m2x6pzyNBznTvUeLFObMmxs1IMd8cCf6qiDVEZuDL6W8W7u+ZNW3GKEfOdDsA== + optionalDependencies: + "@esbuild/android-arm" "0.18.3" + "@esbuild/android-arm64" "0.18.3" + "@esbuild/android-x64" "0.18.3" + "@esbuild/darwin-arm64" "0.18.3" + "@esbuild/darwin-x64" "0.18.3" + "@esbuild/freebsd-arm64" "0.18.3" + "@esbuild/freebsd-x64" "0.18.3" + "@esbuild/linux-arm" "0.18.3" + "@esbuild/linux-arm64" "0.18.3" + "@esbuild/linux-ia32" "0.18.3" + "@esbuild/linux-loong64" "0.18.3" + "@esbuild/linux-mips64el" "0.18.3" + "@esbuild/linux-ppc64" "0.18.3" + "@esbuild/linux-riscv64" "0.18.3" + "@esbuild/linux-s390x" "0.18.3" + "@esbuild/linux-x64" "0.18.3" + "@esbuild/netbsd-x64" "0.18.3" + "@esbuild/openbsd-x64" "0.18.3" + "@esbuild/sunos-x64" "0.18.3" + "@esbuild/win32-arm64" "0.18.3" + "@esbuild/win32-ia32" "0.18.3" + "@esbuild/win32-x64" "0.18.3" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -8674,10 +8866,10 @@ neo-async@^2.6.0, neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== [email protected]: - version "16.1.0-rc.0" - resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-16.1.0-rc.0.tgz#de9e0ada9f4568b519ac923e55078ab57c55e07e" - integrity sha512-z/zAZkQ1unxZP9+EHhXKfhayQ986JqqcNk1uK6yhUjrNtpCYtQEzPIoK620yXMHYx/rXGrdulZqohGaNU4ct7g== [email protected]: + version "16.1.0" + resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-16.1.0.tgz#b250d5229a62f5765d90ed989bbb2f23df38dbb3" + integrity sha512-NbgzDRtRiYJi98Ssky7U5GoicZz7VkR3OW5qd9q3dt3H/JNqLh2PwB745NFG2cT00lEvfrY6LJ1NAcOjoWDibA== dependencies: "@rollup/plugin-json" "^6.0.0" "@rollup/plugin-node-resolve" "^15.0.0" @@ -9587,14 +9779,13 @@ [email protected]: klona "^2.0.6" semver "^7.3.8" [email protected]: - version "7.3.2" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.2.tgz#ac3344ad1f14bb65df135744b7efae4dbdad4301" - integrity sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig== [email protected]: + version "7.3.3" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.3.tgz#6da03e71a918ef49df1bb4be4c80401df8e249dd" + integrity sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA== dependencies: - cosmiconfig "^8.1.3" + cosmiconfig "^8.2.0" jiti "^1.18.2" - klona "^2.0.6" semver "^7.3.8" postcss-modules-extract-imports@^3.0.0: @@ -10362,12 +10553,11 @@ [email protected]: klona "^2.0.6" neo-async "^2.6.2" [email protected]: - version "13.3.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.1.tgz#32ee5791434b9b4dbd1adcce76fcb4cea49cc12c" - integrity sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg== [email protected]: + version "13.3.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6" + integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg== dependencies: - klona "^2.0.6" neo-async "^2.6.2" [email protected]: @@ -10379,10 +10569,10 @@ [email protected]: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" [email protected]: - version "1.63.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.2.tgz#75f7d9a8e67d1d5b98a989507f4d98b6067b1f75" - integrity sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww== [email protected]: + version "1.63.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.4.tgz#caf60643321044c61f6a0fe638a07abbd31cfb5d" + integrity sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -10423,6 +10613,15 @@ schema-utils@^3.1.1, schema-utils@^3.1.2: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + schema-utils@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.1.0.tgz#4cff1e434c12ed39502378b9a3e24787b37df41d" @@ -11178,7 +11377,17 @@ [email protected]: commander "^2.20.0" source-map-support "~0.5.20" [email protected], terser@^5.16.8: [email protected]: + version "5.18.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.0.tgz#dc811fb8e3481a875d545bda247c8730ee4dc76b" + integrity sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +terser@^5.16.8: version "5.17.7" resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.7.tgz#2a8b134826fe179b711969fd9d9a0c2479b2a8c3" integrity sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ== @@ -11880,6 +12089,42 @@ [email protected]: webpack-dev-middleware "^5.3.1" ws "^8.13.0" [email protected]: + version "4.15.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" + integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== + dependencies: + "@types/bonjour" "^3.5.9" + "@types/connect-history-api-fallback" "^1.3.5" + "@types/express" "^4.17.13" + "@types/serve-index" "^1.9.1" + "@types/serve-static" "^1.13.10" + "@types/sockjs" "^0.3.33" + "@types/ws" "^8.5.5" + ansi-html-community "^0.0.8" + bonjour-service "^1.0.11" + chokidar "^3.5.3" + colorette "^2.0.10" + compression "^1.7.4" + connect-history-api-fallback "^2.0.0" + default-gateway "^6.0.3" + express "^4.17.3" + graceful-fs "^4.2.6" + html-entities "^2.3.2" + http-proxy-middleware "^2.0.3" + ipaddr.js "^2.0.1" + launch-editor "^2.6.0" + open "^8.0.9" + p-retry "^4.5.0" + rimraf "^3.0.2" + schema-utils "^4.0.0" + selfsigned "^2.1.1" + serve-index "^1.9.1" + sockjs "^0.3.24" + spdy "^4.0.2" + webpack-dev-middleware "^5.3.1" + ws "^8.13.0" + [email protected]: version "5.9.0" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" @@ -11930,10 +12175,10 @@ [email protected]: watchpack "^2.4.0" webpack-sources "^3.2.3" [email protected]: - version "5.86.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.86.0.tgz#b0eb81794b62aee0b7e7eb8c5073495217d9fc6d" - integrity sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg== [email protected]: + version "5.87.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.87.0.tgz#df8a9c094c6037f45e0d77598f9e59d33ca3a98c" + integrity sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" @@ -11944,7 +12189,7 @@ [email protected]: acorn-import-assertions "^1.9.0" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.14.1" + enhanced-resolve "^5.15.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -11954,7 +12199,7 @@ [email protected]: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.2" + schema-utils "^3.2.0" tapable "^2.1.1" terser-webpack-plugin "^5.3.7" watchpack "^2.4.0"
5326b49488fa626f94a4b976589c8976e447bbea
2021-08-17 19:39:45
Renovate Bot
build: update all non-major dependencies
false
update all non-major dependencies
build
diff --git a/package.json b/package.json index e4ba51d3ce65..4b83c534e2c5 100644 --- a/package.json +++ b/package.json @@ -125,8 +125,8 @@ "@types/text-table": "^0.2.1", "@types/uuid": "^8.0.0", "@types/webpack-dev-server": "^3.1.7", - "@typescript-eslint/eslint-plugin": "4.29.1", - "@typescript-eslint/parser": "4.29.1", + "@typescript-eslint/eslint-plugin": "4.29.2", + "@typescript-eslint/parser": "4.29.2", "@yarnpkg/lockfile": "1.1.0", "ajv": "8.6.2", "ajv-formats": "2.1.1", @@ -201,7 +201,7 @@ "regenerator-runtime": "0.13.9", "resolve-url-loader": "4.0.0", "rxjs": "6.6.7", - "sass": "1.37.5", + "sass": "1.38.0", "sass-loader": "12.1.0", "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz", "semver": "7.3.5", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 1be9ee06aa87..d67b2935127e 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -55,7 +55,7 @@ "regenerator-runtime": "0.13.9", "resolve-url-loader": "4.0.0", "rxjs": "6.6.7", - "sass": "1.37.5", + "sass": "1.38.0", "sass-loader": "12.1.0", "semver": "7.3.5", "source-map-loader": "3.0.0", diff --git a/yarn.lock b/yarn.lock index a95aeb9002cc..51fcb679baa2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,73 +2319,73 @@ dependencies: "@types/node" "*" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b" - integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz#f54dc0a32b8f61c6024ab8755da05363b733838d" + integrity sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg== dependencies: - "@typescript-eslint/experimental-utils" "4.29.1" - "@typescript-eslint/scope-manager" "4.29.1" + "@typescript-eslint/experimental-utils" "4.29.2" + "@typescript-eslint/scope-manager" "4.29.2" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994" - integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz#5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7" + integrity sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.1" - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/typescript-estree" "4.29.1" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d" - integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.2.tgz#1c7744f4c27aeb74610c955d3dce9250e95c370a" + integrity sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g== dependencies: - "@typescript-eslint/scope-manager" "4.29.1" - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/typescript-estree" "4.29.1" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" debug "^4.3.1" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358" - integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz#442b0f029d981fa402942715b1718ac7fcd5aa1b" + integrity sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA== dependencies: - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/visitor-keys" "4.29.1" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5" - integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" + integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f" - integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219" + integrity sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg== dependencies: - "@typescript-eslint/types" "4.29.1" - "@typescript-eslint/visitor-keys" "4.29.1" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/[email protected]": - version "4.29.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d" - integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag== +"@typescript-eslint/[email protected]": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df" + integrity sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag== dependencies: - "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" "@verdaccio/[email protected]", "@verdaccio/commons-api@^10.0.0": @@ -9788,7 +9788,14 @@ [email protected]: klona "^2.0.4" neo-async "^2.6.2" [email protected], sass@^1.32.8: [email protected]: + version "1.38.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.38.0.tgz#2f3e60a1efdcdc910586fa79dc89d3399a145b4f" + integrity sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g== + dependencies: + chokidar ">=3.0.0 <4.0.0" + +sass@^1.32.8: version "1.37.5" resolved "https://registry.yarnpkg.com/sass/-/sass-1.37.5.tgz#f6838351f7cc814c4fcfe1d9a20e0cabbd1e7b3c" integrity sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==
66474aaf9bf1e7f8886d6bd2f1d5af2481f46e29
2019-11-27 02:41:53
Renovate Bot
build: update @angular/animations to version
false
update @angular/animations to version
build
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 5fb4f1f25b9e..fa109bcc6759 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,17 +2,17 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#eb8c1da67e4e1e201e7d414cdf00a1bcacd006fd", - "@angular/common": "github:angular/common-builds#31cfcd76ca4a64f3d1f149472ba5f731ec783161", - "@angular/compiler": "github:angular/compiler-builds#95b4dcfbc5d94fcdf6a33f123a858e2088a203a7", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#e6ba53c77834d0f7de65ecfb75643888adfe66da", - "@angular/core": "github:angular/core-builds#b122f0b7baab3a2cf7e56cbc4d6bdf7accd7427e", - "@angular/forms": "github:angular/forms-builds#cbfcaff66a443a68cc904c5fe4c83d5d701fdfd5", - "@angular/language-service": "github:angular/language-service-builds#2302fdaaca37a1c82eb7c81a5be1a7d3c6c19de3", - "@angular/localize": "github:angular/localize-builds#ab5112cfa1d9334195606e0114389bcf59afe835", - "@angular/platform-browser": "github:angular/platform-browser-builds#4bf60f56d6a0451465fa284b69525b7b3836e75c", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#71f261398865e45dc73e4d9d816a2283b117782e", - "@angular/platform-server": "github:angular/platform-server-builds#b154b10b87e44e5e5a666a2282e373b6bf526292", - "@angular/router": "github:angular/router-builds#1b4d94e40daf5b88a084900db239ecbed1c115e1" + "@angular/animations": "github:angular/animations-builds#01f292dba4c8c26a9cbdfcc5c4511c6be4126b0c", + "@angular/common": "github:angular/common-builds#64c2629d4906f79745019dc522b291b1dfcffddc", + "@angular/compiler": "github:angular/compiler-builds#f1ae9b5729813ff9110a2807437ad1ecf5a9914a", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#d33a18c76e8abf1a875e4a298fc89be46b21bc4a", + "@angular/core": "github:angular/core-builds#13db2076f804a43ee2e4f429239f7cbe1eacfb31", + "@angular/forms": "github:angular/forms-builds#d70f75a695539dcfa59bd238ea7ae6817624cab9", + "@angular/language-service": "github:angular/language-service-builds#a367ee138a20e03df34dd583508605c32ff4a787", + "@angular/localize": "github:angular/localize-builds#be95c7297784d1897244d0328a1edb211f288757", + "@angular/platform-browser": "github:angular/platform-browser-builds#6406cb2cfef79d2e08a1e4746f275ac97bcadecb", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#d1de4036718c558f86025460a2b1eed99773a3dc", + "@angular/platform-server": "github:angular/platform-server-builds#8f45d6411f005097ff4d5c8ccafbf969d2a69c31", + "@angular/router": "github:angular/router-builds#7b9ecc6c4d313704aef1cecc993e8850f71a625b" } } \ No newline at end of file
238438e26fbf335a7ee87115df9720f8e1665605
2021-02-03 22:44:26
Alan Agius
refactor(@angular-devkit/build-angular): remove BundleBudgetPlugin
false
remove BundleBudgetPlugin
refactor
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts index 50303eed2c59..a5492835f9cc 100644 --- a/packages/angular_devkit/build_angular/src/browser/index.ts +++ b/packages/angular_devkit/build_angular/src/browser/index.ts @@ -296,6 +296,7 @@ export function buildWebpackBrowser( return { success }; } else { + const processResults: ProcessBundleResult[] = []; const bundleInfoStats: BundleStats[] = []; outputPaths = ensureOutputPaths(baseOutputPath, i18n); @@ -445,7 +446,6 @@ export function buildWebpackBrowser( const processActions: typeof actions = []; let processRuntimeAction: ProcessBundleOptions | undefined; - const processResults: ProcessBundleResult[] = []; for (const action of actions) { // If SRI is enabled always process the runtime bundle // Lazy route integrity values are stored in the runtime bundle @@ -598,22 +598,6 @@ export function buildWebpackBrowser( const asset = webpackStats.assets?.find(a => a.name === chunk.files[0]); bundleInfoStats.push(generateBundleStats({ ...chunk, size: asset?.size })); } - - // Check for budget errors and display them to the user. - const budgets = options.budgets || []; - const budgetFailures = checkBudgets(budgets, webpackStats, processResults); - for (const { severity, message } of budgetFailures) { - switch (severity) { - case ThresholdSeverity.Warning: - webpackStats.warnings.push(message); - break; - case ThresholdSeverity.Error: - webpackStats.errors.push(message); - break; - default: - assertNever(severity); - } - } } else { files = emittedFiles.filter(x => x.name !== 'polyfills-es5'); noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5'); @@ -636,6 +620,24 @@ export function buildWebpackBrowser( } } + // Check for budget errors and display them to the user. + const budgets = options.budgets; + if (budgets?.length) { + const budgetFailures = checkBudgets(budgets, webpackStats, processResults); + for (const { severity, message } of budgetFailures) { + switch (severity) { + case ThresholdSeverity.Warning: + webpackStats.warnings.push(message); + break; + case ThresholdSeverity.Error: + webpackStats.errors.push(message); + break; + default: + assertNever(severity); + } + } + } + // Copy assets if (!options.watch && options.assets?.length) { spinner.start('Copying assets...'); diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts index 25ebe82e82cc..2db7be0a4dbb 100644 --- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts +++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts @@ -39,7 +39,6 @@ import { findAllNodeModules } from '../../utils/find-up'; import { Spinner } from '../../utils/spinner'; import { isWebpackFiveOrHigher, withWebpackFourOrFive } from '../../utils/webpack-version'; import { - BundleBudgetPlugin, DedupeModuleResolvePlugin, NamedLazyChunksPlugin, OptimizeCssWebpackPlugin, @@ -361,17 +360,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration { ); } - if (buildOptions.budgets.length && !differentialLoadingMode) { - // Budgets are computed after differential builds, not via a plugin. - // https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/src/browser/index.ts - const extraEntryPoints = [ - ...normalizeExtraEntryPoints(buildOptions.styles || [], 'styles'), - ...normalizeExtraEntryPoints(buildOptions.scripts || [], 'scripts'), - ]; - - extraPlugins.push(new BundleBudgetPlugin({ budgets: buildOptions.budgets, extraEntryPoints })); - } - if ((scriptsSourceMap || stylesSourceMap)) { extraRules.push({ test: /\.m?js$/, diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts deleted file mode 100644 index c5dfe10c3e73..000000000000 --- a/packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import { Compiler } from 'webpack'; -import { Budget } from '../../browser/schema'; -import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator'; -import { ProcessBundleResult } from '../../utils/process-bundle'; -import { addError, addWarning } from '../../utils/webpack-diagnostics'; -import { markAsyncChunksNonInitial } from '../utils/async-chunks'; -import { NormalizedEntryPoint } from '../utils/helpers'; - -export interface BundleBudgetPluginOptions { - budgets: Budget[]; - extraEntryPoints: NormalizedEntryPoint[]; -} - -export class BundleBudgetPlugin { - constructor(private options: BundleBudgetPluginOptions) { } - - apply(compiler: Compiler): void { - const { budgets } = this.options; - - if (!budgets || budgets.length === 0) { - return; - } - - compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation) => { - // No process bundle results because this plugin is only used when differential - // builds are disabled. - const processResults: ProcessBundleResult[] = []; - - // Fix incorrectly set `initial` value on chunks. - const stats = compilation.getStats().toJson(); - stats.chunks = markAsyncChunksNonInitial(stats, this.options.extraEntryPoints); - - for (const { severity, message } of checkBudgets(budgets, stats, processResults)) { - switch (severity) { - case ThresholdSeverity.Warning: - addWarning(compilation, `budgets: ${message}`); - break; - case ThresholdSeverity.Error: - addError(compilation, `budgets: ${message}`); - break; - } - } - }); - } -} diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts index 5a745c4116df..c8cbcc181ee5 100644 --- a/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts +++ b/packages/angular_devkit/build_angular/src/webpack/plugins/index.ts @@ -9,7 +9,6 @@ // Exports the webpack plugins we use internally. export { AnyComponentStyleBudgetChecker } from './any-component-style-budget-checker'; export { OptimizeCssWebpackPlugin, OptimizeCssWebpackPluginOptions } from './optimize-css-webpack-plugin'; -export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget'; export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin'; export { SuppressExtractedTextChunksWebpackPlugin } from './suppress-entry-chunks-webpack-plugin'; export { RemoveHashPlugin, RemoveHashPluginOptions } from './remove-hash-plugin';
3a576574ae9aef01f39023148f807e821fb02c7d
2023-08-05 00:18:37
Charles Lyding
refactor(@angular-devkit/build-angular): restructure i18n extraction builder to allow for application builder support
false
restructure i18n extraction builder to allow for application builder support
refactor
diff --git a/goldens/public-api/angular_devkit/build_angular/index.md b/goldens/public-api/angular_devkit/build_angular/index.md index 0d1f4a8aabcb..328f9814803b 100644 --- a/goldens/public-api/angular_devkit/build_angular/index.md +++ b/goldens/public-api/angular_devkit/build_angular/index.md @@ -6,7 +6,6 @@ import { BuilderContext } from '@angular-devkit/architect'; import { BuilderOutput } from '@angular-devkit/architect'; -import { BuildResult } from '@angular-devkit/build-webpack'; import type { ConfigOptions } from 'karma'; import { Configuration } from 'webpack'; import { DevServerBuildOutput } from '@angular-devkit/build-webpack'; @@ -153,7 +152,7 @@ export function executeDevServerBuilder(options: DevServerBuilderOptions, contex // @public export function executeExtractI18nBuilder(options: ExtractI18nBuilderOptions, context: BuilderContext, transforms?: { webpackConfiguration?: ExecutionTransformer<webpack.Configuration>; -}): Promise<BuildResult>; +}): Promise<BuilderOutput>; // @public export function executeKarmaBuilder(options: KarmaBuilderOptions, context: BuilderContext, transforms?: { @@ -175,8 +174,14 @@ export function executeServerBuilder(options: ServerBuilderOptions, context: Bui // @public export type ExecutionTransformer<T> = (input: T) => T | Promise<T>; -// @public (undocumented) -export type ExtractI18nBuilderOptions = Schema; +// @public +export interface ExtractI18nBuilderOptions { + browserTarget: string; + format?: Format; + outFile?: string; + outputPath?: string; + progress?: boolean; +} // @public (undocumented) export interface FileReplacement { diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/builder.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/builder.ts new file mode 100644 index 000000000000..17104f37102a --- /dev/null +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/builder.ts @@ -0,0 +1,173 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import type { Diagnostics } from '@angular/localize/tools'; +import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect'; +import fs from 'node:fs'; +import path from 'node:path'; +import type webpack from 'webpack'; +import type { ExecutionTransformer } from '../../transforms'; +import { loadEsmModule } from '../../utils/load-esm'; +import { purgeStaleBuildCache } from '../../utils/purge-cache'; +import { assertCompatibleAngularVersion } from '../../utils/version'; +import { normalizeOptions } from './options'; +import { Schema as ExtractI18nBuilderOptions, Format } from './schema'; + +/** + * @experimental Direct usage of this function is considered experimental. + */ +export async function execute( + options: ExtractI18nBuilderOptions, + context: BuilderContext, + transforms?: { + webpackConfiguration?: ExecutionTransformer<webpack.Configuration>; + }, +): Promise<BuilderOutput> { + // Determine project name from builder context target + const projectName = context.target?.project; + if (!projectName) { + context.logger.error(`The 'extract-i18n' builder requires a target to be specified.`); + + return { success: false }; + } + + // Check Angular version. + assertCompatibleAngularVersion(context.workspaceRoot); + + // Load the Angular localize package. + // The package is a peer dependency and might not be present + let localizeToolsModule; + try { + localizeToolsModule = await loadEsmModule<typeof import('@angular/localize/tools')>( + '@angular/localize/tools', + ); + } catch { + return { + success: false, + error: `i18n extraction requires the '@angular/localize' package.`, + }; + } + + // Purge old build disk cache. + await purgeStaleBuildCache(context); + + // Normalize options + const normalizedOptions = await normalizeOptions(context, projectName, options); + const builderName = await context.getBuilderNameForTarget(normalizedOptions.browserTarget); + + // Extract messages based on configured builder + // TODO: Implement application/browser-esbuild support + let extractionResult; + if ( + builderName === '@angular-devkit/build-angular:application' || + builderName === '@angular-devkit/build-angular:browser-esbuild' + ) { + return { + error: 'i18n extraction is currently only supported with the "browser" builder.', + success: false, + }; + } else { + const { extractMessages } = await import('./webpack-extraction'); + extractionResult = await extractMessages(normalizedOptions, builderName, context, transforms); + } + + // Return the builder result if it failed + if (!extractionResult.builderResult.success) { + return extractionResult.builderResult; + } + + // Perform duplicate message checks + const { checkDuplicateMessages } = localizeToolsModule; + + // The filesystem is used to create a relative path for each file + // from the basePath. This relative path is then used in the error message. + const checkFileSystem = { + relative(from: string, to: string): string { + return path.relative(from, to); + }, + }; + const diagnostics = checkDuplicateMessages( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + checkFileSystem as any, + extractionResult.messages, + 'warning', + // eslint-disable-next-line @typescript-eslint/no-explicit-any + extractionResult.basePath as any, + ); + if (diagnostics.messages.length > 0) { + context.logger.warn(diagnostics.formatDiagnostics('')); + } + + // Serialize all extracted messages + const serializer = await createSerializer( + localizeToolsModule, + normalizedOptions.format, + normalizedOptions.i18nOptions.sourceLocale, + extractionResult.basePath, + extractionResult.useLegacyIds, + diagnostics, + ); + const content = serializer.serialize(extractionResult.messages); + + // Ensure directory exists + const outputPath = path.dirname(normalizedOptions.outFile); + if (!fs.existsSync(outputPath)) { + fs.mkdirSync(outputPath, { recursive: true }); + } + + // Write translation file + fs.writeFileSync(normalizedOptions.outFile, content); + + return extractionResult.builderResult; +} + +async function createSerializer( + localizeToolsModule: typeof import('@angular/localize/tools'), + format: Format, + sourceLocale: string, + basePath: string, + useLegacyIds: boolean, + diagnostics: Diagnostics, +) { + const { + XmbTranslationSerializer, + LegacyMessageIdMigrationSerializer, + ArbTranslationSerializer, + Xliff1TranslationSerializer, + Xliff2TranslationSerializer, + SimpleJsonTranslationSerializer, + } = localizeToolsModule; + + switch (format) { + case Format.Xmb: + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return new XmbTranslationSerializer(basePath as any, useLegacyIds); + case Format.Xlf: + case Format.Xlif: + case Format.Xliff: + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return new Xliff1TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {}); + case Format.Xlf2: + case Format.Xliff2: + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return new Xliff2TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {}); + case Format.Json: + return new SimpleJsonTranslationSerializer(sourceLocale); + case Format.LegacyMigrate: + return new LegacyMessageIdMigrationSerializer(diagnostics); + case Format.Arb: + const fileSystem = { + relative(from: string, to: string): string { + return path.relative(from, to); + }, + }; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return new ArbTranslationSerializer(sourceLocale, basePath as any, fileSystem as any); + } +} diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/index.ts index 96116bdf712a..e38999f63d1b 100644 --- a/packages/angular_devkit/build_angular/src/builders/extract-i18n/index.ts +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/index.ts @@ -6,302 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize'; -import type { Diagnostics } from '@angular/localize/tools'; -import { BuilderContext, createBuilder, targetFromTargetString } from '@angular-devkit/architect'; -import { BuildResult, runWebpack } from '@angular-devkit/build-webpack'; -import { JsonObject } from '@angular-devkit/core'; -import * as fs from 'fs'; -import * as path from 'path'; -import { lastValueFrom } from 'rxjs'; -import webpack, { Configuration } from 'webpack'; -import { getCommonConfig } from '../../tools/webpack/configs'; -import { createWebpackLoggingCallback } from '../../tools/webpack/utils/stats'; -import { ExecutionTransformer } from '../../transforms'; -import { createI18nOptions } from '../../utils/i18n-options'; -import { loadEsmModule } from '../../utils/load-esm'; -import { purgeStaleBuildCache } from '../../utils/purge-cache'; -import { assertCompatibleAngularVersion } from '../../utils/version'; -import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config'; -import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema'; -import { Format, Schema } from './schema'; - -export type ExtractI18nBuilderOptions = Schema; - -function getI18nOutfile(format: string | undefined) { - switch (format) { - case 'xmb': - return 'messages.xmb'; - case 'xlf': - case 'xlif': - case 'xliff': - case 'xlf2': - case 'xliff2': - return 'messages.xlf'; - case 'json': - case 'legacy-migrate': - return 'messages.json'; - case 'arb': - return 'messages.arb'; - default: - throw new Error(`Unsupported format "${format}"`); - } -} - -async function getSerializer( - localizeToolsModule: typeof import('@angular/localize/tools'), - format: Format, - sourceLocale: string, - basePath: string, - useLegacyIds: boolean, - diagnostics: Diagnostics, -) { - const { - XmbTranslationSerializer, - LegacyMessageIdMigrationSerializer, - ArbTranslationSerializer, - Xliff1TranslationSerializer, - Xliff2TranslationSerializer, - SimpleJsonTranslationSerializer, - } = localizeToolsModule; - - switch (format) { - case Format.Xmb: - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return new XmbTranslationSerializer(basePath as any, useLegacyIds); - case Format.Xlf: - case Format.Xlif: - case Format.Xliff: - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return new Xliff1TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {}); - case Format.Xlf2: - case Format.Xliff2: - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return new Xliff2TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {}); - case Format.Json: - return new SimpleJsonTranslationSerializer(sourceLocale); - case Format.LegacyMigrate: - return new LegacyMessageIdMigrationSerializer(diagnostics); - case Format.Arb: - const fileSystem = { - relative(from: string, to: string): string { - return path.relative(from, to); - }, - }; - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return new ArbTranslationSerializer(sourceLocale, basePath as any, fileSystem as any); - } -} - -function normalizeFormatOption(options: ExtractI18nBuilderOptions): Format { - let format = options.format; - - switch (format) { - case Format.Xlf: - case Format.Xlif: - case Format.Xliff: - format = Format.Xlf; - break; - case Format.Xlf2: - case Format.Xliff2: - format = Format.Xlf2; - break; - } - - // Default format is xliff1 - return format ?? Format.Xlf; -} - -class NoEmitPlugin { - apply(compiler: webpack.Compiler): void { - compiler.hooks.shouldEmit.tap('angular-no-emit', () => false); - } -} - -/** - * @experimental Direct usage of this function is considered experimental. - */ -export async function execute( - options: ExtractI18nBuilderOptions, - context: BuilderContext, - transforms?: { - webpackConfiguration?: ExecutionTransformer<webpack.Configuration>; - }, -): Promise<BuildResult> { - // Check Angular version. - assertCompatibleAngularVersion(context.workspaceRoot); - - // Purge old build disk cache. - await purgeStaleBuildCache(context); - - const browserTarget = targetFromTargetString(options.browserTarget); - const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>( - await context.getTargetOptions(browserTarget), - await context.getBuilderNameForTarget(browserTarget), - ); - - const format = normalizeFormatOption(options); - - // We need to determine the outFile name so that AngularCompiler can retrieve it. - let outFile = options.outFile || getI18nOutfile(format); - if (options.outputPath) { - // AngularCompilerPlugin doesn't support genDir so we have to adjust outFile instead. - outFile = path.join(options.outputPath, outFile); - } - outFile = path.resolve(context.workspaceRoot, outFile); - - if (!context.target || !context.target.project) { - throw new Error('The builder requires a target.'); - } - - try { - require.resolve('@angular/localize'); - } catch { - return { - success: false, - error: `i18n extraction requires the '@angular/localize' package.`, - outputPath: outFile, - }; - } - - const metadata = await context.getProjectMetadata(context.target); - const i18n = createI18nOptions(metadata); - - let useLegacyIds = true; - - const ivyMessages: LocalizeMessage[] = []; - const builderOptions = { - ...browserOptions, - optimization: false, - sourceMap: { - scripts: true, - styles: false, - vendor: true, - }, - buildOptimizer: false, - aot: true, - progress: options.progress, - budgets: [], - assets: [], - scripts: [], - styles: [], - deleteOutputPath: false, - extractLicenses: false, - subresourceIntegrity: false, - outputHashing: OutputHashing.None, - namedChunks: true, - allowedCommonJsDependencies: undefined, - }; - const { config, projectRoot } = await generateBrowserWebpackConfigFromContext( - builderOptions, - context, - (wco) => { - // Default value for legacy message ids is currently true - useLegacyIds = wco.tsConfig.options.enableI18nLegacyMessageIdFormat ?? true; - - const partials: (Promise<Configuration> | Configuration)[] = [ - { plugins: [new NoEmitPlugin()] }, - getCommonConfig(wco), - ]; - - // Add Ivy application file extractor support - partials.unshift({ - module: { - rules: [ - { - test: /\.[cm]?[tj]sx?$/, - loader: require.resolve('./ivy-extract-loader'), - options: { - messageHandler: (messages: LocalizeMessage[]) => ivyMessages.push(...messages), - }, - }, - ], - }, - }); - - // Replace all stylesheets with empty content - partials.push({ - module: { - rules: [ - { - test: /\.(css|scss|sass|less)$/, - loader: require.resolve('./empty-loader'), - }, - ], - }, - }); - - return partials; - }, - // During extraction we don't need specific browser support. - { supportedBrowsers: undefined }, - ); - - // All the localize usages are setup to first try the ESM entry point then fallback to the deep imports. - // This provides interim compatibility while the framework is transitioned to bundled ESM packages. - const localizeToolsModule = await loadEsmModule<typeof import('@angular/localize/tools')>( - '@angular/localize/tools', - ); - const webpackResult = await lastValueFrom( - runWebpack((await transforms?.webpackConfiguration?.(config)) || config, context, { - logging: createWebpackLoggingCallback(builderOptions, context.logger), - webpackFactory: webpack, - }), - ); - - // Set the outputPath to the extraction output location for downstream consumers - webpackResult.outputPath = outFile; - - // Complete if Webpack build failed - if (!webpackResult.success) { - return webpackResult; - } - - const basePath = config.context || projectRoot; - - const { checkDuplicateMessages } = localizeToolsModule; - - // The filesystem is used to create a relative path for each file - // from the basePath. This relative path is then used in the error message. - const checkFileSystem = { - relative(from: string, to: string): string { - return path.relative(from, to); - }, - }; - const diagnostics = checkDuplicateMessages( - // eslint-disable-next-line @typescript-eslint/no-explicit-any - checkFileSystem as any, - ivyMessages, - 'warning', - // eslint-disable-next-line @typescript-eslint/no-explicit-any - basePath as any, - ); - if (diagnostics.messages.length > 0) { - context.logger.warn(diagnostics.formatDiagnostics('')); - } - - // Serialize all extracted messages - const serializer = await getSerializer( - localizeToolsModule, - format, - i18n.sourceLocale, - basePath, - useLegacyIds, - diagnostics, - ); - const content = serializer.serialize(ivyMessages); - - // Ensure directory exists - const outputPath = path.dirname(outFile); - if (!fs.existsSync(outputPath)) { - fs.mkdirSync(outputPath, { recursive: true }); - } - - // Write translation file - fs.writeFileSync(outFile, content); - - return webpackResult; -} +import { createBuilder } from '@angular-devkit/architect'; +import { execute } from './builder'; +import type { Schema as ExtractI18nBuilderOptions } from './schema'; +export { ExtractI18nBuilderOptions, execute }; export default createBuilder<ExtractI18nBuilderOptions>(execute); diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/options.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/options.ts new file mode 100644 index 000000000000..1db3e257abb5 --- /dev/null +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/options.ts @@ -0,0 +1,88 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import { BuilderContext, targetFromTargetString } from '@angular-devkit/architect'; +import { fail } from 'node:assert'; +import path from 'node:path'; +import { createI18nOptions } from '../../utils/i18n-options'; +import { Schema as ExtractI18nOptions, Format } from './schema'; + +export type NormalizedExtractI18nOptions = Awaited<ReturnType<typeof normalizeOptions>>; + +/** + * Normalize the user provided options by creating full paths for all path based options + * and converting multi-form options into a single form that can be directly used + * by the build process. + * + * @param context The context for current builder execution. + * @param projectName The name of the project for the current execution. + * @param options An object containing the options to use for the build. + * @returns An object containing normalized options required to perform the build. + */ +export async function normalizeOptions( + context: BuilderContext, + projectName: string, + options: ExtractI18nOptions, +) { + const workspaceRoot = context.workspaceRoot; + const projectMetadata = await context.getProjectMetadata(projectName); + const projectRoot = path.join(workspaceRoot, (projectMetadata.root as string | undefined) ?? ''); + + const browserTarget = targetFromTargetString(options.browserTarget); + + const i18nOptions = createI18nOptions(projectMetadata); + + // Normalize xliff format extensions + let format = options.format; + switch (format) { + case undefined: + // Default format is xliff1 + case Format.Xlf: + case Format.Xlif: + case Format.Xliff: + format = Format.Xliff; + break; + case Format.Xlf2: + case Format.Xliff2: + format = Format.Xliff2; + break; + } + + let outFile = options.outFile || getDefaultOutFile(format); + if (options.outputPath) { + outFile = path.join(options.outputPath, outFile); + } + outFile = path.resolve(context.workspaceRoot, outFile); + + return { + workspaceRoot, + projectRoot, + browserTarget, + i18nOptions, + format, + outFile, + progress: options.progress ?? true, + }; +} + +function getDefaultOutFile(format: Format) { + switch (format) { + case Format.Xmb: + return 'messages.xmb'; + case Format.Xliff: + case Format.Xliff2: + return 'messages.xlf'; + case Format.Json: + case Format.LegacyMigrate: + return 'messages.json'; + case Format.Arb: + return 'messages.arb'; + default: + fail(`Invalid Format enum value: ${format as unknown}`); + } +} diff --git a/packages/angular_devkit/build_angular/src/builders/extract-i18n/webpack-extraction.ts b/packages/angular_devkit/build_angular/src/builders/extract-i18n/webpack-extraction.ts new file mode 100644 index 000000000000..5691d5f9a8aa --- /dev/null +++ b/packages/angular_devkit/build_angular/src/builders/extract-i18n/webpack-extraction.ts @@ -0,0 +1,128 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize'; +import { BuilderContext } from '@angular-devkit/architect'; +import { BuildResult, runWebpack } from '@angular-devkit/build-webpack'; +import { lastValueFrom } from 'rxjs'; +import webpack, { type Configuration } from 'webpack'; +import { getCommonConfig } from '../../tools/webpack/configs'; +import { createWebpackLoggingCallback } from '../../tools/webpack/utils/stats'; +import { ExecutionTransformer } from '../../transforms'; +import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config'; +import { OutputHashing, Schema } from '../browser/schema'; +import { NormalizedExtractI18nOptions } from './options'; + +class NoEmitPlugin { + apply(compiler: webpack.Compiler): void { + compiler.hooks.shouldEmit.tap('angular-no-emit', () => false); + } +} + +export async function extractMessages( + options: NormalizedExtractI18nOptions, + builderName: string, + context: BuilderContext, + transforms: { + webpackConfiguration?: ExecutionTransformer<webpack.Configuration>; + } = {}, +): Promise<{ + builderResult: BuildResult; + basePath: string; + messages: LocalizeMessage[]; + useLegacyIds: boolean; +}> { + const messages: LocalizeMessage[] = []; + let useLegacyIds = true; + + const browserOptions = await context.validateOptions( + await context.getTargetOptions(options.browserTarget), + builderName, + ); + + const builderOptions = { + ...browserOptions, + optimization: false, + sourceMap: { + scripts: true, + styles: false, + vendor: true, + }, + buildOptimizer: false, + aot: true, + progress: options.progress, + budgets: [], + assets: [], + scripts: [], + styles: [], + deleteOutputPath: false, + extractLicenses: false, + subresourceIntegrity: false, + outputHashing: OutputHashing.None, + namedChunks: true, + allowedCommonJsDependencies: undefined, + } as unknown as Schema; + const { config } = await generateBrowserWebpackConfigFromContext( + builderOptions, + context, + (wco) => { + // Default value for legacy message ids is currently true + useLegacyIds = wco.tsConfig.options.enableI18nLegacyMessageIdFormat ?? true; + + const partials: (Promise<Configuration> | Configuration)[] = [ + { plugins: [new NoEmitPlugin()] }, + getCommonConfig(wco), + ]; + + // Add Ivy application file extractor support + partials.unshift({ + module: { + rules: [ + { + test: /\.[cm]?[tj]sx?$/, + loader: require.resolve('./ivy-extract-loader'), + options: { + messageHandler: (fileMessages: LocalizeMessage[]) => messages.push(...fileMessages), + }, + }, + ], + }, + }); + + // Replace all stylesheets with empty content + partials.push({ + module: { + rules: [ + { + test: /\.(css|scss|sass|less)$/, + loader: require.resolve('./empty-loader'), + }, + ], + }, + }); + + return partials; + }, + // During extraction we don't need specific browser support. + { supportedBrowsers: undefined }, + ); + + const builderResult = await lastValueFrom( + runWebpack((await transforms?.webpackConfiguration?.(config)) || config, context, { + logging: createWebpackLoggingCallback(builderOptions, context.logger), + webpackFactory: webpack, + }), + ); + + return { + builderResult, + basePath: config.context || options.projectRoot, + messages, + useLegacyIds, + }; +}
86e5e520b0438edfb4a6500fe47c9817ac538cca
2023-05-16 18:03:40
Angular Robot
build: update angular
false
update angular
build
diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 40a080d20400..6a69c150c099 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@c06ec9414ddf07c14ade76d8a9068598a74790a2 + - uses: angular/dev-infra/github-actions/branch-manager@8e1bedcbabe29e047cfda302d48c7643fece49e9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index b9737435fddd..f97e64da51f3 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@c06ec9414ddf07c14ade76d8a9068598a74790a2 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@8e1bedcbabe29e047cfda302d48c7643fece49e9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - - uses: angular/dev-infra/github-actions/post-approval-changes@c06ec9414ddf07c14ade76d8a9068598a74790a2 + - uses: angular/dev-infra/github-actions/post-approval-changes@8e1bedcbabe29e047cfda302d48c7643fece49e9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 7998eed92f2f..76136c1fc700 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@c06ec9414ddf07c14ade76d8a9068598a74790a2 + - uses: angular/dev-infra/github-actions/feature-request@8e1bedcbabe29e047cfda302d48c7643fece49e9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/package.json b/package.json index 139c3912d3eb..7e933dd9c491 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "devDependencies": { "@ampproject/remapping": "2.2.1", "@angular/animations": "16.0.1", - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#9f37c10a3bf6d25d0e26497f444dac9c58a60000", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2c76a570b0ec8d7ef7639d3cd91119c0ca539b5", "@angular/cdk": "16.0.1", "@angular/common": "16.0.1", "@angular/compiler": "16.0.1", @@ -74,7 +74,7 @@ "@angular/forms": "16.0.1", "@angular/localize": "16.0.1", "@angular/material": "16.0.1", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#cdbc3028f032c3af4ccd8a18cdae48a2916bbd26", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#041c3c8d45b3d9beb238b2646990d345b53b07f3", "@angular/platform-browser": "16.0.1", "@angular/platform-browser-dynamic": "16.0.1", "@angular/platform-server": "16.0.1", diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index cd7c50500456..28dfce6f4a04 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#e701dc40043649ee94c01ae4dd3c1ea23e1b0077", - "@angular/cdk": "github:angular/cdk-builds#db02d85e80cde936efc5c916354d5a7272d6151c", - "@angular/common": "github:angular/common-builds#8d650f7bef11bea239d3f368e38ad46edf14c300", - "@angular/compiler": "github:angular/compiler-builds#a6f6fbf8de28a44c2f27dd3012f8361ea1986b93", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#8e75c7551ffc45d6e260d6d8320dd18f1b96c1c2", - "@angular/core": "github:angular/core-builds#1c3c30b7e8be21ffbb6972986846149716ad35b1", - "@angular/forms": "github:angular/forms-builds#75ab85c71c60bc3ff80b35c84670e5cca09f0b01", - "@angular/language-service": "github:angular/language-service-builds#959e82f4cb15a06d99cc6ce182faf7a982ab1b1b", - "@angular/localize": "github:angular/localize-builds#b0f92cc9c5ef432fc033be2725674e668187629e", - "@angular/material": "github:angular/material-builds#0b245107a69bc3e66d921cf3353165b6c2fac7b0", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#8e185d401f015e68d337a547eac9551bf69c1f2f", - "@angular/platform-browser": "github:angular/platform-browser-builds#ffce320f66bf889800ff3148711af1d99a2e492f", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#18e94733145d0334d364d6764b4857a45f4d5041", - "@angular/platform-server": "github:angular/platform-server-builds#28e4e679d2ef09fd139b9510973e8a3ea1bb8113", - "@angular/router": "github:angular/router-builds#467b71e0c9f0c2ee95b0756ae12aae4913a28b23", - "@angular/service-worker": "github:angular/service-worker-builds#06f90d54b5fad9ba024975c28ac937480811bb45" + "@angular/animations": "github:angular/animations-builds#bf4beda70ac65210388f886806badfa876e00c9f", + "@angular/cdk": "github:angular/cdk-builds#2c99dd76aa126b674005a50a87e96ec59f91d7d2", + "@angular/common": "github:angular/common-builds#8809e92a5401366b80607f7f23665b12eb7496d2", + "@angular/compiler": "github:angular/compiler-builds#286e8743faa6ac53154279c1a7aca86506f51209", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#0ef5f91accd504dc7398067e4ce2afbf3ce6ff5e", + "@angular/core": "github:angular/core-builds#cf2327eeb594438c548e39eb9435d418eb023d39", + "@angular/forms": "github:angular/forms-builds#e471b87c8b60a9daddd9f46f4a30f0c14de2b51f", + "@angular/language-service": "github:angular/language-service-builds#4b03d41307ff8d482efc24a47b77620dd745f3ca", + "@angular/localize": "github:angular/localize-builds#9a11148a80aef8fb53ce03d78405c3e8a373fe7a", + "@angular/material": "github:angular/material-builds#4fd3bcb7de9be59f3c2611a2c73a94c94edd9dd1", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#aec56a020f3d47f662c94c46ab9d5faf1064b71e", + "@angular/platform-browser": "github:angular/platform-browser-builds#8da11593dbc8e33abb6aa6c4fdb5bde38befa86f", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f7509ee3ec78c8094042955def56254ae252121d", + "@angular/platform-server": "github:angular/platform-server-builds#fec5a433f2a46168641b301f49915ab4f3e78305", + "@angular/router": "github:angular/router-builds#a82734b6af34392caf9ea99c78f90f6023a9112e", + "@angular/service-worker": "github:angular/service-worker-builds#93dfc6ed05511f7afeaf5c59c4204973941e3151" } } diff --git a/yarn.lock b/yarn.lock index d12983f72dc2..86daa66a33ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -123,10 +123,10 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#9f37c10a3bf6d25d0e26497f444dac9c58a60000": - version "0.0.0-c06ec9414ddf07c14ade76d8a9068598a74790a2" - uid "9f37c10a3bf6d25d0e26497f444dac9c58a60000" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#9f37c10a3bf6d25d0e26497f444dac9c58a60000" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2c76a570b0ec8d7ef7639d3cd91119c0ca539b5": + version "0.0.0-8e1bedcbabe29e047cfda302d48c7643fece49e9" + uid b2c76a570b0ec8d7ef7639d3cd91119c0ca539b5 + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2c76a570b0ec8d7ef7639d3cd91119c0ca539b5" dependencies: "@angular-devkit/build-angular" "16.0.0" "@angular/benchpress" "0.3.0" @@ -284,10 +284,10 @@ "@material/typography" "15.0.0-canary.3b5b55e31.0" tslib "^2.3.0" -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#cdbc3028f032c3af4ccd8a18cdae48a2916bbd26": - version "0.0.0-c06ec9414ddf07c14ade76d8a9068598a74790a2" - uid cdbc3028f032c3af4ccd8a18cdae48a2916bbd26 - resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#cdbc3028f032c3af4ccd8a18cdae48a2916bbd26" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#041c3c8d45b3d9beb238b2646990d345b53b07f3": + version "0.0.0-8e1bedcbabe29e047cfda302d48c7643fece49e9" + uid "041c3c8d45b3d9beb238b2646990d345b53b07f3" + resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#041c3c8d45b3d9beb238b2646990d345b53b07f3" dependencies: "@yarnpkg/lockfile" "^1.1.0" typescript "~4.9.0"
fd2bc9c3ecfe741bfed22449eecccd6f9a3de4e5
2017-01-11 01:39:52
Cédric Exbrayat
chore(lint): bump to tslint 4.3.0 and add a few new rules (#3934)
false
bump to tslint 4.3.0 and add a few new rules (#3934)
chore
diff --git a/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts b/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts index b4c4aee63d0a..6ebf4506af0a 100644 --- a/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts +++ b/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts @@ -5,7 +5,7 @@ import { <%= classifiedModuleName %>Directive } from './<%= dasherizedModuleName describe('<%= classifiedModuleName %>Directive', () => { it('should create an instance', () => { - let directive = new <%= classifiedModuleName %>Directive(); + const directive = new <%= classifiedModuleName %>Directive(); expect(directive).toBeTruthy(); }); }); diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.spec.ts b/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.spec.ts index 52587e29d153..4f7eb5817e0a 100644 --- a/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.spec.ts +++ b/packages/angular-cli/blueprints/ng2/files/__path__/app/app.component.spec.ts @@ -18,21 +18,21 @@ describe('AppComponent', () => { }); it('should create the app', async(() => { - let fixture = TestBed.createComponent(AppComponent); - let app = fixture.debugElement.componentInstance; + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; expect(app).toBeTruthy(); })); it(`should have as title '<%= prefix %> works!'`, async(() => { - let fixture = TestBed.createComponent(AppComponent); - let app = fixture.debugElement.componentInstance; + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; expect(app.title).toEqual('<%= prefix %> works!'); })); it('should render title in a h1 tag', async(() => { - let fixture = TestBed.createComponent(AppComponent); + const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); - let compiled = fixture.debugElement.nativeElement; + const compiled = fixture.debugElement.nativeElement; expect(compiled.querySelector('h1').textContent).toContain('<%= prefix %> works!'); })); }); diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/test.ts b/packages/angular-cli/blueprints/ng2/files/__path__/test.ts index be44dc587f3a..f9d51efd05fa 100644 --- a/packages/angular-cli/blueprints/ng2/files/__path__/test.ts +++ b/packages/angular-cli/blueprints/ng2/files/__path__/test.ts @@ -25,7 +25,7 @@ getTestBed().initTestEnvironment( platformBrowserDynamicTesting() ); // Then we find all the tests. -let context = require.context('./', true, /\.spec\.ts$/); +const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. context.keys().map(context); // Finally, start Karma to run the tests. diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/angular-cli/blueprints/ng2/files/package.json index 5993b940dbd5..99cd9bcec0f7 100644 --- a/packages/angular-cli/blueprints/ng2/files/package.json +++ b/packages/angular-cli/blueprints/ng2/files/package.json @@ -41,7 +41,7 @@ "karma-remap-istanbul": "^0.2.1", "protractor": "~4.0.13", "ts-node": "1.2.1", - "tslint": "^4.2.0", + "tslint": "^4.3.0", "typescript": "~2.0.3" } } diff --git a/packages/angular-cli/blueprints/ng2/files/tslint.json b/packages/angular-cli/blueprints/ng2/files/tslint.json index 5a407126ed90..5af56bc13f65 100644 --- a/packages/angular-cli/blueprints/ng2/files/tslint.json +++ b/packages/angular-cli/blueprints/ng2/files/tslint.json @@ -13,6 +13,7 @@ "eofline": true, "forin": true, "import-blacklist": [true, "rxjs"], + "import-spacing": true, "indent": [ true, "spaces" @@ -62,6 +63,7 @@ "check-else", "check-whitespace" ], + "prefer-const": true, "quotemark": [ true, "single" @@ -84,6 +86,8 @@ "variable-declaration": "nospace" } ], + "typeof-compare": true, + "unified-signatures": true, "variable-name": false, "whitespace": [ true, @@ -105,7 +109,6 @@ "use-pipe-transform-interface": true, "component-class-suffix": true, "directive-class-suffix": true, - "import-destructuring-spacing": true, "no-access-missing-member": true, "templates-use-public": true, "invoke-injectable": true diff --git a/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts index 7d0cee51aae8..95d868bdae15 100644 --- a/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts +++ b/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts @@ -5,7 +5,7 @@ import { <%= classifiedModuleName %>Pipe } from './<%= dasherizedModuleName %>.p describe('<%= classifiedModuleName %>Pipe', () => { it('create an instance', () => { - let pipe = new <%= classifiedModuleName %>Pipe(); + const pipe = new <%= classifiedModuleName %>Pipe(); expect(pipe).toBeTruthy(); }); });
5c2aa2f4b15b7ccfe3da0d5db3a04a81dbafe209
2024-11-01 16:47:29
Charles Lyding
refactor(@angular/build): allow experimental template update generation via environment variable
false
allow experimental template update generation via environment variable
refactor
diff --git a/packages/angular/build/src/builders/application/options.ts b/packages/angular/build/src/builders/application/options.ts index df34c1cbe510..dcac17d97d1e 100644 --- a/packages/angular/build/src/builders/application/options.ts +++ b/packages/angular/build/src/builders/application/options.ts @@ -98,6 +98,13 @@ interface InternalOptions { */ externalRuntimeStyles?: boolean; + /** + * Enables the AOT compiler to generate template component update functions. + * This option is only intended to be used with a development server that can process and serve component + * template updates. + */ + templateUpdates?: boolean; + /** * Enables instrumentation to collect code coverage data for specific files. * @@ -463,6 +470,7 @@ export async function normalizeOptions( externalRuntimeStyles, instrumentForCoverage, security, + templateUpdates: !!options.templateUpdates, }; } diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index f909d7ea4c32..a7a5d5a27e1a 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -23,7 +23,7 @@ import { createRemoveIdPrefixPlugin, } from '../../tools/vite/plugins'; import { loadProxyConfiguration, normalizeSourceMaps } from '../../utils'; -import { useComponentStyleHmr } from '../../utils/environment-options'; +import { useComponentStyleHmr, useComponentTemplateHmr } from '../../utils/environment-options'; import { loadEsmModule } from '../../utils/load-esm'; import { Result, ResultFile, ResultKind } from '../application/results'; import { @@ -145,6 +145,14 @@ export async function* serveWithVite( void loadEsmModule('@angular/compiler'); } + // Enable to support component template hot replacement (`NG_HMR_TEMPLATE=1` can be used to enable) + browserOptions.templateUpdates = !!serverOptions.liveReload && useComponentTemplateHmr; + if (browserOptions.templateUpdates) { + context.logger.warn( + 'Experimental support for component template hot replacement has been enabled via the "NG_HMR_TEMPLATE" environment variable.', + ); + } + // Setup the prebundling transformer that will be shared across Vite prebundling requests const prebundleTransformer = new JavaScriptTransformer( // Always enable JIT linking to support applications built with and without AOT. diff --git a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts index 7f838e50307e..b4f5db4435c5 100644 --- a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts +++ b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts @@ -51,6 +51,7 @@ export interface CompilerPluginOptions { incremental: boolean; externalRuntimeStyles?: boolean; instrumentForCoverage?: (request: string) => boolean; + templateUpdates?: boolean; } // eslint-disable-next-line max-lines-per-function @@ -656,6 +657,7 @@ function createCompilerOptionsTransformer( sourceRoot: undefined, preserveSymlinks, externalRuntimeStyles: pluginOptions.externalRuntimeStyles, + _enableHmr: pluginOptions.templateUpdates, }; }; } diff --git a/packages/angular/build/src/tools/esbuild/compiler-plugin-options.ts b/packages/angular/build/src/tools/esbuild/compiler-plugin-options.ts index 192a7a142acf..7f8e496a3383 100644 --- a/packages/angular/build/src/tools/esbuild/compiler-plugin-options.ts +++ b/packages/angular/build/src/tools/esbuild/compiler-plugin-options.ts @@ -25,6 +25,7 @@ export function createCompilerPluginOptions( jit, externalRuntimeStyles, instrumentForCoverage, + templateUpdates, } = options; const incremental = !!options.watch; @@ -40,5 +41,6 @@ export function createCompilerPluginOptions( incremental, externalRuntimeStyles, instrumentForCoverage, + templateUpdates, }; } diff --git a/packages/angular/build/src/utils/environment-options.ts b/packages/angular/build/src/utils/environment-options.ts index 73e403b7f171..40de16a535e3 100644 --- a/packages/angular/build/src/utils/environment-options.ts +++ b/packages/angular/build/src/utils/environment-options.ts @@ -105,6 +105,10 @@ const hmrComponentStylesVariable = process.env['NG_HMR_CSTYLES']; export const useComponentStyleHmr = !isPresent(hmrComponentStylesVariable) || !isDisabled(hmrComponentStylesVariable); +const hmrComponentTemplateVariable = process.env['NG_HMR_TEMPLATES']; +export const useComponentTemplateHmr = + isPresent(hmrComponentTemplateVariable) && isEnabled(hmrComponentTemplateVariable); + const partialSsrBuildVariable = process.env['NG_BUILD_PARTIAL_SSR']; export const usePartialSsrBuild = isPresent(partialSsrBuildVariable) && isEnabled(partialSsrBuildVariable);
2b937db66a886c4dc8597045ae98da3033672fb2
2023-04-11 22:17:26
Charles Lyding
fix(@angular-devkit/build-angular): ensure directories are properly ignored in esbuild builder
false
ensure directories are properly ignored in esbuild builder
fix
diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/options.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/options.ts index d7049711340c..7f4f68bc4a4a 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/options.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/options.ts @@ -36,17 +36,18 @@ export async function normalizeOptions( ) { const workspaceRoot = context.workspaceRoot; const projectMetadata = await context.getProjectMetadata(projectName); - const projectRoot = path.join(workspaceRoot, (projectMetadata.root as string | undefined) ?? ''); - const projectSourceRoot = path.join( - workspaceRoot, - (projectMetadata.sourceRoot as string | undefined) ?? 'src', + const projectRoot = normalizeDirectoryPath( + path.join(workspaceRoot, (projectMetadata.root as string | undefined) ?? ''), + ); + const projectSourceRoot = normalizeDirectoryPath( + path.join(workspaceRoot, (projectMetadata.sourceRoot as string | undefined) ?? 'src'), ); const cacheOptions = normalizeCacheOptions(projectMetadata, workspaceRoot); const mainEntryPoint = path.join(workspaceRoot, options.main); const tsconfig = path.join(workspaceRoot, options.tsConfig); - const outputPath = path.join(workspaceRoot, options.outputPath); + const outputPath = normalizeDirectoryPath(path.join(workspaceRoot, options.outputPath)); const optimizationOptions = normalizeOptimization(options.optimization); const sourcemapOptions = normalizeSourceMaps(options.sourceMap ?? false); const assets = options.assets?.length @@ -222,3 +223,18 @@ function findTailwindConfigurationFile( return undefined; } + +/** + * Normalize a directory path string. + * Currently only removes a trailing slash if present. + * @param path A path string. + * @returns A normalized path string. + */ +function normalizeDirectoryPath(path: string): string { + const last = path[path.length - 1]; + if (last === '/' || last === '\\') { + return path.slice(0, -1); + } + + return path; +}
c402903a3d4b6315ff694393d15101a9397d3aa5
2019-05-17 23:56:53
hawkgs
refactor(@schematics/angular): optimize insertAfterLastOccurrence AST util
false
optimize insertAfterLastOccurrence AST util
refactor
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts index dc659003f9dc..d87e243de893 100644 --- a/packages/schematics/angular/utility/ast-utils.ts +++ b/packages/schematics/angular/utility/ast-utils.ts @@ -189,8 +189,12 @@ export function insertAfterLastOccurrence(nodes: ts.Node[], file: string, fallbackPos: number, syntaxKind?: ts.SyntaxKind): Change { - // sort() has a side effect, so make a copy so that we won't overwrite the parent's object. - let lastItem = [...nodes].sort(nodesByPosition).pop(); + let lastItem: ts.Node | undefined; + for (const node of nodes) { + if (!lastItem || lastItem.getStart() < node.getStart()) { + lastItem = node; + } + } if (syntaxKind && lastItem) { lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop(); }
b24f152b693bad7561f7e2a4ab7830a109d1af54
2020-08-05 17:47:46
Renovate Bot
build: update caniuse-lite to version 1.0.30001111
false
update caniuse-lite to version 1.0.30001111
build
diff --git a/package.json b/package.json index 09f2912b6c18..f7fa3aa2dd20 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "bootstrap": "^4.0.0", "browserslist": "4.13.0", "cacache": "15.0.0", - "caniuse-lite": "1.0.30001110", + "caniuse-lite": "1.0.30001111", "circular-dependency-plugin": "5.2.0", "codelyzer": "^6.0.0", "common-tags": "^1.8.0", diff --git a/yarn.lock b/yarn.lock index b136a7a4d592..ec21c399e3e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3464,10 +3464,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" [email protected]: - version "1.0.30001110" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001110.tgz#9003e3c7f5a43ea6f1193d4d5acba0bfb152c71a" - integrity sha512-KqJWeat4rhSHF0ito4yz9q/JuZHkvn71SsBnxge4azjPDbowIjOUnS8i1xpKGxZxU6BFiPqO2hSV2eiCpFQVRw== [email protected]: + version "1.0.30001111" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001111.tgz#dd0ce822c70eb6c7c068e4a55c22e19ec1501298" + integrity sha512-xnDje2wchd/8mlJu8sXvWxOGvMgv+uT3iZ3bkIAynKOzToCssWCmkz/ZIkQBs/2pUB4uwnJKVORWQ31UkbVjOg== caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043: version "1.0.30001055"
4dbca0a145445a379069ec46cff340df58134231
2022-10-12 00:52:22
Angular Robot
build: update dependency rollup to v3
false
update dependency rollup to v3
build
diff --git a/package.json b/package.json index d1df5bba36c7..73bb485269ea 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "prettier": "^2.2.1", "protractor": "7.0.0", "puppeteer": "15.4.1", - "rollup": "~2.79.0", + "rollup": "~3.0.0", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "^6.5.3", "shelljs": "^0.8.3", diff --git a/yarn.lock b/yarn.lock index fe720d3bad08..1a3a41af8fbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7044,13 +7044,6 @@ [email protected]: dependencies: sourcemap-codec "^1.4.8" -magic-string@^0.26.4: - version "0.26.6" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.6.tgz#b61e417c9f40b7b53bf7e73c0a803258e20d25ee" - integrity sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA== - dependencies: - sourcemap-codec "^1.4.8" - magic-string@^0.26.0: version "0.26.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.2.tgz#5331700e4158cd6befda738bb6b0c7b93c0d4432" @@ -7058,6 +7051,13 @@ magic-string@^0.26.0: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.26.4: + version "0.26.6" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.6.tgz#b61e417c9f40b7b53bf7e73c0a803258e20d25ee" + integrity sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA== + dependencies: + sourcemap-codec "^1.4.8" + make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -8762,10 +8762,10 @@ rollup-plugin-sourcemaps@^0.6.0: "@rollup/pluginutils" "^3.0.9" source-map-resolve "^0.6.0" -rollup@~2.79.0: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== +rollup@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.0.0.tgz#3e12b7cc4843615c855288c091686256c0a8e09d" + integrity sha512-iVomS2lySi4BM2QJb7lGZBjSndUEs6Ip+VDl25jcbM99VI5vWeEitvUSiNQkQkwqEiI4515m5shjyuwPcXS5Dg== optionalDependencies: fsevents "~2.3.2"
3f96e4b167eb1548c404e68b62a452264e6df1a2
2016-04-22 22:24:25
gdi2290
test(NodePlatformLocation): include origin url
false
include origin url
test
diff --git a/modules/universal/src/node/test/router/node_platform_location.spec.ts b/modules/universal/src/node/test/router/node_platform_location.spec.ts index 832fd83658bf..af34ba29501d 100644 --- a/modules/universal/src/node/test/router/node_platform_location.spec.ts +++ b/modules/universal/src/node/test/router/node_platform_location.spec.ts @@ -48,7 +48,7 @@ describe('NodePlatformLocation', () => { ]; for (const urlParts of urls) { - const spl = new NodePlatformLocation(format(urlParts)); + const spl = new NodePlatformLocation('', format(urlParts)); expectProperties(spl, urlParts); } }); @@ -56,7 +56,7 @@ describe('NodePlatformLocation', () => { it('should set new "pathname"', () => { const firstPathname = '/some/pathname'; const secondPathname = '/another/pathname'; - const spl = new NodePlatformLocation(format({ pathname: firstPathname })); + const spl = new NodePlatformLocation('', format({ pathname: firstPathname })); (<any>expect)(spl.pathname).toBe(firstPathname); spl.pathname = secondPathname; @@ -64,7 +64,7 @@ describe('NodePlatformLocation', () => { }); it('should throw on trying to get base href from DOM', () => { - const spl = new NodePlatformLocation('/'); + const spl = new NodePlatformLocation('', '/'); (<any>expect)(() => spl.getBaseHrefFromDOM()).toThrowError(); }); }); @@ -85,7 +85,7 @@ describe('NodePlatformLocation', () => { ]; beforeEach(() => { - spl = new NodePlatformLocation(requestUrl); + spl = new NodePlatformLocation('', requestUrl); }); describe('pushState()', () => {
b8aa05721d97b5568b3f28ced13720123f81da8b
2016-04-18 09:11:44
gdi2290
feat(universal): export files in platform
false
export files in platform
feat
diff --git a/modules/universal/src/node/platform/index.ts b/modules/universal/src/node/platform/index.ts index 86de56c2d683..a36eb1e209c6 100644 --- a/modules/universal/src/node/platform/index.ts +++ b/modules/universal/src/node/platform/index.ts @@ -1,5 +1,7 @@ export * from './dom/node_dom_renderer'; export * from './common'; export * from './document'; -export * from './node'; +export * from './node_shared_styles_host'; +export * from './node_template_parser'; export * from './node_xhr_impl'; +export * from './node';
8e6c4ac297cf1017d79b71eb4f2191c045ec2203
2019-11-27 02:42:38
Renovate Bot
build: update raw-loader to version 4.0.0
false
update raw-loader to version 4.0.0
build
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index f3636bdba9b1..313642e624dc 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -43,7 +43,7 @@ "postcss": "7.0.23", "postcss-import": "12.0.1", "postcss-loader": "3.0.0", - "raw-loader": "3.1.0", + "raw-loader": "4.0.0", "regenerator-runtime": "0.13.3", "rimraf": "3.0.0", "rollup": "1.27.5", diff --git a/yarn.lock b/yarn.lock index eed423e8b378..3228e744865e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8756,13 +8756,13 @@ [email protected]: iconv-lite "0.4.24" unpipe "1.0.0" [email protected]: - version "3.1.0" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f" - integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA== [email protected]: + version "4.0.0" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.0.tgz#d639c40fb9d72b5c7f8abc1fb2ddb25b29d3d540" + integrity sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q== dependencies: - loader-utils "^1.1.0" - schema-utils "^2.0.1" + loader-utils "^1.2.3" + schema-utils "^2.5.0" rc@^1.2.7, rc@^1.2.8: version "1.2.8"
057d31cb73bb7706f4c94779c0e7ff0f761116e1
2018-03-10 03:11:13
Vikram Subramanian
chore(ci): enable sample circleci config
false
enable sample circleci config
chore
diff --git a/.cicleci/config.yml b/.cicleci/config.yml new file mode 100644 index 000000000000..ca093f17ab3b --- /dev/null +++ b/.cicleci/config.yml @@ -0,0 +1,39 @@ +# Javascript Node CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-javascript/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/node:7.10 + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/mongo:3.4.4 + + working_directory: ~/repo + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: yarn install + + - save_cache: + paths: + - node_modules + key: v1-dependencies-{{ checksum "package.json" }} + + # run tests! + - run: yarn test + +
8c9b2a258932bab84d90449cd68e60ef4ed5df1c
2021-04-04 12:37:06
Charles Lyding
test(@angular-devkit/build-angular): remove unneeded custom Jasmine test timeouts
false
remove unneeded custom Jasmine test timeouts
test
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts index e396b4e59cb3..faee30b1d996 100644 --- a/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts +++ b/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts @@ -266,7 +266,7 @@ describe('Browser Builder styles', () => { const overrides = { extractCss: true, styles: [`src/styles.scss`] }; await browserBuild(architect, host, target, overrides); - }, 30000); + }); it(`supports font-awesome imports (tilde)`, async () => { host.writeMultipleFiles({ @@ -278,7 +278,7 @@ describe('Browser Builder styles', () => { const overrides = { extractCss: true, styles: [`src/styles.scss`] }; await browserBuild(architect, host, target, overrides); - }, 30000); + }); it(`supports font-awesome imports without extractCss`, async () => { host.writeMultipleFiles({ @@ -289,7 +289,7 @@ describe('Browser Builder styles', () => { const overrides = { extractCss: false, styles: [`src/styles.scss`] }; await browserBuild(architect, host, target, overrides); - }, 30000); + }); it(`uses autoprefixer`, async () => { host.writeMultipleFiles({ @@ -456,7 +456,7 @@ describe('Browser Builder styles', () => { main = await files['main.js']; expect(styles).toContain(`url('/assets/global-img-absolute.svg')`); expect(main).toContain(`url('/assets/component-img-absolute.svg')`); - }, 90000); + }); it(`supports bootstrap@4 with full path`, async () => { const bootstrapPath = dirname(require.resolve('bootstrap/package.json')); diff --git a/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts index 90fdb568f476..56257ab2c0a7 100644 --- a/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts +++ b/packages/angular_devkit/build_angular/src/dev-server/hmr_spec.ts @@ -112,7 +112,7 @@ describe('Dev Server Builder HMR', () => { take(2), ) .toPromise(); - }, 30000); + }); it('works for TS changes', async () => { const run = await architect.scheduleTarget(target, overrides); @@ -147,7 +147,7 @@ describe('Dev Server Builder HMR', () => { take(2), ) .toPromise(); - }, 30000); + }); it('restores input and select values', async () => { const run = await architect.scheduleTarget(target, overrides); @@ -191,5 +191,5 @@ describe('Dev Server Builder HMR', () => { take(2), ) .toPromise(); - }, 30000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts index ad92b7fcf7f2..04995ebf72d2 100644 --- a/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts +++ b/packages/angular_devkit/build_angular/src/dev-server/live-reload_spec.ts @@ -184,7 +184,7 @@ describe('Dev Server Builder live-reload', () => { take(2), ) .toPromise(); - }, 30000); + }); it('works without http -> http proxy', async () => { const run = await architect.scheduleTarget(target, overrides); @@ -215,7 +215,7 @@ describe('Dev Server Builder live-reload', () => { take(2), ) .toPromise(); - }, 30000); + }); it('works without https -> http proxy', async () => { const run = await architect.scheduleTarget(target, overrides); @@ -246,7 +246,7 @@ describe('Dev Server Builder live-reload', () => { take(2), ) .toPromise(); - }, 30000); + }); it('works without https -> http proxy without websockets (dotnet emulation)', async () => { const run = await architect.scheduleTarget(target, overrides); @@ -279,5 +279,5 @@ describe('Dev Server Builder live-reload', () => { take(2), ) .toPromise(); - }, 30000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts index 9b2a39f3bc28..4e7567202819 100644 --- a/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts +++ b/packages/angular_devkit/build_angular/src/dev-server/ssl_spec.ts @@ -40,7 +40,7 @@ describe('Dev Server Builder ssl', () => { agent: new https.Agent({ rejectUnauthorized: false }), }); expect(await response.text()).toContain('<title>HelloWorldApp</title>'); - }, 30000); + }); it('supports key and cert', async () => { host.writeMultipleFiles({ @@ -116,5 +116,5 @@ describe('Dev Server Builder ssl', () => { agent: new https.Agent({ rejectUnauthorized: false }), }); expect(await response.text()).toContain('<title>HelloWorldApp</title>'); - }, 30000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts index c2a07f9c0451..50a738128af4 100644 --- a/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/dev-server/works_spec.ts @@ -36,7 +36,7 @@ describe('Dev Server Builder', () => { const response = await fetch('http://localhost:4200/index.html'); expect(await response.text()).toContain('<title>HelloWorldApp</title>'); - }, 30000); + }); it(`doesn't serve files on the cwd directly`, async () => { const run = await architect.scheduleTarget(target); @@ -98,7 +98,7 @@ describe('Dev Server Builder', () => { expect(output.success).toBe(true); const response = await fetch('http://localhost:4200/index.html'); expect(response.headers.get('X-Header')).toBe('Hello World'); - }, 30000); + }); it('uses source locale when not localizing', async () => { const config = host.scopedSync().read(normalize('angular.json')); diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts b/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts index 39d17581991b..cbc951852e96 100644 --- a/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/extract-i18n/works_spec.ts @@ -36,7 +36,7 @@ describe('Extract i18n Target', () => { const content = virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)); expect(content).toContain('i18n test'); } - }, 30000); + }); it('does not emit the application files', async () => { host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>'); @@ -48,7 +48,7 @@ describe('Extract i18n Target', () => { await run.stop(); expect(host.scopedSync().exists(normalize('dist/app/main.js'))).toBeFalse(); - }, 30000); + }); it('shows errors', async () => { const logger = new logging.Logger(''); @@ -65,7 +65,7 @@ describe('Extract i18n Target', () => { await run.stop(); expect(logs.join()).toMatch('Cannot mark an element as translatable inside of a translatable section'); - }, 30000); + }); it('supports out file', async () => { host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>'); @@ -82,7 +82,7 @@ describe('Extract i18n Target', () => { expect(host.scopedSync().exists(extractionFile)).toBe(true); expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))) .toMatch(/i18n test/); - }, 30000); + }); it('supports output path', async () => { host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>'); @@ -100,7 +100,7 @@ describe('Extract i18n Target', () => { expect(host.scopedSync().exists(extractionFile)).toBe(true); expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))) .toMatch(/i18n test/); - }, 30000); + }); it('supports i18n format', async () => { host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>'); @@ -116,7 +116,7 @@ describe('Extract i18n Target', () => { expect(host.scopedSync().exists(extractionFile)).toBe(true); expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))) .toMatch(/i18n test/); - }, 30000); + }); it('issues warnings for duplicate message identifiers', async () => { host.appendToFile( @@ -140,5 +140,5 @@ describe('Extract i18n Target', () => { 'Duplicate messages with id', ); - }, 30000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts index 8afedef13ee7..52d03f7848bb 100644 --- a/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts +++ b/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts @@ -52,7 +52,7 @@ describe('Karma Builder code coverage', () => { expect(content).toContain('app.component.ts'); expect(content).toContain('test.ts'); } - }, 120000); + }); it('supports code coverage exclude option', async () => { const overrides = { @@ -78,7 +78,7 @@ describe('Karma Builder code coverage', () => { const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath)); expect(content).not.toContain('test.ts'); } - }, 120000); + }); it(`should collect coverage from paths in 'sourceRoot'`, async () => { const files: { [path: string]: string } = { @@ -130,7 +130,7 @@ describe('Karma Builder code coverage', () => { const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath)); expect(content).not.toContain('my-lib'); } - }, 120000); + }); it('should exit with non-zero code when coverage is below threshold', async () => { host.replaceInFile('karma.conf.js', 'coverageReporter: {', ` @@ -168,7 +168,7 @@ describe('Karma Builder code coverage', () => { await run.stop(); - }, 120000); + }); it('is able to process coverage plugin provided as string', async () => { host.replaceInFile('karma.conf.js', /plugins: \[.+?\]/s, `plugins: [ @@ -183,7 +183,7 @@ describe('Karma Builder code coverage', () => { const {success} = await run.result; expect(success).toBe(true); await run.stop(); - }, 120000); + }); it('is able to process coverage plugins provided as string karma-*', async () => { host.replaceInFile('karma.conf.js', /plugins: \[.+?\]/s, `plugins: [ @@ -195,5 +195,5 @@ describe('Karma Builder code coverage', () => { const {success} = await run.result; expect(success).toBe(true); await run.stop(); - }, 120000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/protractor/works_spec.ts b/packages/angular_devkit/build_angular/src/protractor/works_spec.ts index 011b936fbfd5..36678ec3b362 100644 --- a/packages/angular_devkit/build_angular/src/protractor/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/protractor/works_spec.ts @@ -25,7 +25,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 30000); + }); it('fails with no devServerTarget and no standalone server', async () => { const overrides = { devServerTarget: undefined } as unknown as JsonObject; @@ -34,7 +34,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false })); await run.stop(); - }, 30000); + }); it('overrides protractor specs', async () => { host.scopedSync().rename( @@ -48,7 +48,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 60000); + }); it('overrides protractor suites', async () => { host.scopedSync().rename( @@ -70,7 +70,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 60000); + }); it('supports automatic port assignment (port = 0)', async () => { const overrides = { port: 0 }; @@ -79,7 +79,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 30000); + }); it('supports dev server builder with browser builder base HREF option', async () => { host.replaceInFile( @@ -95,7 +95,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 30000); + }); it('supports running tests by pattern', async () => { host.writeMultipleFiles({ @@ -112,7 +112,7 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 30000); + }); it('supports running tests excluding a pattern', async () => { host.writeMultipleFiles({ @@ -129,5 +129,5 @@ describe('Protractor Builder', () => { await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true })); await run.stop(); - }, 30000); + }); }); diff --git a/packages/angular_devkit/build_angular/src/tslint/works_spec.ts b/packages/angular_devkit/build_angular/src/tslint/works_spec.ts index 4206feb722be..bd4ec4829772 100644 --- a/packages/angular_devkit/build_angular/src/tslint/works_spec.ts +++ b/packages/angular_devkit/build_angular/src/tslint/works_spec.ts @@ -48,7 +48,7 @@ describe('Tslint Target', () => { const output = await run.result; expect(output.success).toBe(true); await run.stop(); - }, 30000); + }); it(`should show project name as status and in the logs`, async () => { // Check logs. @@ -99,7 +99,7 @@ describe('Tslint Target', () => { expect(allStatus).toContain(jasmine.stringMatching(/linting.*"app".*/i)); expect(allLogs).not.toContain(jasmine.stringMatching(/linting.*"app".*/i)); await run.stop(); - }, 30000); + }); // it('should report lint error once', (done) => { // host.writeMultipleFiles({'src/app/app.component.ts': 'const foo = "";\n' });
318a0a3b99db53e1672cce56a53e4ca89a555b88
2019-02-27 23:41:22
Hans Larsen
feat(@angular-devkit/build-webpack): add API builder for webpack
false
add API builder for webpack
feat
diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json index fe3bbee0c9e8..5d60a54aa247 100644 --- a/packages/angular_devkit/build_webpack/builders.json +++ b/packages/angular_devkit/build_webpack/builders.json @@ -2,6 +2,7 @@ "$schema": "../architect/src/builders-schema.json", "builders": { "webpack": { + "implementation": "./src/webpack/index2", "class": "./src/webpack", "schema": "./src/webpack/schema.json", "description": "Build a webpack app." diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json index f61d3dd5b501..b5f3b9eb1f62 100644 --- a/packages/angular_devkit/build_webpack/package.json +++ b/packages/angular_devkit/build_webpack/package.json @@ -8,7 +8,8 @@ "dependencies": { "@angular-devkit/architect": "0.0.0", "@angular-devkit/core": "0.0.0", - "rxjs": "6.4.0" + "rxjs": "6.4.0", + "webpack-merge": "4.2.1" }, "peerDependencies": { "webpack": "^4.6.0", @@ -18,4 +19,4 @@ "webpack": "4.29.5", "webpack-dev-server": "^3.1.4" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/build_webpack/src/index.ts b/packages/angular_devkit/build_webpack/src/index.ts index e73ba09edf94..83d323e5e308 100644 --- a/packages/angular_devkit/build_webpack/src/index.ts +++ b/packages/angular_devkit/build_webpack/src/index.ts @@ -8,3 +8,5 @@ export * from './webpack'; export * from './webpack-dev-server'; + +export * from './plugins/architect'; diff --git a/packages/angular_devkit/build_webpack/src/plugins/architect.ts b/packages/angular_devkit/build_webpack/src/plugins/architect.ts new file mode 100644 index 000000000000..83549ab10bc8 --- /dev/null +++ b/packages/angular_devkit/build_webpack/src/plugins/architect.ts @@ -0,0 +1,157 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ +import { BuilderContext } from '@angular-devkit/architect/src/index2'; +import { strings } from '@angular-devkit/core'; +import * as path from 'path'; +import * as webpack from 'webpack'; + +/** + * This list was taken from a list of events we want to listen to, from the list of hooks in + * webpack's typings. + */ +const hookSafelist: (keyof webpack.compilation.CompilationHooks)[] = [ + 'seal', + 'optimizeDependenciesBasic', + 'optimizeDependencies', + 'optimizeDependenciesAdvanced', + 'afterOptimizeDependencies', + 'optimize', + 'optimizeModulesBasic', + 'optimizeModules', + 'optimizeModulesAdvanced', + 'afterOptimizeModules', + 'optimizeChunksBasic', + 'optimizeChunks', + 'optimizeChunksAdvanced', + 'afterOptimizeChunks', + 'optimizeTree', + 'afterOptimizeTree', + 'optimizeChunkModulesBasic', + 'optimizeChunkModules', + 'optimizeChunkModulesAdvanced', + 'afterOptimizeChunkModules', + 'reviveModules', + 'optimizeModuleOrder', + 'advancedOptimizeModuleOrder', + 'beforeModuleIds', + 'moduleIds', + 'optimizeModuleIds', + 'afterOptimizeModuleIds', + 'reviveChunks', + 'optimizeChunkOrder', + 'beforeChunkIds', + 'optimizeChunkIds', + 'afterOptimizeChunkIds', + 'recordModules', + 'recordChunks', + 'beforeHash', + 'afterHash', + 'recordHash', + 'record', + 'beforeModuleAssets', + 'shouldGenerateChunkAssets', + 'beforeChunkAssets', + 'additionalChunkAssets', + 'additionalAssets', + 'optimizeChunkAssets', + 'afterOptimizeChunkAssets', + 'optimizeAssets', + 'afterOptimizeAssets', + 'afterSeal', + 'optimizeExtractedChunksBasic', + 'optimizeExtractedChunks', + 'optimizeExtractedChunksAdvanced', + 'afterOptimizeExtractedChunks', +]; + +/** + * A webpack plugin that reports status and progress to Architect. + */ +export class ArchitectPlugin { + constructor(protected context: BuilderContext) {} + + apply(compiler: webpack.Compiler) { + const context = this.context; + let modulesCount = 0; + let modulesDone = 0; + let hooksDone = 0; + let numberOfHooks = 0; + let reset = false; // Will be true when a full compilation is done. + + function done() { + modulesDone = modulesCount; + hooksDone = Math.max(hooksDone, numberOfHooks); + update('Done.'); + reset = true; + } + function update(status: string) { + context.reportProgress( + modulesDone + hooksDone, + modulesCount + Math.max(hooksDone, numberOfHooks), + status, + ); + } + function updateModule(module: webpack.Module) { + // This is safe since we still verify it. + const m = module as unknown as { identifier?: () => string }; + const moduleId = '' + (typeof m.identifier == 'function' ? m.identifier() : ''); + const id = moduleId.split('!').slice(-1)[0].trim(); + const p = path.relative(context.workspaceRoot, id); + + update(`Building ${p}`); + } + + function buildModule(module: webpack.Module) { + modulesCount++; + updateModule(module); + } + function failedModule(module: webpack.Module) { + modulesDone++; + updateModule(module); + } + function succeedModule(module: webpack.Module) { + modulesDone++; + updateModule(module); + } + + // On the start of a new compilation, maybe reset the counters (and update the total), then + // listen to all hooks we're interested in. + compiler.hooks.compilation.tap('ArchitectPlugin', compilation => { + const hooks = hookSafelist; + if (reset) { + reset = false; + modulesCount = modulesDone = hooksDone = numberOfHooks = 0; + } + // Need to add hooks for each compilation. + numberOfHooks += hooks.length; + + // Pre-emptively tell the user. + context.reportRunning(); + update('Preparing...'); + + compilation.hooks.buildModule.tap('ArchitectPlugin', buildModule); + compilation.hooks.failedModule.tap('ArchitectPlugin', failedModule); + compilation.hooks.succeedModule.tap('ArchitectPlugin', succeedModule); + + for (const name of hooks) { + // Transforms `camelCase` into `Camel case`. decamelize() transforms it into `camel_case` + // and then we replace the `_` with spaces. + const title = strings.capitalize(strings.decamelize(name).replace(/_/g, ' ')); + + compilation.hooks[name].intercept({ + call: () => { + hooksDone++; + update(title); + }, + }); + } + }); + + compiler.hooks.done.tap('ArchitectPlugin', done); + } +} diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2.ts b/packages/angular_devkit/build_webpack/src/webpack/index2.ts new file mode 100644 index 000000000000..0bdd78c930f0 --- /dev/null +++ b/packages/angular_devkit/build_webpack/src/webpack/index2.ts @@ -0,0 +1,90 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ +import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2'; +import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core'; +import { Observable, from, of } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; +import * as webpack from 'webpack'; +import { ArchitectPlugin } from '../plugins/architect'; +import { Schema as RealWebpackBuilderSchema } from './schema'; + +const webpackMerge = require('webpack-merge'); + +export type WebpackBuilderSchema = json.JsonObject & RealWebpackBuilderSchema; + +export interface WebpackLoggingCallback { + (stats: webpack.Stats, config: webpack.Configuration): void; +} +export interface WebpackFactory { + (config: webpack.Configuration): Observable<webpack.Compiler>; +} + + +export function runWebpack( + config: webpack.Configuration, + context: BuilderContext, + options: { + logging?: WebpackLoggingCallback, + webpackFactory?: WebpackFactory, + } = {}, +): Observable<BuilderOutput> { + const createWebpack = options.webpackFactory || (config => of(webpack(config))); + const log: WebpackLoggingCallback = options.logging + || ((stats, config) => context.logger.info(stats.toString(config.stats))); + + config = webpackMerge(config, { + plugins: [ + new ArchitectPlugin(context), + ], + }); + + return createWebpack(config).pipe( + switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => { + const callback: webpack.Compiler.Handler = (err, stats) => { + if (err) { + return obs.error(err); + } + + // Log stats. + log(stats, config); + + obs.next({ success: !stats.hasErrors() }); + + if (!config.watch) { + obs.complete(); + } + }; + + try { + if (config.watch) { + const watchOptions = config.watchOptions || {}; + const watching = webpackCompiler.watch(watchOptions, callback); + + // Teardown logic. Close the watcher when unsubscribed from. + return () => watching.close(() => { }); + } else { + webpackCompiler.run(callback); + } + } catch (err) { + if (err) { + context.logger.error(`\nAn error occurred during the build:\n${err && err.stack || err}`); + } + throw err; + } + }), + )); +} + + +export default createBuilder<WebpackBuilderSchema>((options, context) => { + const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig)); + + return from(import(getSystemPath(configPath))).pipe( + switchMap((config: webpack.Configuration) => runWebpack(config, context)), + ); +});
89242be2f8b3e3a2843f28116884485b12f3a268
2018-05-05 02:33:02
Filipe Silva
fix(@angular/cli): fix ng doc not working
false
fix ng doc not working
fix
diff --git a/package-lock.json b/package-lock.json index 442e88ac1015..f1b68da9059c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,339 +5,31 @@ "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "github:angular/angular-devkit-architect-builds#3a02b701bd381f9da83e87be4f1defea626a9c6f", + "version": "github:angular/angular-devkit-architect-builds#a4a9c4ee85a00cd64af51a6676df3bdfc7cd8f1e", "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "rxjs": "6.0.0" }, "dependencies": { "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "requires": { "ajv": "6.4.0", "chokidar": "2.0.3", "rxjs": "6.0.0", "source-map": "0.5.7" } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } } } }, "@angular-devkit/build-angular": { - "version": "github:angular/angular-devkit-build-angular-builds#5497161fb22cf79e5cafe0fe45f4f577edb502a4", + "version": "github:angular/angular-devkit-build-angular-builds#c50cf32655e1823aed09595695748ea84833ec8d", "dev": true, "requires": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#3a02b701bd381f9da83e87be4f1defea626a9c6f", - "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#8c1b06e139d279f9dc1e0d05de96f1bead976482", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "@ngtools/webpack": "github:angular/ngtools-webpack-builds#5b93e05ca52c619e39453f4a43f86fc17dde9780", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a4a9c4ee85a00cd64af51a6676df3bdfc7cd8f1e", + "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#315a47db4f794c7d51ecc02eb984a3bb688cc905", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "@ngtools/webpack": "github:angular/ngtools-webpack-builds#393b3863668a8c0503191a46f292c0ba874a81dd", "ajv": "6.4.0", "autoprefixer": "8.4.1", "cache-loader": "1.2.2", @@ -359,7 +51,7 @@ "mini-css-extract-plugin": "0.4.0", "minimatch": "3.0.4", "node-sass": "4.9.0", - "opn": "5.1.0", + "opn": "5.3.0", "parse5": "4.0.0", "portfinder": "1.0.13", "postcss": "6.0.22", @@ -381,1721 +73,161 @@ "url-loader": "1.0.1", "webpack": "4.6.0", "webpack-dev-middleware": "3.1.3", - "webpack-dev-server": "3.1.3", + "webpack-dev-server": "3.1.4", "webpack-merge": "4.1.2", "webpack-sources": "1.1.0", "webpack-subresource-integrity": "1.1.0-rc.4" }, "dependencies": { "@angular-devkit/architect": { - "version": "github:angular/angular-devkit-architect-builds#3a02b701bd381f9da83e87be4f1defea626a9c6f", + "version": "github:angular/angular-devkit-architect-builds#a4a9c4ee85a00cd64af51a6676df3bdfc7cd8f1e", "dev": true, "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "rxjs": "6.0.0" } }, - "@angular-devkit/build-optimizer": { - "version": "github:angular/angular-devkit-build-optimizer-builds#8c1b06e139d279f9dc1e0d05de96f1bead976482", + "@angular-devkit/core": { + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "dev": true, "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.7.2", - "webpack-sources": "1.1.0" + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.0.0", + "source-map": "0.5.7" } - }, + } + } + }, + "@angular-devkit/build-optimizer": { + "version": "github:angular/angular-devkit-build-optimizer-builds#315a47db4f794c7d51ecc02eb984a3bb688cc905", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "source-map": "0.5.7", + "typescript": "2.7.2", + "webpack-sources": "1.1.0" + }, + "dependencies": { + "typescript": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", + "dev": true + } + } + }, + "@angular-devkit/core": { + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "requires": { + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.0.0", + "source-map": "0.5.7" + } + }, + "@angular-devkit/schematics": { + "version": "github:angular/angular-devkit-schematics-builds#3027cbb09585defd80c4a8fe17f0a4c21878d843", + "requires": { + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "rxjs": "6.0.0" + }, + "dependencies": { "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "dev": true, + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "requires": { "ajv": "6.4.0", "chokidar": "2.0.3", "rxjs": "6.0.0", "source-map": "0.5.7" } - }, - "@ngtools/webpack": { - "version": "github:angular/ngtools-webpack-builds#5b93e05ca52c619e39453f4a43f86fc17dde9780", + } + } + }, + "@ngtools/json-schema": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", + "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", + "dev": true + }, + "@ngtools/webpack": { + "version": "github:angular/ngtools-webpack-builds#393b3863668a8c0503191a46f292c0ba874a81dd", + "dev": true, + "requires": { + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "tree-kill": "1.2.0", + "webpack-sources": "1.1.0" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "dev": true, "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "tree-kill": "1.2.0", - "webpack-sources": "1.1.0" + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.0.0", + "source-map": "0.5.7" } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, + } + } + }, + "@schematics/angular": { + "version": "github:angular/schematics-angular-builds#8f384b4c5c7d84d1bc7a4988212c8831540d81d8", + "requires": { + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3027cbb09585defd80c4a8fe17f0a4c21878d843", + "typescript": "2.7.2" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.0.0", + "source-map": "0.5.7" } }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, + "@angular-devkit/schematics": { + "version": "github:angular/angular-devkit-schematics-builds#3027cbb09585defd80c4a8fe17f0a4c21878d843", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "rxjs": "6.0.0" } }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "dev": true, + "typescript": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==" + } + } + }, + "@schematics/update": { + "version": "github:angular/schematics-update-builds#d970bbfa1640ccaf0d05316e61e0d3ae11b8e2c1", + "requires": { + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", + "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#3027cbb09585defd80c4a8fe17f0a4c21878d843", + "npm-registry-client": "8.5.1", + "rxjs": "6.0.0", + "semver": "5.5.0", + "semver-intersect": "1.3.1" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.0.0", + "source-map": "0.5.7" } }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, + "@angular-devkit/schematics": { + "version": "github:angular/angular-devkit-schematics-builds#3027cbb09585defd80c4a8fe17f0a4c21878d843", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "typescript": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", - "dev": true - } - } - }, - "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.3", - "rxjs": "6.0.0", - "source-map": "0.5.7" - }, - "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - } - } - }, - "@angular-devkit/schematics": { - "version": "github:angular/angular-devkit-schematics-builds#d303d66e9bf872d32da3958814e47651efbfad99", - "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "rxjs": "6.0.0" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.3", - "rxjs": "6.0.0", - "source-map": "0.5.7" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - } - } - }, - "@ngtools/json-schema": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", - "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", - "dev": true - }, - "@schematics/angular": { - "version": "github:angular/schematics-angular-builds#7c5999a0cbc8918d4de1200e304e6cfe32bad230", - "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d303d66e9bf872d32da3958814e47651efbfad99", - "typescript": "2.7.2" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.3", - "rxjs": "6.0.0", - "source-map": "0.5.7" - } - }, - "@angular-devkit/schematics": { - "version": "github:angular/angular-devkit-schematics-builds#d303d66e9bf872d32da3958814e47651efbfad99", - "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "rxjs": "6.0.0" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "typescript": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==" - } - } - }, - "@schematics/update": { - "version": "github:angular/schematics-update-builds#fd640e102b7c442294f55be913093d92912893e3", - "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#d303d66e9bf872d32da3958814e47651efbfad99", - "npm-registry-client": "8.5.1", - "rxjs": "6.0.0", - "semver": "5.5.0", - "semver-intersect": "1.3.1" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", - "requires": { - "ajv": "6.4.0", - "chokidar": "2.0.3", - "rxjs": "6.0.0", - "source-map": "0.5.7" - } - }, - "@angular-devkit/schematics": { - "version": "github:angular/angular-devkit-schematics-builds#d303d66e9bf872d32da3958814e47651efbfad99", - "requires": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e7090ed005e68501b4b06359ea7b414dfbc9ed2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1a111c8bcb1bc9a2eb0899b768eb2074ba174eb9", "rxjs": "6.0.0" } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } } } }, @@ -2367,6 +499,15 @@ "color-convert": "1.9.1" } }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -2390,6 +531,11 @@ "sprintf-js": "1.0.3" } }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", @@ -2461,6 +607,11 @@ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -2542,7 +693,7 @@ "dev": true, "requires": { "browserslist": "3.2.6", - "caniuse-lite": "1.0.30000832", + "caniuse-lite": "1.0.30000833", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.22", @@ -2733,11 +884,6 @@ "kind-of": "6.0.2" } }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -2861,6 +1007,33 @@ "concat-map": "0.0.1" } }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", @@ -2943,8 +1116,8 @@ "integrity": "sha512-XCsMSg9V4S1VRdcp265dJ+8kBRjfuFXcavbisY7G6T9QI0H1Z24PP53vvs0WDYWqm38Mco1ILDtafcS8ZR4xiw==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000832", - "electron-to-chromium": "1.3.44" + "caniuse-lite": "1.0.30000833", + "electron-to-chromium": "1.3.45" } }, "buffer": { @@ -3032,13 +1205,6 @@ "to-object-path": "0.3.0", "union-value": "1.0.0", "unset-value": "1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "cache-loader": { @@ -3102,9 +1268,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000832", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000832.tgz", - "integrity": "sha512-WMC2GiGTPxGywFL70h+CnP7GAYo6LM6JSI1sF13vAZfXCzOeunHzl20DpfbDGMdvtT2wpqvabY96MHEp/la+BQ==", + "version": "1.0.30000833", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000833.tgz", + "integrity": "sha512-tKNuKu4WLImh4NxoTgntxFpDrRiA0Q6Q1NycNhuMST0Kx+Pt8YnRDW6V8xsyH6AtO2CpAoibatEk5eaEhP3O1g==", "dev": true }, "caseless": { @@ -3134,6 +1300,25 @@ "supports-color": "4.5.0" } }, + "chokidar": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", + "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.3", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.0.5" + } + }, "chownr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", @@ -3186,11 +1371,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -3257,15 +1437,6 @@ "shallow-clone": "1.0.0" }, "dependencies": { - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -3799,21 +1970,6 @@ "slash": "1.0.0" } }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -4112,11 +2268,6 @@ "kind-of": "6.0.2" } }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -4356,9 +2507,9 @@ "dev": true }, "duplexify": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", - "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", + "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "dev": true, "requires": { "end-of-stream": "1.4.1", @@ -4389,9 +2540,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.44", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.44.tgz", - "integrity": "sha1-72sVCmDVIwgjiMra2ICF7NL9RoQ=", + "version": "1.3.45", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz", + "integrity": "sha1-RYrBscXHYM6IEaFtK/vZfsMLr7g=", "dev": true }, "elliptic": { @@ -4771,7 +2922,7 @@ }, "event-stream": { "version": "3.3.4", - "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, "requires": { @@ -4853,6 +3004,38 @@ "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", "dev": true }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "express": { "version": "4.16.3", "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", @@ -4915,6 +3098,70 @@ } } }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -4975,6 +3222,27 @@ "schema-utils": "0.4.5" } }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "finalhandler": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", @@ -5058,6 +3326,15 @@ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, "foreach": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", @@ -5165,25 +3442,21 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "bundled": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "bundled": true }, "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "bundled": true, "optional": true }, "are-we-there-yet": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "bundled": true, "optional": true, "requires": { "delegates": "1.0.0", @@ -5192,13 +3465,11 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "bundled": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "bundled": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -5206,35 +3477,29 @@ }, "chownr": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "bundled": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "bundled": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "bundled": true }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "bundled": true, "optional": true }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "bundled": true, "optional": true, "requires": { "ms": "2.0.0" @@ -5242,26 +3507,22 @@ }, "deep-extend": { "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "bundled": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "bundled": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "bundled": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "bundled": true, "optional": true, "requires": { "minipass": "2.2.4" @@ -5269,14 +3530,12 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "bundled": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "bundled": true, "optional": true, "requires": { "aproba": "1.2.0", @@ -5291,8 +3550,7 @@ }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "bundled": true, "optional": true, "requires": { "fs.realpath": "1.0.0", @@ -5305,14 +3563,12 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "bundled": true, "optional": true }, "iconv-lite": { "version": "0.4.21", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", - "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", + "bundled": true, "optional": true, "requires": { "safer-buffer": "2.1.2" @@ -5320,8 +3576,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "bundled": true, "optional": true, "requires": { "minimatch": "3.0.4" @@ -5329,8 +3584,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "optional": true, "requires": { "once": "1.4.0", @@ -5339,46 +3593,39 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "bundled": true }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "bundled": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "requires": { "number-is-nan": "1.0.1" } }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "bundled": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "requires": { "brace-expansion": "1.1.11" } }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "bundled": true }, "minipass": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", - "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", + "bundled": true, "requires": { "safe-buffer": "5.1.1", "yallist": "3.0.2" @@ -5386,8 +3633,7 @@ }, "minizlib": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", - "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", + "bundled": true, "optional": true, "requires": { "minipass": "2.2.4" @@ -5395,22 +3641,19 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "requires": { "minimist": "0.0.8" } }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "optional": true }, "needle": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz", - "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==", + "bundled": true, "optional": true, "requires": { "debug": "2.6.9", @@ -5420,8 +3663,7 @@ }, "node-pre-gyp": { "version": "0.9.1", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz", - "integrity": "sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=", + "bundled": true, "optional": true, "requires": { "detect-libc": "1.0.3", @@ -5438,8 +3680,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "bundled": true, "optional": true, "requires": { "abbrev": "1.1.1", @@ -5448,14 +3689,12 @@ }, "npm-bundled": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", + "bundled": true, "optional": true }, "npm-packlist": { "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "bundled": true, "optional": true, "requires": { "ignore-walk": "3.0.1", @@ -5464,8 +3703,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "bundled": true, "optional": true, "requires": { "are-we-there-yet": "1.1.4", @@ -5476,39 +3714,33 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "bundled": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "requires": { "wrappy": "1.0.2" } }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "bundled": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "bundled": true, "optional": true, "requires": { "os-homedir": "1.0.2", @@ -5517,20 +3749,17 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "bundled": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "bundled": true, "optional": true }, "rc": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz", - "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=", + "bundled": true, "optional": true, "requires": { "deep-extend": "0.4.2", @@ -5541,16 +3770,14 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "bundled": true, "optional": true } } }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "bundled": true, "optional": true, "requires": { "core-util-is": "1.0.2", @@ -5564,8 +3791,7 @@ }, "rimraf": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "bundled": true, "optional": true, "requires": { "glob": "7.1.2" @@ -5573,43 +3799,36 @@ }, "safe-buffer": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "bundled": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "bundled": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "bundled": true, "optional": true }, "semver": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "bundled": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -5618,8 +3837,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "bundled": true, "optional": true, "requires": { "safe-buffer": "5.1.1" @@ -5627,22 +3845,19 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "requires": { "ansi-regex": "2.1.1" } }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "bundled": true, "optional": true }, "tar": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", + "bundled": true, "optional": true, "requires": { "chownr": "1.0.1", @@ -5656,14 +3871,12 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "bundled": true, "optional": true }, "wide-align": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "bundled": true, "optional": true, "requires": { "string-width": "1.0.2" @@ -5671,13 +3884,11 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "bundled": true }, "yallist": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + "bundled": true } } }, @@ -6112,6 +4323,25 @@ "path-is-absolute": "1.0.1" } }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", @@ -6247,13 +4477,6 @@ "get-value": "2.0.6", "has-values": "1.0.0", "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "has-values": { @@ -6265,24 +4488,6 @@ "kind-of": "4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -6537,297 +4742,6 @@ "is-glob": "4.0.0", "lodash": "4.17.5", "micromatch": "3.1.10" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - } } }, "http-signature": { @@ -7108,6 +5022,11 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", @@ -7125,6 +5044,14 @@ "number-is-nan": "1.0.1" } }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "requires": { + "is-extglob": "2.1.1" + } + }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -7144,6 +5071,14 @@ "xtend": "4.0.1" } }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + } + }, "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", @@ -7201,13 +5136,6 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "is-property": { @@ -7290,6 +5218,11 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -8054,6 +5987,33 @@ "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "dev": true }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, "miller-rabin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", @@ -8169,13 +6129,13 @@ "dev": true, "requires": { "concat-stream": "1.6.2", - "duplexify": "3.5.4", + "duplexify": "3.6.0", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "2.0.1", - "pumpify": "1.4.0", + "pumpify": "1.5.0", "stream-each": "1.2.2", "through2": "2.0.3" } @@ -8198,4273 +6158,3613 @@ } } } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "mock-fs": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.4.2.tgz", - "integrity": "sha512-dF+yxZSojSiI8AXGoxj5qdFWpucndc54Ug+TwlpHFaV7j22MGG+OML2+FVa6xAZtjb/OFFQhOC37Jegx2GbEwA==", - "dev": true - }, - "modify-values": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", - "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", - "dev": true - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, - "requires": { - "dns-packet": "1.3.1", - "thunky": "1.0.2" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, - "mute-stream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", - "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" - }, - "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", - "dev": true - }, - "neo-async": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", - "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==", - "dev": true - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "1.1.4" - } - }, - "node-forge": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz", - "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=", - "dev": true - }, - "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", - "dev": true, - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "2.2.1", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.85.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" - }, - "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - } - } - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.5", - "stream-browserify": "2.0.1", - "stream-http": "2.8.1", - "string_decoder": "1.0.3", - "timers-browserify": "2.0.10", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", - "vm-browserify": "0.0.4" + }, + "mixin-object": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", + "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", + "dev": true, + "requires": { + "for-in": "0.1.8", + "is-extendable": "0.1.1" }, "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "for-in": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", + "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", "dev": true } } }, - "node-sass": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", - "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.10.0", - "node-gyp": "3.6.2", - "npmlog": "4.1.2", - "request": "2.79.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" + "minimist": "0.0.8" }, "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "4.1.2", - "which": "1.3.0" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" - } - }, - "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "commander": "2.15.1", - "is-my-json-valid": "2.17.2", - "pinkie-promise": "2.0.1" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" - } - }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", - "dev": true - }, - "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.11.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "qs": "6.3.2", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.4.3", - "uuid": "3.2.1" - } - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true } } }, - "nopt": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz", - "integrity": "sha1-KqCbfRdoSHs7ianFqlIzW/8Lrqc=", + "mock-fs": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.4.2.tgz", + "integrity": "sha512-dF+yxZSojSiI8AXGoxj5qdFWpucndc54Ug+TwlpHFaV7j22MGG+OML2+FVa6xAZtjb/OFFQhOC37Jegx2GbEwA==", + "dev": true + }, + "modify-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", + "dev": true + }, + "move-concurrently": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", + "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", + "dev": true, + "requires": { + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "multicast-dns": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", + "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "abbrev": "1.1.1" + "dns-packet": "1.3.1", + "thunky": "1.0.2" } }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" - } + "multicast-dns-service-types": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", + "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", + "dev": true }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + }, + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "remove-trailing-separator": "1.1.0" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } } }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "npm-package-arg": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", - "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", - "requires": { - "hosted-git-info": "2.6.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true }, - "npm-path": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", - "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", + "neo-async": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", + "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==", + "dev": true + }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, + "no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "which": "1.3.0" + "lower-case": "1.1.4" } }, - "npm-registry-client": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz", - "integrity": "sha512-7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==", + "node-forge": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", + "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", + "dev": true + }, + "node-gyp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", + "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "dev": true, "requires": { - "concat-stream": "1.6.2", + "fstream": "1.0.11", + "glob": "7.1.2", "graceful-fs": "4.1.11", - "normalize-package-data": "2.4.0", - "npm-package-arg": "6.1.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "2.2.1", "npmlog": "4.1.2", - "once": "1.4.0", + "osenv": "0.1.5", "request": "2.85.0", - "retry": "0.10.1", - "safe-buffer": "5.1.1", - "semver": "5.5.0", - "slide": "1.1.6", - "ssri": "5.3.0" + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + } } }, - "npm-run": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npm-run/-/npm-run-4.1.2.tgz", - "integrity": "sha1-EDDh7FaQjIn8w/o2bQOiwrqY65k=", + "node-libs-browser": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "minimist": "1.2.0", - "npm-path": "2.0.4", - "npm-which": "3.0.1", - "serializerr": "1.0.3", - "sync-exec": "0.6.2" + "assert": "1.4.1", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "1.1.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", + "path-browserify": "0.0.0", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.5", + "stream-browserify": "2.0.1", + "stream-http": "2.8.1", + "string_decoder": "1.0.3", + "timers-browserify": "2.0.10", + "tty-browserify": "0.0.0", + "url": "0.11.0", + "util": "0.10.3", + "vm-browserify": "0.0.4" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + } } }, - "npm-run-all": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.2.tgz", - "integrity": "sha512-Z2aRlajMK4SQ8u19ZA75NZZu7wupfCNQWdYosIi8S6FgBdGf/8Y6Hgyjdc8zU2cYmIRVCx1nM80tJPkdEd+UYg==", + "node-sass": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", + "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "chalk": "2.2.2", - "cross-spawn": "5.1.0", - "memorystream": "0.3.1", - "minimatch": "3.0.4", - "ps-tree": "1.1.0", - "read-pkg": "3.0.0", - "shell-quote": "1.6.1", - "string.prototype.padend": "3.0.0" + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.2", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.79.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" }, "dependencies": { - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "hoek": "2.16.3" } }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "error-ex": "1.3.1", - "json-parse-better-errors": "1.0.1" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "pify": "3.0.0" + "lru-cache": "4.1.2", + "which": "1.3.0" } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "requires": { + "boom": "2.10.1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" + } + }, + "har-validator": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.15.1", + "is-my-json-valid": "2.17.2", + "pinkie-promise": "2.0.1" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", "dev": true }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "dev": true, "requires": { - "load-json-file": "4.0.0", - "normalize-package-data": "2.4.0", - "path-type": "3.0.0" + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "qs": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", + "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "npm-which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", - "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", - "dev": true, - "requires": { - "commander": "2.15.1", - "npm-path": "2.0.4", - "which": "1.3.0" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "nth-check": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", - "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", - "dev": true, - "requires": { - "boolbase": "1.0.0" - } - }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + }, + "request": { + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "dev": true, "requires": { - "is-descriptor": "0.1.6" + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.11.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "2.0.6", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "qs": "6.3.2", + "stringstream": "0.0.5", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.4.3", + "uuid": "3.2.1" } + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true } } }, - "object-keys": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", - "dev": true - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } - } - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "function-bind": "1.1.1", - "has-symbols": "1.0.0", - "object-keys": "1.0.11" - } - }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "nopt": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz", + "integrity": "sha1-KqCbfRdoSHs7ianFqlIzW/8Lrqc=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.11.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } + "abbrev": "1.1.1" } }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "requires": { - "ee-first": "1.1.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "requires": { - "wrappy": "1.0.2" + "remove-trailing-separator": "1.1.0" } }, - "onetime": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, - "opn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", - "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==", - "requires": { - "is-wsl": "1.1.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "original": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", - "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", - "dev": true, + "npm-package-arg": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", + "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", "requires": { - "url-parse": "1.0.5" - }, - "dependencies": { - "url-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", - "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", - "dev": true, - "requires": { - "querystringify": "0.0.4", - "requires-port": "1.0.0" - } - } + "hosted-git-info": "2.6.0", + "osenv": "0.1.5", + "semver": "5.5.0", + "validate-npm-package-name": "3.0.0" } }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "npm-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", + "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", "dev": true, "requires": { - "lcid": "1.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "which": "1.3.0" } }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", - "dev": true, + "npm-registry-client": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz", + "integrity": "sha512-7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==", "requires": { - "p-try": "1.0.0" + "concat-stream": "1.6.2", + "graceful-fs": "4.1.11", + "normalize-package-data": "2.4.0", + "npm-package-arg": "6.1.0", + "npmlog": "4.1.2", + "once": "1.4.0", + "request": "2.85.0", + "retry": "0.10.1", + "safe-buffer": "5.1.1", + "semver": "5.5.0", + "slide": "1.1.6", + "ssri": "5.3.0" } }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "npm-run": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npm-run/-/npm-run-4.1.2.tgz", + "integrity": "sha1-EDDh7FaQjIn8w/o2bQOiwrqY65k=", "dev": true, "requires": { - "p-limit": "1.2.0" - } - }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "cross-spawn": "5.1.0", + "minimist": "1.2.0", + "npm-path": "2.0.4", + "npm-which": "3.0.1", + "serializerr": "1.0.3", + "sync-exec": "0.6.2" + } + }, + "npm-run-all": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.2.tgz", + "integrity": "sha512-Z2aRlajMK4SQ8u19ZA75NZZu7wupfCNQWdYosIi8S6FgBdGf/8Y6Hgyjdc8zU2cYmIRVCx1nM80tJPkdEd+UYg==", "dev": true, "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.5" + "ansi-styles": "3.2.1", + "chalk": "2.2.2", + "cross-spawn": "5.1.0", + "memorystream": "0.3.1", + "minimatch": "3.0.4", + "ps-tree": "1.1.0", + "read-pkg": "3.0.0", + "shell-quote": "1.6.1", + "string.prototype.padend": "3.0.0" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.1" + } + }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "4.0.0", + "normalize-package-data": "2.4.0", + "path-type": "3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } } }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "no-case": "2.3.2" + "path-key": "2.0.1" } }, - "parse-asn1": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", - "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", + "npm-which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", + "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", "dev": true, "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.16" + "commander": "2.15.1", + "npm-path": "2.0.4", + "which": "1.3.0" } }, - "parse-github-repo-url": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz", - "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=", - "dev": true + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "dev": true, "requires": { - "error-ex": "1.3.1" + "boolbase": "1.0.0" } }, - "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", - "dev": true - }, - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "pinkie-promise": "2.0.1" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + } } }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", "dev": true }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "requires": { + "isobject": "3.0.1" + } }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "define-properties": "1.1.2", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "object-keys": "1.0.11" } }, - "pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "object.getownpropertydescriptors": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", + "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "dev": true, "requires": { - "through": "2.3.8" + "define-properties": "1.1.2", + "es-abstract": "1.11.0" } }, - "pbkdf2": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", - "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", - "dev": true, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.1", - "sha.js": "2.4.11" + "isobject": "3.0.1" } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", + "dev": true }, - "pify": { + "on-finished": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "on-headers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", "dev": true }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, + "opn": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", + "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "requires": { - "pinkie": "2.0.4" + "is-wsl": "1.1.0" } }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "find-up": "2.1.0" + "minimist": "0.0.10", + "wordwrap": "0.0.3" }, "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true } } }, - "pluralize": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", - "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", - "dev": true - }, - "portfinder": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } } }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" - }, - "postcss": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", - "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", + "original": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", + "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", "dev": true, "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" + "url-parse": "1.0.5" }, "dependencies": { - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "url-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", + "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", "dev": true, "requires": { - "has-flag": "3.0.0" + "querystringify": "0.0.4", + "requires-port": "1.0.0" } } } }, - "postcss-import": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz", - "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==", - "dev": true, - "requires": { - "postcss": "6.0.22", - "postcss-value-parser": "3.3.0", - "read-cache": "1.0.0", - "resolve": "1.6.0" - } - }, - "postcss-load-config": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", - "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1", - "postcss-load-options": "1.2.0", - "postcss-load-plugins": "2.3.0" - } + "os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "dev": true }, - "postcss-load-options": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", - "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, - "postcss-load-plugins": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", - "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" + "lcid": "1.0.0" } }, - "postcss-loader": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.4.tgz", - "integrity": "sha512-L2p654oK945B/gDFUGgOhh7uzj19RWoY1SVMeJVoKno1H2MdbQ0RppR/28JGju4pMb22iRC7BJ9aDzbxXSLf4A==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "postcss": "6.0.22", - "postcss-load-config": "1.2.0", - "schema-utils": "0.4.5" - } + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "postcss-url": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz", - "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==", - "dev": true, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "requires": { - "mime": "1.4.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.22", - "xxhashjs": "0.2.2" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } - }, - "postcss-value-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", - "dev": true - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, - "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", + "p-limit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", "dev": true, "requires": { - "renderkid": "2.0.1", - "utila": "0.4.0" + "p-try": "1.0.0" } }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { + "p-locate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "progress": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", - "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", - "dev": true - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, - "optional": true, "requires": { - "asap": "2.0.6" + "p-limit": "1.2.0" } }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", + "p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", "dev": true }, - "protochain": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz", - "integrity": "sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=", + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, - "proxy-addr": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", - "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", - "dev": true, - "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.6.0" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", + "pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", "dev": true }, - "ps-tree": { + "parallel-transform": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz", - "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", + "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { - "event-stream": "3.3.4" + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.5" } }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", - "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.1", - "randombytes": "2.0.6" + "no-case": "2.3.2" } }, - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "parse-asn1": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.16" } }, - "pumpify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz", - "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", + "parse-github-repo-url": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz", + "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "duplexify": "3.5.4", - "inherits": "2.0.3", - "pump": "2.0.1" + "error-ex": "1.3.1" } }, - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "parse5": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "dev": true }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, - "querystringify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", - "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, - "quick-lru": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", - "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", - "dev": true + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" }, - "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "pinkie-promise": "2.0.1" } }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "requires": { - "randombytes": "2.0.6", - "safe-buffer": "5.1.1" - } + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "dev": true }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - } + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true }, - "raw-loader": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", - "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "dev": true }, - "read-cache": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "pify": "2.3.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "read-installed": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", - "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "dev": true, "requires": { - "debuglog": "1.0.1", - "graceful-fs": "4.1.11", - "read-package-json": "2.0.13", - "readdir-scoped-modules": "1.0.2", - "semver": "5.5.0", - "slide": "1.1.6", - "util-extend": "1.0.3" + "through": "2.3.8" } }, - "read-package-json": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz", - "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==", + "pbkdf2": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", + "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", "dev": true, "requires": { - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "json-parse-better-errors": "1.0.1", - "normalize-package-data": "2.4.0", - "slash": "1.0.0" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.1", + "sha.js": "2.4.11" } }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "pinkie": "2.0.4" } }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + } } }, - "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } + "pluralize": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", + "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", + "dev": true }, - "readdir-scoped-modules": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz", - "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=", + "portfinder": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", + "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", "dev": true, "requires": { - "debuglog": "1.0.1", - "dezalgo": "1.0.3", - "graceful-fs": "4.1.11", - "once": "1.4.0" + "async": "1.5.2", + "debug": "2.6.9", + "mkdirp": "0.5.1" } }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.5", - "set-immediate-shim": "1.0.1" - } + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, - "readline2": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", - "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "postcss": { + "version": "6.0.22", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", + "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "mute-stream": "0.0.5" + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } } }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "postcss-import": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz", + "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==", "dev": true, "requires": { + "postcss": "6.0.22", + "postcss-value-parser": "3.3.0", + "read-cache": "1.0.0", "resolve": "1.6.0" } }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "postcss-load-config": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", + "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1", + "postcss-load-options": "1.2.0", + "postcss-load-plugins": "2.3.0" } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "postcss-load-options": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", + "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", + "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" } }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true + "postcss-load-plugins": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", + "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" + } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + "postcss-loader": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.4.tgz", + "integrity": "sha512-L2p654oK945B/gDFUGgOhh7uzj19RWoY1SVMeJVoKno1H2MdbQ0RppR/28JGju4pMb22iRC7BJ9aDzbxXSLf4A==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "postcss": "6.0.22", + "postcss-load-config": "1.2.0", + "schema-utils": "0.4.5" + } }, - "renderkid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", - "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", + "postcss-url": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz", + "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.1.4", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } + "mime": "1.4.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "postcss": "6.0.22", + "xxhashjs": "0.2.2" } }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" + "postcss-value-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "dev": true }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "pretty-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", + "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "is-finite": "1.0.2" - } - }, - "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "renderkid": "2.0.1", + "utila": "0.4.0" } }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, - "require-from-string": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", - "dev": true + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", "dev": true }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, + "optional": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "asap": "2.0.6" } }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "resolve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", - "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", - "requires": { - "path-parse": "1.0.5" - } + "protochain": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz", + "integrity": "sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=", + "dev": true }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "proxy-addr": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", + "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", "dev": true, "requires": { - "resolve-from": "3.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - } + "forwarded": "0.1.2", + "ipaddr.js": "1.6.0" } }, - "resolve-from": { + "prr": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "ps-tree": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz", + "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=", "dev": true, "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" + "event-stream": "3.3.4" } }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true }, - "retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" + "public-encrypt": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", + "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.1", + "randombytes": "2.0.6" + } }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, - "optional": true, "requires": { - "align-text": "0.1.4" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "pumpify": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz", + "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==", "dev": true, "requires": { - "glob": "7.1.2" + "duplexify": "3.6.0", + "inherits": "2.0.3", + "pump": "2.0.1" } }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" - } + "punycode": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" + }, + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "dev": true + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true + }, + "querystringify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", + "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", + "dev": true }, - "run-async": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", - "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", + "dev": true + }, + "randombytes": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", + "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "dev": true, "requires": { - "once": "1.4.0" + "safe-buffer": "5.1.1" } }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "aproba": "1.2.0" + "randombytes": "2.0.6", + "safe-buffer": "5.1.1" } }, - "rx-lite": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", - "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "dev": true }, - "rxjs": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.0.0.tgz", - "integrity": "sha512-2MgLQr1zvks8+Kip4T6hcJdiBhV+SIvxguoWjhwtSpNPTp/5e09HJbgclCwR/nW0yWzhubM+6Q0prl8G5RuoBA==", + "raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "dev": true, "requires": { - "tslib": "1.9.0" + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" } }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "requires": { - "ret": "0.1.15" - } + "raw-loader": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", + "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", + "dev": true }, - "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.5", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - } - } + "pify": "2.3.0" } }, - "sass-loader": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz", - "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==", + "read-installed": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", + "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", "dev": true, "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "neo-async": "2.5.1", - "pify": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } + "debuglog": "1.0.1", + "graceful-fs": "4.1.11", + "read-package-json": "2.0.13", + "readdir-scoped-modules": "1.0.2", + "semver": "5.5.0", + "slide": "1.1.6", + "util-extend": "1.0.3" } }, - "sax": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", - "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", - "dev": true - }, - "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", + "read-package-json": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz", + "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==", "dev": true, "requires": { - "ajv": "6.4.0", - "ajv-keywords": "3.2.0" - }, - "dependencies": { - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - } + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "json-parse-better-errors": "1.0.1", + "normalize-package-data": "2.4.0", + "slash": "1.0.0" } }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "js-base64": "2.4.3", - "source-map": "0.4.4" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selfsigned": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.2.tgz", - "integrity": "sha1-tESVgNmZKbZbEKSDiTAaZZIIh1g=", + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "node-forge": "0.7.1" + "find-up": "1.1.2", + "read-pkg": "1.1.0" } }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "semver-intersect": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.1.tgz", - "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=", + "readable-stream": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", + "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", "requires": { - "semver": "5.5.0" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" } }, - "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "readdir-scoped-modules": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz", + "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=", "dev": true, "requires": { - "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "fresh": "0.5.2", - "http-errors": "1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "debuglog": "1.0.1", + "dezalgo": "1.0.3", + "graceful-fs": "4.1.11", + "once": "1.4.0" } }, - "serialize-javascript": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", - "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", - "dev": true + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.5", + "set-immediate-shim": "1.0.1" + } }, - "serializerr": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz", - "integrity": "sha1-EtTFqhw/+49tHcXzlaqUVVacP5E=", + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", "dev": true, "requires": { - "protochain": "1.0.5" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" } }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "accepts": "1.3.5", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.2", - "mime-types": "2.1.18", - "parseurl": "1.3.2" + "resolve": "1.6.0" } }, - "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.16.2" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", "dev": true }, - "setprototypeof": { + "remove-trailing-separator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.1" - } + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" }, - "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "renderkid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", + "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", "dev": true, "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" + "css-select": "1.2.0", + "dom-converter": "0.1.4", + "htmlparser2": "3.3.0", + "strip-ansi": "3.0.1", + "utila": "0.3.3" }, "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "utila": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", + "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", "dev": true } } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" }, - "shell-quote": { + "repeat-string": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "array-filter": "0.0.1", - "array-map": "0.0.0", - "array-reduce": "0.0.0", - "jsonify": "0.0.0" + "is-finite": "1.0.2" } }, - "shelljs": { - "version": "0.7.8", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", - "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", - "dev": true, + "request": { + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { - "glob": "7.1.2", - "interpret": "1.1.0", - "rechoir": "0.6.2" + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" } }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-from-string": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true }, - "silent-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz", - "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, "requires": { - "debug": "2.6.9" + "caller-path": "0.1.0", + "resolve-from": "1.0.1" } }, - "slash": { + "requires-port": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=" + "resolve": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", + "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", + "requires": { + "path-parse": "1.0.5" + } }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.1", - "use": "3.1.0" + "resolve-from": "3.0.0" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true } } }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } + "exit-hook": "1.1.1", + "onetime": "1.1.0" } }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "optional": true, "requires": { - "kind-of": "3.2.2" + "align-text": "0.1.4" } }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "dev": true, "requires": { - "hoek": "4.2.1" + "glob": "7.1.2" } }, - "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.2.1" + "hash-base": "3.0.4", + "inherits": "2.0.3" } }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", "dev": true, "requires": { - "debug": "2.6.9", - "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.0" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - } + "once": "1.4.0" } }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "run-queue": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", + "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "dev": true, + "requires": { + "aproba": "1.2.0" + } + }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", "dev": true }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "rxjs": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.0.0.tgz", + "integrity": "sha512-2MgLQr1zvks8+Kip4T6hcJdiBhV+SIvxguoWjhwtSpNPTp/5e09HJbgclCwR/nW0yWzhubM+6Q0prl8G5RuoBA==", + "requires": { + "tslib": "1.9.0" + } }, - "source-map-resolve": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", - "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "ret": "0.1.15" } }, - "source-map-support": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", - "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", + "sass-graph": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", + "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "buffer-from": "1.0.0", - "source-map": "0.6.1" + "glob": "7.1.2", + "lodash": "4.17.5", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" }, "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + } + }, + "yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + } } } }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" - }, - "spdx": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.5.1.tgz", - "integrity": "sha1-02wnUIi0jXWpBGzUSoOM5LUzmZg=", + "sass-loader": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz", + "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==", "dev": true, "requires": { - "spdx-exceptions": "1.0.5", - "spdx-license-ids": "1.2.2" + "clone-deep": "2.0.2", + "loader-utils": "1.1.0", + "lodash.tail": "4.1.1", + "neo-async": "2.5.1", + "pify": "3.0.0" }, "dependencies": { - "spdx-exceptions": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz", - "integrity": "sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true } } }, - "spdx-compare": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-0.1.2.tgz", - "integrity": "sha1-sGrz6jSvdDfZGp9Enq8tLpPDyPs=", + "sax": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", + "dev": true + }, + "schema-utils": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", + "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "dev": true, "requires": { - "spdx-expression-parse": "1.0.4", - "spdx-ranges": "1.0.1" + "ajv": "6.4.0", + "ajv-keywords": "3.2.0" }, "dependencies": { - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "ajv-keywords": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", + "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true } } }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==" - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "js-base64": "2.4.3", + "source-map": "0.4.4" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } } }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==" - }, - "spdx-ranges": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-1.0.1.tgz", - "integrity": "sha1-D07se46kjtIC43S7iULo0Y3AET4=", + "select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, - "spdx-satisfies": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-0.1.3.tgz", - "integrity": "sha1-Z6HydOYRXUquKK/kdNt2FkvhC9w=", + "selfsigned": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz", + "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==", "dev": true, "requires": { - "spdx-compare": "0.1.2", - "spdx-expression-parse": "1.0.4" - }, - "dependencies": { - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - } + "node-forge": "0.7.5" } }, - "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + }, + "semver-intersect": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.3.1.tgz", + "integrity": "sha1-j6hKnhAovSOeRTDRo+GB5pjYhLo=", "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.1", - "select-hose": "2.0.0", - "spdy-transport": "2.1.0" + "semver": "5.5.0" } }, - "spdy-transport": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz", - "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==", + "send": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", + "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", "dev": true, "requires": { "debug": "2.6.9", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "2.3.5", - "safe-buffer": "5.1.1", - "wbuf": "1.7.3" + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" } }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "serialize-javascript": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", + "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", + "dev": true + }, + "serializerr": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz", + "integrity": "sha1-EtTFqhw/+49tHcXzlaqUVVacP5E=", "dev": true, "requires": { - "through": "2.3.8" + "protochain": "1.0.5" } }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "dev": true, "requires": { - "extend-shallow": "3.0.2" + "accepts": "1.3.5", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "1.0.3", + "http-errors": "1.6.2", + "mime-types": "2.1.18", + "parseurl": "1.3.2" } }, - "split2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "dev": true, "requires": { - "through2": "2.0.3" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.16.2" } }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - } + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, - "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "requires": { - "safe-buffer": "5.1.1" - } + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-descriptor": "0.1.6" + "is-extendable": "0.1.1" } } } }, - "stats-webpack-plugin": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.6.2.tgz", - "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=", - "dev": true, - "requires": { - "lodash": "4.17.5" - } - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", "dev": true }, - "stdout-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", - "dev": true, - "requires": { - "readable-stream": "2.3.5" - } + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.5" - } - }, - "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", - "dev": true, - "requires": { - "duplexer": "0.1.1" + "safe-buffer": "5.1.1" } }, - "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "shallow-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", + "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" + "is-extendable": "0.1.1", + "kind-of": "5.1.0", + "mixin-object": "2.0.1" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } } }, - "stream-http": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz", - "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==", + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.5", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "shebang-regex": "1.0.0" } }, - "stream-shift": { + "shebang-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string.prototype.padend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz", - "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=", + "shell-quote": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", + "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.11.0", - "function-bind": "1.1.1" + "array-filter": "0.0.1", + "array-map": "0.0.0", + "array-reduce": "0.0.0", + "jsonify": "0.0.0" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "shelljs": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", + "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", + "dev": true, "requires": { - "safe-buffer": "5.1.1" + "glob": "7.1.2", + "interpret": "1.1.0", + "rechoir": "0.6.2" } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "2.1.1" - } + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, + "silent-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz", + "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", "requires": { - "is-utf8": "0.2.1" + "debug": "2.6.9" } }, - "strip-eof": { + "slash": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "4.0.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", "dev": true }, - "style-loader": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz", - "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.5" - } + "slide": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=" }, - "stylus": { - "version": "0.54.5", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", - "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", - "dev": true, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "css-parse": "1.7.0", + "base": "0.11.2", "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.1", + "use": "3.1.0" }, "dependencies": { - "glob": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "is-descriptor": "0.1.6" } }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "amdefine": "1.0.1" + "is-extendable": "0.1.1" } } } }, - "stylus-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" - } - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, - "sync-exec": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz", - "integrity": "sha1-cX0izFPwzh3vVZQ2LzqJouu5EQU=", - "dev": true - }, - "table": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", - "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", - "dev": true, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", - "chalk": "1.1.3", - "lodash": "4.17.5", - "slice-ansi": "0.0.4", - "string-width": "2.1.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "is-descriptor": "1.0.2" } }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "kind-of": "6.0.2" } }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "requires": { + "kind-of": "3.2.2" + } + }, + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "requires": { + "hoek": "4.2.1" + } + }, + "sockjs": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", + "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "dev": true, + "requires": { + "faye-websocket": "0.10.0", + "uuid": "3.2.1" + } + }, + "sockjs-client": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", + "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "eventsource": "0.1.6", + "faye-websocket": "0.11.1", + "inherits": "2.0.3", + "json3": "3.3.2", + "url-parse": "1.4.0" + }, + "dependencies": { + "faye-websocket": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", + "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", + "dev": true, + "requires": { + "websocket-driver": "0.7.0" } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true } } }, - "tapable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz", - "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==", + "source-list-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", "dev": true }, - "tar": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", - "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-resolve": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", + "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", + "requires": { + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" + } + }, + "source-map-support": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", + "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", "dev": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "buffer-from": "1.0.0", + "source-map": "0.6.1" }, "dependencies": { - "yallist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } } }, - "temp": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", - "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + }, + "spdx": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.5.1.tgz", + "integrity": "sha1-02wnUIi0jXWpBGzUSoOM5LUzmZg=", "dev": true, "requires": { - "os-tmpdir": "1.0.2", - "rimraf": "2.2.8" + "spdx-exceptions": "1.0.5", + "spdx-license-ids": "1.2.2" }, "dependencies": { - "rimraf": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", - "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=", + "spdx-exceptions": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz", + "integrity": "sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", "dev": true } } }, - "text-extensions": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz", - "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==", - "dev": true + "spdx-compare": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-0.1.2.tgz", + "integrity": "sha1-sGrz6jSvdDfZGp9Enq8tLpPDyPs=", + "dev": true, + "requires": { + "spdx-expression-parse": "1.0.4", + "spdx-ranges": "1.0.1" + }, + "dependencies": { + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + } + } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true + "spdx-correct": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", + "requires": { + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" + } }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==" + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==" + }, + "spdx-ranges": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-1.0.1.tgz", + "integrity": "sha1-D07se46kjtIC43S7iULo0Y3AET4=", "dev": true }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "spdx-satisfies": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-0.1.3.tgz", + "integrity": "sha1-Z6HydOYRXUquKK/kdNt2FkvhC9w=", "dev": true, "requires": { - "readable-stream": "2.3.5", - "xtend": "4.0.1" + "spdx-compare": "0.1.2", + "spdx-expression-parse": "1.0.4" + }, + "dependencies": { + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + } } }, - "thunky": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz", - "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=", - "dev": true + "spdy": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", + "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", + "dev": true, + "requires": { + "debug": "2.6.9", + "handle-thing": "1.2.5", + "http-deceiver": "1.2.7", + "safe-buffer": "5.1.1", + "select-hose": "2.0.0", + "spdy-transport": "2.1.0" + } }, - "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", + "spdy-transport": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz", + "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "debug": "2.6.9", + "detect-node": "2.0.3", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "2.3.5", + "safe-buffer": "5.1.1", + "wbuf": "1.7.3" } }, - "to-arraybuffer": { + "split": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "dev": true, + "requires": { + "through": "2.3.8" + } }, - "to-fast-properties": { + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "requires": { + "extend-shallow": "3.0.2" + } + }, + "split2": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", + "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", + "dev": true, + "requires": { + "through2": "2.0.3" + } + }, + "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "sshpk": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { - "kind-of": "3.2.2" + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" } }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "ssri": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "safe-buffer": "5.1.1" } }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "kind-of": "3.2.2" + "is-descriptor": "0.1.6" } } } }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", + "stats-webpack-plugin": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.6.2.tgz", + "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=", + "dev": true, + "requires": { + "lodash": "4.17.5" + } + }, + "statuses": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", "dev": true }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "stdout-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", + "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "dev": true, "requires": { - "punycode": "1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } + "readable-stream": "2.3.5" } }, - "tree-kill": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", - "dev": true + "stream-browserify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5" + } }, - "treeify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", - "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", - "dev": true + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "dev": true, + "requires": { + "duplexer": "0.1.1" + } }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true + "stream-each": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", + "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" + } }, - "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", - "dev": true + "stream-http": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz", + "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==", + "dev": true, + "requires": { + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.5", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" + } }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "dev": true }, - "true-case-path": { + "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string.prototype.padend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz", + "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=", "dev": true, "requires": { - "glob": "6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } + "define-properties": "1.1.2", + "es-abstract": "1.11.0", + "function-bind": "1.1.1" } }, - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } }, - "tslint": { - "version": "5.9.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz", - "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "builtin-modules": "1.1.1", - "chalk": "2.3.2", - "commander": "2.15.1", - "diff": "3.5.0", - "glob": "7.1.2", - "js-yaml": "3.11.0", - "minimatch": "3.0.4", - "resolve": "1.6.0", - "semver": "5.5.0", - "tslib": "1.9.0", - "tsutils": "2.24.0" - }, - "dependencies": { - "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - } + "is-utf8": "0.2.1" } }, - "tsutils": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.24.0.tgz", - "integrity": "sha512-rOIkvoe17acR3r96IPnqwa1+Z7zx9AroEtEKl20IeExXtoWptqG/zb806cYOvdbQGcxh1eOaZQNruOQ716Edig==", + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "tslib": "1.9.0" + "get-stdin": "4.0.1" } }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "style-loader": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz", + "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==", + "dev": true, "requires": { - "safe-buffer": "5.1.1" + "loader-utils": "1.1.0", + "schema-utils": "0.4.5" } }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "stylus": { + "version": "0.54.5", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", + "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "css-parse": "1.7.0", + "debug": "2.6.9", + "glob": "7.0.6", + "mkdirp": "0.5.1", + "sax": "0.5.8", + "source-map": "0.1.43" + }, + "dependencies": { + "glob": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", + "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } } }, - "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "stylus-loader": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", + "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.18" + "loader-utils": "1.1.0", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" } }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "typescript": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz", - "integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg==", - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, - "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "has-flag": "2.0.0" } }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" }, - "uglifyjs-webpack-plugin": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz", - "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==", + "sync-exec": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz", + "integrity": "sha1-cX0izFPwzh3vVZQ2LzqJouu5EQU=", + "dev": true + }, + "table": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", + "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", "dev": true, "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.5", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.1.0", - "worker-farm": "1.6.0" + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.5", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" }, "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true } } }, - "union-value": { + "tapable": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz", + "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==", + "dev": true + }, + "tar": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", + "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", + "dev": true, + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + }, + "dependencies": { + "yallist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", + "dev": true + } + } + }, + "temp": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz", + "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", + "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "os-tmpdir": "1.0.2", + "rimraf": "2.2.8" }, "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" - } + "rimraf": { + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", + "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=", + "dev": true } } }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "text-extensions": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz", + "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==", + "dev": true + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "unique-slug": "2.0.0" + "readable-stream": "2.3.5", + "xtend": "4.0.1" } }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "thunky": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz", + "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=", + "dev": true + }, + "timers-browserify": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", + "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "setimmediate": "1.0.5" } }, - "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", "dev": true }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } + "kind-of": "3.2.2" } }, - "upath": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz", - "integrity": "sha512-qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww==" - }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, - "uri-js": { + "to-regex": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", - "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "punycode": "2.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + } }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, + "toposort": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", + "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", + "dev": true + }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" + "punycode": "1.4.1" }, "dependencies": { "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" } } }, - "url-join": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz", - "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=", + "tree-kill": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", + "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", "dev": true }, - "url-loader": { + "treeify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", + "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", + "dev": true + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "trim-off-newlines": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.0.1.tgz", - "integrity": "sha512-rAonpHy7231fmweBKUFe0bYnlGDty77E+fm53NZdij7j/YOpyGzc7ttqG1nAXl3aRs0k41o0PC3TvGXQiw2Zvw==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mime": "2.3.1", - "schema-utils": "0.4.5" - }, - "dependencies": { - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", - "dev": true - } - } + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", + "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "dev": true }, - "url-parse": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", - "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", - "dev": true, - "requires": { - "querystringify": "2.0.0", - "requires-port": "1.0.0" - }, - "dependencies": { - "querystringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", - "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", - "dev": true - } - } + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true }, - "use": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", + "true-case-path": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", + "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", + "dev": true, "requires": { - "kind-of": "6.0.2" + "glob": "6.0.4" }, "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } } } }, - "user-home": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", - "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", - "dev": true, - "requires": { - "os-homedir": "1.0.2" - } + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "tslint": { + "version": "5.9.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz", + "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", "dev": true, "requires": { - "inherits": "2.0.1" + "babel-code-frame": "6.26.0", + "builtin-modules": "1.1.1", + "chalk": "2.3.2", + "commander": "2.15.1", + "diff": "3.5.0", + "glob": "7.1.2", + "js-yaml": "3.11.0", + "minimatch": "3.0.4", + "resolve": "1.6.0", + "semver": "5.5.0", + "tslib": "1.9.0", + "tsutils": "2.24.0" }, "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "chalk": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", + "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true + }, + "supports-color": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } } } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "util-extend": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", - "dev": true - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "tsutils": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.24.0.tgz", + "integrity": "sha512-rOIkvoe17acR3r96IPnqwa1+Z7zx9AroEtEKl20IeExXtoWptqG/zb806cYOvdbQGcxh1eOaZQNruOQ716Edig==", "dev": true, "requires": { - "define-properties": "1.1.2", - "object.getownpropertydescriptors": "2.0.3" + "tslib": "1.9.0" } }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.1" + } }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true }, - "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "prelude-ls": "1.1.2" } }, - "validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "type-is": { + "version": "1.6.16", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", + "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "dev": true, "requires": { - "builtins": "1.0.3" + "media-typer": "0.3.0", + "mime-types": "2.1.18" } }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "typescript": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz", + "integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg==", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" } }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", "dev": true, - "requires": { - "indexof": "0.0.1" - } + "optional": true }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", + "uglifyjs-webpack-plugin": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz", + "integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==", "dev": true, "requires": { - "chokidar": "2.0.3", - "graceful-fs": "4.1.11", - "neo-async": "2.5.1" + "cacache": "10.0.4", + "find-cache-dir": "1.0.0", + "schema-utils": "0.4.5", + "serialize-javascript": "1.5.0", + "source-map": "0.6.1", + "uglify-es": "3.3.9", + "webpack-sources": "1.1.0", + "worker-farm": "1.6.0" }, "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", "dev": true }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "dev": true, - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "uglify-es": { + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "commander": "2.13.0", + "source-map": "0.6.1" } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, + } + } + }, + "union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "requires": { + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "is-extendable": "0.1.1" } }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, + "set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, + } + } + }, + "unique-filename": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", + "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "dev": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "unique-slug": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", + "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "dev": true, + "requires": { + "imurmurhash": "0.1.4" + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "requires": { - "is-extglob": "2.1.1" + "isarray": "1.0.0" } } } }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + } + } + }, + "upath": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz", + "integrity": "sha512-qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww==" + }, + "upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", + "dev": true + }, + "uri-js": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", + "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", + "requires": { + "punycode": "2.1.0" + } + }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + } + } + }, + "url-join": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz", + "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=", + "dev": true + }, + "url-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.0.1.tgz", + "integrity": "sha512-rAonpHy7231fmweBKUFe0bYnlGDty77E+fm53NZdij7j/YOpyGzc7ttqG1nAXl3aRs0k41o0PC3TvGXQiw2Zvw==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "mime": "2.3.1", + "schema-utils": "0.4.5" + }, + "dependencies": { + "mime": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", + "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", "dev": true - }, + } + } + }, + "url-parse": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", + "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", + "dev": true, + "requires": { + "querystringify": "2.0.0", + "requires-port": "1.0.0" + }, + "dependencies": { + "querystringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", + "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", + "dev": true + } + } + }, + "use": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", + "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "user-home": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", + "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "os-homedir": "1.0.2" } }, - "webpack": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz", - "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==", + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { - "acorn": "5.5.3", - "acorn-dynamic-import": "3.0.0", - "ajv": "6.4.0", - "ajv-keywords": "3.2.0", - "chrome-trace-event": "0.1.3", - "enhanced-resolve": "4.0.0", - "eslint-scope": "3.7.1", - "loader-runner": "2.3.0", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "neo-async": "2.5.1", - "node-libs-browser": "2.1.0", - "schema-utils": "0.4.5", - "tapable": "1.0.0", - "uglifyjs-webpack-plugin": "1.2.5", - "watchpack": "1.6.0", - "webpack-sources": "1.1.0" + "inherits": "2.0.1" }, "dependencies": { - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "util-extend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", + "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", + "dev": true + }, + "util.promisify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", + "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "object.getownpropertydescriptors": "2.0.3" + } + }, + "utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "dev": true + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + }, + "validate-npm-package-license": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", + "requires": { + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" + } + }, + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", + "requires": { + "builtins": "1.0.3" + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "vm-browserify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, + "requires": { + "indexof": "0.0.1" + } + }, + "watchpack": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", + "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", + "dev": true, + "requires": { + "chokidar": "2.0.3", + "graceful-fs": "4.1.11", + "neo-async": "2.5.1" + } + }, + "wbuf": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "dev": true, + "requires": { + "minimalistic-assert": "1.0.1" + } + }, + "webpack": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz", + "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==", + "dev": true, + "requires": { + "acorn": "5.5.3", + "acorn-dynamic-import": "3.0.0", + "ajv": "6.4.0", + "ajv-keywords": "3.2.0", + "chrome-trace-event": "0.1.3", + "enhanced-resolve": "4.0.0", + "eslint-scope": "3.7.1", + "loader-runner": "2.3.0", + "loader-utils": "1.1.0", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "neo-async": "2.5.1", + "node-libs-browser": "2.1.0", + "schema-utils": "0.4.5", + "tapable": "1.0.0", + "uglifyjs-webpack-plugin": "1.2.5", + "watchpack": "1.6.0", + "webpack-sources": "1.1.0" + }, + "dependencies": { + "ajv-keywords": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", + "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } } } }, @@ -12519,9 +9819,9 @@ } }, "webpack-dev-server": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.3.tgz", - "integrity": "sha512-UXfgQIPpdw2rByoUnCrMAIXCS7IJJMp5N0MDQNk9CuQvirCkuWlu7gQpCS8Kaiz4kogC4TdAQHG3jzh/DdqEWg==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz", + "integrity": "sha512-itcIUDFkHuj1/QQxzUFOEXXmxOj5bku2ScLEsOFPapnq2JRTm58gPdtnBphBJOKL2+M3p6+xygL64bI+3eyzzw==", "dev": true, "requires": { "ansi-html": "0.0.7", @@ -12540,16 +9840,16 @@ "ip": "1.1.5", "killable": "1.0.0", "loglevel": "1.6.1", - "opn": "5.1.0", + "opn": "5.3.0", "portfinder": "1.0.13", - "selfsigned": "1.10.2", + "selfsigned": "1.10.3", "serve-index": "1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.1.4", "spdy": "3.4.7", "strip-ansi": "3.0.1", "supports-color": "5.4.0", - "webpack-dev-middleware": "3.1.2", + "webpack-dev-middleware": "3.1.3", "webpack-log": "1.2.0", "yargs": "11.0.0" }, @@ -12560,77 +9860,6 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", - "dev": true, - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.3", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.0.5" - } - }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -12676,166 +9905,6 @@ "rimraf": "2.6.2" } }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -12845,27 +9914,6 @@ "locate-path": "2.0.0" } }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", @@ -12893,115 +9941,12 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", - "dev": true - }, "os-locale": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", @@ -13049,21 +9994,6 @@ "has-flag": "3.0.0" } }, - "webpack-dev-middleware": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.2.tgz", - "integrity": "sha512-Z11Zp3GTvCe6mGbbtma+lMB9xRfJcNtupXfmvFBujyXqLNms6onDnSi9f/Cb2rw6KkD5kgibOfxhN7npZwTiGA==", - "dev": true, - "requires": { - "loud-rejection": "1.6.0", - "memory-fs": "0.4.1", - "mime": "2.3.1", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "url-join": "4.0.0", - "webpack-log": "1.2.0" - } - }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", diff --git a/package.json b/package.json index ed3ee83e09c5..7999e0c81775 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds", "@schematics/angular": "github:angular/schematics-angular-builds", "@schematics/update": "github:angular/schematics-update-builds", - "opn": "~5.1.0", + "opn": "~5.3.0", "resolve": "^1.1.7", "rxjs": "^6.0.0", "semver": "^5.3.0", diff --git a/packages/@angular/cli/commands/doc.ts b/packages/@angular/cli/commands/doc.ts index 0288d0140af1..ec5fe1278e08 100644 --- a/packages/@angular/cli/commands/doc.ts +++ b/packages/@angular/cli/commands/doc.ts @@ -1,5 +1,5 @@ import { Command } from '../models/command'; -import opn from 'opn'; +const opn = require('opn'); export interface Options { keyword: string; @@ -34,6 +34,6 @@ export default class DocCommand extends Command { searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`; } - return opn(searchUrl, { wait: false }); + return opn(searchUrl); } } diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index cb5453239644..689766e8d815 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -35,7 +35,7 @@ "@angular-devkit/schematics": "0.6.0", "@schematics/angular": "0.6.0", "@schematics/update": "0.6.0", - "opn": "~5.1.0", + "opn": "~5.3.0", "resolve": "^1.1.7", "rxjs": "^6.0.0", "semver": "^5.1.0",
c452531828416b75091ae84682a92b7f714309b1
2024-03-15 23:40:32
Charles Lyding
refactor(@angular/cli): remove unneeded devkit core tag helper usage
false
remove unneeded devkit core tag helper usage
refactor
diff --git a/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts b/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts index 0b056ed64436..32eb36edee6b 100644 --- a/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts +++ b/packages/angular/cli/src/command-builder/utilities/schematic-workflow.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import { logging, tags } from '@angular-devkit/core'; +import { logging } from '@angular-devkit/core'; import { NodeWorkflow } from '@angular-devkit/schematics/tools'; import { colors } from '../../utilities/color'; @@ -33,15 +33,11 @@ export function subscribeToWorkflow( logger.error(`ERROR! ${eventPath} ${desc}.`); break; case 'update': - logs.push(tags.oneLine` - ${colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes) - `); + logs.push(`${colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes)`); files.add(eventPath); break; case 'create': - logs.push(tags.oneLine` - ${colors.green('CREATE')} ${eventPath} (${event.content.length} bytes) - `); + logs.push(`${colors.green('CREATE')} ${eventPath} (${event.content.length} bytes)`); files.add(eventPath); break; case 'delete': diff --git a/packages/angular/cli/src/commands/add/cli.ts b/packages/angular/cli/src/commands/add/cli.ts index dc3de137a0d5..5aaabbcd7ea4 100644 --- a/packages/angular/cli/src/commands/add/cli.ts +++ b/packages/angular/cli/src/commands/add/cli.ts @@ -6,7 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import { tags } from '@angular-devkit/core'; import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools'; import { createRequire } from 'module'; import npa from 'npm-package-arg'; @@ -397,10 +396,10 @@ export default class AddCommandModule }); } catch (e) { if (e instanceof NodePackageDoesNotSupportSchematics) { - this.context.logger.error(tags.oneLine` - The package that you are trying to add does not support schematics. You can try using - a different version of the package or contact the package author to add ng-add support. - `); + this.context.logger.error( + 'The package that you are trying to add does not support schematics.' + + 'You can try using a different version of the package or contact the package author to add ng-add support.', + ); return 1; } diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts index 6ead29f03e3a..35d8cc98ca04 100644 --- a/packages/angular/cli/src/commands/update/schematic/index.ts +++ b/packages/angular/cli/src/commands/update/schematic/index.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import { logging, tags } from '@angular-devkit/core'; +import { logging } from '@angular-devkit/core'; import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics'; import * as npa from 'npm-package-arg'; import type { Manifest } from 'pacote'; import * as semver from 'semver'; -import { assertIsError } from '../../../utilities/error'; import { NgPackageManifestProperties, NpmRepositoryPackageJson, @@ -249,9 +248,11 @@ function _validateUpdatePackages( }); if (!force && peerErrors) { - throw new SchematicsException(tags.stripIndents`Incompatible peer dependencies found. - Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together. - You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`); + throw new SchematicsException( + 'Incompatible peer dependencies found.\n' + + 'Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.\n' + + `You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`, + ); } }
898c49934accd1f83faa3b23dea289e6bdd1a551
2023-06-07 21:52:36
Alan Agius
release: bump the next branch to v16.2.0-next.0
false
bump the next branch to v16.2.0-next.0
release
diff --git a/package.json b/package.json index f9b73b207f78..85e44b082809 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nguniversal", "main": "index.js", - "version": "16.1.0-next.0", + "version": "16.2.0-next.0", "private": true, "description": "Universal (isomorphic) JavaScript support for Angular", "homepage": "https://github.com/angular/universal",
2ab096c9266b14e192a05543c5f1ca66f8bc554e
2018-02-24 18:25:51
Charles Lyding
test: correct errant bundle filename
false
correct errant bundle filename
test
diff --git a/tests/e2e/tests/third-party/material-icons.ts b/tests/e2e/tests/third-party/material-icons.ts index 8e7d6b7ba156..e3cc6e2bf377 100644 --- a/tests/e2e/tests/third-party/material-icons.ts +++ b/tests/e2e/tests/third-party/material-icons.ts @@ -11,12 +11,12 @@ export default function() { app['styles'].push('../node_modules/material-design-icons/iconfont/material-icons.css'); })) .then(() => ng('build', '--extract-css')) - .then(() => expectFileToMatch('dist/styles.bundle.css', 'Material Icons')) + .then(() => expectFileToMatch('dist/styles.css', 'Material Icons')) .then(() => ng( 'build', '--prod', '--extract-css', '--output-hashing=none' )) - .then(() => expectFileToMatch('dist/styles.bundle.css', 'Material Icons')); + .then(() => expectFileToMatch('dist/styles.css', 'Material Icons')); }
cb598b969bcf6bf57182ce1e4164f6963c13bb76
2016-10-02 21:33:10
Filipe Silva
chore(new): remove blueprint option (#2390)
false
remove blueprint option (#2390)
chore
diff --git a/packages/angular-cli/commands/init.ts b/packages/angular-cli/commands/init.ts index 491192f90614..1b300e43b588 100644 --- a/packages/angular-cli/commands/init.ts +++ b/packages/angular-cli/commands/init.ts @@ -18,7 +18,6 @@ const InitCommand: any = Command.extend({ availableOptions: [ { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] }, { name: 'verbose', type: Boolean, default: false, aliases: ['v'] }, - { name: 'blueprint', type: String, aliases: ['b'] }, { name: 'link-cli', type: Boolean, default: false, aliases: ['lc'] }, { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] }, { name: 'skip-bower', type: Boolean, default: true, aliases: ['sb'] }, @@ -34,10 +33,6 @@ const InitCommand: any = Command.extend({ anonymousOptions: ['<glob-pattern>'], - _defaultBlueprint: function () { - return 'ng2'; - }, - run: function (commandOptions: any, rawArgs: string[]) { if (commandOptions.dryRun) { commandOptions.skipNpm = true; @@ -100,7 +95,7 @@ const InitCommand: any = Command.extend({ const blueprintOpts = { dryRun: commandOptions.dryRun, - blueprint: commandOptions.blueprint || this._defaultBlueprint(), + blueprint: 'ng2', rawName: packageName, targetFiles: rawArgs || '', rawArgs: rawArgs.toString(), diff --git a/packages/angular-cli/commands/new.ts b/packages/angular-cli/commands/new.ts index 27fbbb9acfbc..5737c0afaee8 100644 --- a/packages/angular-cli/commands/new.ts +++ b/packages/angular-cli/commands/new.ts @@ -1,11 +1,11 @@ import * as chalk from 'chalk'; +import InitCommand from './init'; + const Command = require('ember-cli/lib/models/command'); const Project = require('ember-cli/lib/models/project'); const SilentError = require('silent-error'); const validProjectName = require('ember-cli/lib/utilities/valid-project-name'); -const normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option'); -import InitCommand from './init'; const NewCommand = Command.extend({ name: 'new', @@ -15,7 +15,6 @@ const NewCommand = Command.extend({ availableOptions: [ { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] }, { name: 'verbose', type: Boolean, default: false, aliases: ['v'] }, - { name: 'blueprint', type: String, default: 'ng2', aliases: ['b'] }, { name: 'link-cli', type: Boolean, default: false, aliases: ['lc'] }, { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] }, { name: 'skip-bower', type: Boolean, default: true, aliases: ['sb'] }, @@ -62,8 +61,6 @@ const NewCommand = Command.extend({ )); } - commandOptions.blueprint = normalizeBlueprint(commandOptions.blueprint); - if (!commandOptions.directory) { commandOptions.directory = packageName; } diff --git a/tests/acceptance/new.spec.js b/tests/acceptance/new.spec.js index 533f2893d97d..1cdcc640b214 100644 --- a/tests/acceptance/new.spec.js +++ b/tests/acceptance/new.spec.js @@ -103,42 +103,6 @@ describe('Acceptance: ng new', function () { .then(confirmBlueprinted); }); - it('ng new with blueprint uses the specified blueprint directory with a relative path', - function () { - return tmp.setup('./tmp/my_blueprint') - .then(function () { - return tmp.setup('./tmp/my_blueprint/files'); - }) - .then(function () { - fs.writeFileSync('./tmp/my_blueprint/files/gitignore'); - process.chdir('./tmp'); - - return ng([ - 'new', 'foo', '--skip-npm', '--skip-bower', '--skip-git', - '--blueprint=./my_blueprint' - ]); - }) - .then(confirmBlueprintedForDir('tmp/my_blueprint')); - }); - - it('ng new with blueprint uses the specified blueprint directory with an absolute path', - function () { - return tmp.setup('./tmp/my_blueprint') - .then(function () { - return tmp.setup('./tmp/my_blueprint/files'); - }) - .then(function () { - fs.writeFileSync('./tmp/my_blueprint/files/gitignore'); - process.chdir('./tmp'); - - return ng([ - 'new', 'foo', '--skip-npm', '--skip-bower', '--skip-git', - '--blueprint=' + path.resolve(process.cwd(), './my_blueprint') - ]); - }) - .then(confirmBlueprintedForDir('tmp/my_blueprint')); - }); - it('ng new without skip-git flag creates .git dir', function () { return ng(['new', 'foo', '--skip-npm', '--skip-bower']).then(function () { expect(existsSync('.git'));
e567e0caf18def43da65a2eb315382dfeba83b24
2021-01-11 18:46:59
Renovate Bot
build: update to version
false
update to version
build
diff --git a/yarn.lock b/yarn.lock index 59f9642b4d13..60c4c9b24712 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4784,9 +4784,9 @@ [email protected]: tapable "^2.2.0" enhanced-resolve@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" - integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== + version "4.4.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.4.0.tgz#0bcd254f2042d18ab61e937f8ae849b76961c5ec" + integrity sha512-4XqFcmxO11Dxm8yxVr219ifOvHGzbMRZMs1WmZtwYfUWEUh4SN8nJ04l0qHZ/iWwI9ZXxHzjx9IXd+5j/QPqKg== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0"
58bc5b8f2a2a285f8e09ec05ef407fe32be3ef05
2019-02-23 05:23:34
cexbrayat
fix(@schematics/angular): remove ViewEncapsulation from root component
false
remove ViewEncapsulation from root component
fix
diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template index f18603ea42a5..91aad371b12d 100644 --- a/packages/schematics/angular/application/other-files/app.component.ts.template +++ b/packages/schematics/angular/application/other-files/app.component.ts.template @@ -1,4 +1,4 @@ -import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: '<%= selector %>',<% if(inlineTemplate) { %> @@ -28,8 +28,7 @@ import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } fro `,<% } else { %> templateUrl: './app.component.html',<% } if(inlineStyle) { %> styles: []<% } else { %> - styleUrls: ['./app.component.<%= styleExt %>']<% } %><% if(!!viewEncapsulation) { %>, - encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } %> + styleUrls: ['./app.component.<%= styleExt %>']<% } %> }) export class AppComponent { title = '<%= name %>';
88f23e0a7a8c3f70e6df3e0933fc549efa1c64ba
2022-02-10 18:46:45
Renovate Bot
build: update angular
false
update angular
build
diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index 892f3229f511..ca29f1be5ad0 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@ea10bc11429093f71506927aac9da864ce775b4f + - uses: angular/dev-infra/github-actions/commit-message-based-labels@2c23378f310c42b482d246886ed2aab1550dc650 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index ab8ecc197c39..afa2a3ef11b0 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -12,6 +12,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@ea10bc11429093f71506927aac9da864ce775b4f + - uses: angular/dev-infra/github-actions/feature-request@2c23378f310c42b482d246886ed2aab1550dc650 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index fbba32a973bb..1f715dec77cf 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -9,6 +9,6 @@ jobs: lock_closed: runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/lock-closed@ea10bc11429093f71506927aac9da864ce775b4f + - uses: angular/dev-infra/github-actions/lock-closed@2c23378f310c42b482d246886ed2aab1550dc650 with: lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }} diff --git a/package.json b/package.json index 780e65658584..cc776fa6b452 100644 --- a/package.json +++ b/package.json @@ -64,15 +64,15 @@ "devDependencies": { "@ampproject/remapping": "2.1.0", "@angular/animations": "14.0.0-next.2", - "@angular/cdk": "14.0.0-next.1", + "@angular/cdk": "14.0.0-next.2", "@angular/common": "14.0.0-next.2", "@angular/compiler": "14.0.0-next.2", "@angular/compiler-cli": "14.0.0-next.2", "@angular/core": "14.0.0-next.2", - "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#647c873bed9f9b9190f8441eea790a01ad0b2e92", + "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#bc95d30fc481710a0634188e5a47ab08246cd966", "@angular/forms": "14.0.0-next.2", "@angular/localize": "14.0.0-next.2", - "@angular/material": "14.0.0-next.1", + "@angular/material": "14.0.0-next.2", "@angular/platform-browser": "14.0.0-next.2", "@angular/platform-browser-dynamic": "14.0.0-next.2", "@angular/platform-server": "14.0.0-next.2", diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index c31905c36f50..3fa3032cfd47 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#9c074d5cbb4d248c0cc4a68d95da80e1280dc9dc", - "@angular/cdk": "github:angular/cdk-builds#ed6489bd5775f762ccbe0cefd35a7f9e57b4b8ca", - "@angular/common": "github:angular/common-builds#30ca0d49c85800181170323078e0d3f2f38867cc", - "@angular/compiler": "github:angular/compiler-builds#1ac8fd877b074a6404c68aaa7df84c1fa22c081b", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#fe494d435585395e9888dae26e72f3652800cb95", - "@angular/core": "github:angular/core-builds#ff45dc6ab822f1591f2f4519506c72e894ad79d9", - "@angular/forms": "github:angular/forms-builds#5410c884349684a00cd2ab57934113d091980e96", - "@angular/language-service": "github:angular/language-service-builds#96176f188ec000d74012423f027ad4b313b16b1d", - "@angular/localize": "github:angular/localize-builds#8cbface81637d77fb61914eba7c795f64d762d75", - "@angular/material": "github:angular/material2-builds#e93133ad7d2cda76f450c91f59ce63bc009282d5", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#6efb2bbe4994822baabb5182d2879328c936d8d5", - "@angular/platform-browser": "github:angular/platform-browser-builds#ada1935148d1146a8721f765b81bf26b514d5772", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#d096ec66a0e5164062c39d8261b2158fe9ae7e68", - "@angular/platform-server": "github:angular/platform-server-builds#d54dd3bca66bdd68fc6c27db18934b436d6c0a07", - "@angular/router": "github:angular/router-builds#93221d9fce94047550dca4beaa85634eb5d83011", - "@angular/service-worker": "github:angular/service-worker-builds#39e99a1c3783932ec90d86ab7fb2a7ccc033766c" + "@angular/animations": "github:angular/animations-builds#bb49680b8beeadce704c05b6826a2dccd036487f", + "@angular/cdk": "github:angular/cdk-builds#0cb89fe275fcfd9a73c9da2c3d22f04278992e6b", + "@angular/common": "github:angular/common-builds#2bfb9a88498280d0d979fb0f4fc77a38277ca066", + "@angular/compiler": "github:angular/compiler-builds#fa3959629b0706306981b1352523a4364b63f80f", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#5cd40e3fb72aeb5d2d89c8c85faace79ac46e969", + "@angular/core": "github:angular/core-builds#3a9b6f815d7139f3a813f38a8053a25d3da3e1e4", + "@angular/forms": "github:angular/forms-builds#0e74f01aac66f84d0f7851941a9d0f45ff7400fe", + "@angular/language-service": "github:angular/language-service-builds#371df0ff00c77a5002d40fbdb4fb1e42d0ed7360", + "@angular/localize": "github:angular/localize-builds#cd4861493639ea0f40e17e57ae374078dd49f672", + "@angular/material": "github:angular/material2-builds#4f7937a57cf8c61910e880c40298bb77e3c0aa1a", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#6b7f6c8bc11e99ca46d4b1213784e93ba6e3f058", + "@angular/platform-browser": "github:angular/platform-browser-builds#d62d27d91e58563dd3c386f76222543b186a8f23", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#aef4da6f8e9cbc2bd90672a23cc9c5e536d94cbd", + "@angular/platform-server": "github:angular/platform-server-builds#18e596f8021a4d36c528bfae3802f2763f34de81", + "@angular/router": "github:angular/router-builds#bfd6ea488b70ae1337842caf782f98dd545286aa", + "@angular/service-worker": "github:angular/service-worker-builds#fd7b7a70389282caf22d25a6f36915a03d2ef262" } } diff --git a/yarn.lock b/yarn.lock index 29b9cf57ddfa..d56380db9105 100644 --- a/yarn.lock +++ b/yarn.lock @@ -164,10 +164,10 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" -"@angular/[email protected]": - version "14.0.0-next.1" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-14.0.0-next.1.tgz#db2b68f689cea508d044378307080290d70a6ff8" - integrity sha512-lR5N7MaBZAMPDFEe40mY0NNl55X4ajlfJ3963S6pAf22EMWohuU7MdIy0rDbewwmGvSb8864TU+HqiYfk+d7Wg== +"@angular/[email protected]": + version "14.0.0-next.2" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-14.0.0-next.2.tgz#60a23717737b9e88f9868143f3c60fb36edf1315" + integrity sha512-N4e74rGTXasunUrY7bHOrlfxZYPVonojkg2NhNRglD4wYM00+BSKx85hZnuF19cgUK2Rr8CLdesxnjeE1HJW6Q== dependencies: tslib "^2.3.0" optionalDependencies: @@ -217,10 +217,10 @@ dependencies: tslib "^2.3.0" -"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#647c873bed9f9b9190f8441eea790a01ad0b2e92": - version "0.0.0-ea10bc11429093f71506927aac9da864ce775b4f" - uid "647c873bed9f9b9190f8441eea790a01ad0b2e92" - resolved "https://github.com/angular/dev-infra-private-builds.git#647c873bed9f9b9190f8441eea790a01ad0b2e92" +"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#bc95d30fc481710a0634188e5a47ab08246cd966": + version "0.0.0-2c23378f310c42b482d246886ed2aab1550dc650" + uid bc95d30fc481710a0634188e5a47ab08246cd966 + resolved "https://github.com/angular/dev-infra-private-builds.git#bc95d30fc481710a0634188e5a47ab08246cd966" dependencies: "@actions/core" "^1.4.0" "@actions/github" "^5.0.0" @@ -297,10 +297,10 @@ glob "7.2.0" yargs "^17.2.1" -"@angular/[email protected]": - version "14.0.0-next.1" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-14.0.0-next.1.tgz#ac73ba42414eb19c9e4baa4283c1fedf13b4652b" - integrity sha512-TW8dKbcVLhMpjUqDAv4HA3WNwhZBEPbyiQVhthLHM9EY5pfZziB8NtYEz72q35EdJexgM+UOfNcadQWE4y2xCw== +"@angular/[email protected]": + version "14.0.0-next.2" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-14.0.0-next.2.tgz#653cc2587e5f414a150598bc7781959fe187a29d" + integrity sha512-z1B8VGDYc6zYC9IwJWaBOb+kLQJezGa0hFvDLNOz6YzN1YfZKue6zXj8LOXr245M159NDRhh4e3s7d5ZfnUZRQ== dependencies: tslib "^2.3.0"
7bc20ff7661c698218a9ac994b5e9b6a1a61740f
2016-04-06 12:49:54
Rodolphe PELLOUX-PRAYER
fix: use explicit Number() instead of unary plus
false
use explicit Number() instead of unary plus
fix
diff --git a/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-detail.component.ts b/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-detail.component.ts index ed6f1fa4db33..d4bd40c28a17 100644 --- a/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-detail.component.ts +++ b/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-detail.component.ts @@ -19,7 +19,7 @@ export class <%= classifiedModuleName %>DetailComponent implements OnInit, CanDe ) { } ngOnInit() { - let id = +this._routeParams.get('id'); + let id = Number(this._routeParams.get('id')); this._service.get(id).then(<%= camelizedModuleName %> => { if (<%= camelizedModuleName %>) { this.editName = <%= camelizedModuleName %>.name; diff --git a/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-root.component.ts b/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-root.component.ts index 515ad419a4ce..54a71eb87e55 100644 --- a/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-root.component.ts +++ b/addon/ng2/blueprints/route/files/src/client/app/__name__/__name__-root.component.ts @@ -11,8 +11,8 @@ import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>. directives: [RouterOutlet] }) @RouteConfig([ - {path:'/', name: '<%= classifiedModuleName %>List', component: <%= classifiedModuleName %>ListComponent, useAsDefault: true}, - {path:'/:id', name: '<%= classifiedModuleName %>Detail', component: <%= classifiedModuleName %>DetailComponent} + {path: '/', name: '<%= classifiedModuleName %>List', component: <%= classifiedModuleName %>ListComponent, useAsDefault: true}, + {path: '/:id', name: '<%= classifiedModuleName %>Detail', component: <%= classifiedModuleName %>DetailComponent} ]) export class <%= classifiedModuleName %>Root { constructor() {}
aa34b286ef67375317ddb7335b0305ddc50c0b9b
2017-08-24 02:54:55
Filipe Silva
fix(@ngtools/webpack): wait for plugin when resolving ts requests
false
wait for plugin when resolving ts requests
fix
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts index 1840d2dfe704..81ae899bd757 100644 --- a/packages/@ngtools/webpack/src/plugin.ts +++ b/packages/@ngtools/webpack/src/plugin.ts @@ -382,8 +382,11 @@ export class AotPlugin implements Tapable { compiler.plugin('after-resolvers', (compiler: any) => { // Virtual file system. + // Wait for the plugin to be done when requesting `.ts` files directly (entry points), or + // when the issuer is a `.ts` file. compiler.resolvers.normal.plugin('before-resolve', (request: any, cb: () => void) => { - if (request.request.match(/\.ts$/)) { + if (request.request.endsWith('.ts') + || (request.context.issuer && request.context.issuer.endsWith('.ts'))) { this.done!.then(() => cb(), () => cb()); } else { cb(); diff --git a/tests/e2e/tests/build/aot/aot-rebuild.ts b/tests/e2e/tests/build/aot/aot-rebuild.ts new file mode 100644 index 000000000000..b8b3f012b0d8 --- /dev/null +++ b/tests/e2e/tests/build/aot/aot-rebuild.ts @@ -0,0 +1,45 @@ +import { + killAllProcesses, + waitForAnyProcessOutputToMatch, + execAndWaitForOutputToMatch, +} from '../../../utils/process'; +import { appendToFile } from '../../../utils/fs'; +import { getGlobalVariable } from '../../../utils/env'; +import { request } from '../../../utils/http'; +import { wait } from '../../../utils/utils'; + +const validBundleRegEx = /webpack: bundle is now VALID|webpack: Compiled successfully./; + +export default function () { + if (process.platform.startsWith('win')) { + return Promise.resolve(); + } + // Skip this in ejected tests. + if (getGlobalVariable('argv').eject) { + return Promise.resolve(); + } + + return execAndWaitForOutputToMatch('ng', ['serve', '--aot'], validBundleRegEx) + // Wait before editing a file. + // Editing too soon seems to trigger a rebuild and throw polling/watch out of whack. + .then(() => wait(2000)) + // Check AOT templates are up to date with current code. + .then(() => request('http://localhost:4200/main.bundle.js')) + .then((body) => { + if (body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) { + throw new Error('Expected golden value 1 to not be present.'); + } + }) + .then(() => appendToFile('src/app/app.component.html', '<p> $$_E2E_GOLDEN_VALUE_1 </p>')) + .then(() => waitForAnyProcessOutputToMatch(validBundleRegEx, 20000)) + .then(() => request('http://localhost:4200/main.bundle.js')) + .then((body) => { + if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) { + throw new Error('Expected golden value 1.'); + } + }) + .then(() => killAllProcesses(), (err: any) => { + killAllProcesses(); + throw err; + }); +}
0a186989134e7541e175a818efadd4d389dc0323
2020-11-20 17:06:21
Renovate Bot
build: update debug to version 4.3.1
false
update debug to version 4.3.1
build
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json index df34ac3c20b3..c90f62305ad4 100644 --- a/packages/angular/cli/package.json +++ b/packages/angular/cli/package.json @@ -32,7 +32,7 @@ "@schematics/update": "0.0.0", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", - "debug": "4.2.0", + "debug": "4.3.1", "ini": "1.3.5", "inquirer": "7.3.3", "jsonc-parser": "3.0.0", diff --git a/yarn.lock b/yarn.lock index dbbae556a796..a28646e4311a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4319,13 +4319,20 @@ [email protected], debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, [email protected], debug@^4.1.0, debug@^4.1.1: +debug@4, debug@^4.1.0, debug@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== dependencies: ms "2.1.2" [email protected]: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
3c8b33ab3a6b53c03c166a4468117b7fa2fa2c92
2018-11-09 00:04:35
Cédric Exbrayat
fix(@angular-devkit/build-angular): add a base href to karma context (#12889)
false
add a base href to karma context (#12889)
fix
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html index dd11e3efe33f..17937eee4920 100644 --- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html +++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html @@ -8,6 +8,7 @@ <head> <title></title> + <base href="/"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> </head>
34cde9f5126f39b992eb922e441e6248a528acdd
2016-12-28 23:35:21
Suguru Inatomi
chore(typo): fix spelling of 'globalScripts' (#3694)
false
fix spelling of 'globalScripts' (#3694)
chore
diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts index 7c784c1a6eb8..bdbeabfadd14 100644 --- a/packages/angular-cli/models/webpack-build-common.ts +++ b/packages/angular-cli/models/webpack-build-common.ts @@ -52,17 +52,17 @@ export function getWebpackCommonConfig( // process global scripts if (appConfig.scripts.length > 0) { - const globalScrips = extraEntryParser(appConfig.scripts, appRoot, 'scripts'); + const globalScripts = extraEntryParser(appConfig.scripts, appRoot, 'scripts'); // add entry points and lazy chunks - globalScrips.forEach(script => { + globalScripts.forEach(script => { if (script.lazy) { lazyChunks.push(script.entry); } entryPoints[script.entry] = (entryPoints[script.entry] || []).concat(script.path); }); // load global scripts using script-loader extraRules.push({ - include: globalScrips.map((script) => script.path), test: /\.js$/, loader: 'script-loader' + include: globalScripts.map((script) => script.path), test: /\.js$/, loader: 'script-loader' }); }
63722c309c8cd531625f8906682860b2be10eba3
2024-10-28 21:13:16
Alan Agius
fix(@angular/ssr): ensure wildcard RenderMode is applied when no Angular routes are defined
false
ensure wildcard RenderMode is applied when no Angular routes are defined
fix
diff --git a/packages/angular/ssr/src/routes/ng-routes.ts b/packages/angular/ssr/src/routes/ng-routes.ts index a2680d5175d9..1d60841a090d 100644 --- a/packages/angular/ssr/src/routes/ng-routes.ts +++ b/packages/angular/ssr/src/routes/ng-routes.ts @@ -411,26 +411,26 @@ export async function getRoutesFromAngularRouterConfig( injector.get(APP_BASE_HREF, null, { optional: true }) ?? injector.get(PlatformLocation).getBaseHrefFromDOM(); - if (router.config.length) { - const compiler = injector.get(Compiler); + const compiler = injector.get(Compiler); - const serverRoutesConfig = injector.get(SERVER_ROUTES_CONFIG, null, { optional: true }); - let serverConfigRouteTree: RouteTree<ServerConfigRouteTreeAdditionalMetadata> | undefined; + const serverRoutesConfig = injector.get(SERVER_ROUTES_CONFIG, null, { optional: true }); + let serverConfigRouteTree: RouteTree<ServerConfigRouteTreeAdditionalMetadata> | undefined; - if (serverRoutesConfig) { - const result = buildServerConfigRouteTree(serverRoutesConfig); - serverConfigRouteTree = result.serverConfigRouteTree; - errors.push(...result.errors); - } + if (serverRoutesConfig) { + const result = buildServerConfigRouteTree(serverRoutesConfig); + serverConfigRouteTree = result.serverConfigRouteTree; + errors.push(...result.errors); + } - if (errors.length) { - return { - baseHref, - routes: routesResults, - errors, - }; - } + if (errors.length) { + return { + baseHref, + routes: routesResults, + errors, + }; + } + if (router.config.length) { // Retrieve all routes from the Angular router configuration. const traverseRoutes = traverseRoutesConfig({ routes: router.config, @@ -478,7 +478,12 @@ export async function getRoutesFromAngularRouterConfig( } } } else { - routesResults.push({ route: '', renderMode: RenderMode.Prerender }); + const renderMode = serverConfigRouteTree?.match('')?.renderMode ?? RenderMode.Prerender; + + routesResults.push({ + route: '', + renderMode, + }); } return { diff --git a/packages/angular/ssr/test/routes/ng-routes_spec.ts b/packages/angular/ssr/test/routes/ng-routes_spec.ts index 82ac36288110..bb0795a156c3 100644 --- a/packages/angular/ssr/test/routes/ng-routes_spec.ts +++ b/packages/angular/ssr/test/routes/ng-routes_spec.ts @@ -361,4 +361,18 @@ describe('extractRoutesAndCreateRouteTree', () => { `Both 'home' and 'shell' routes have their 'renderMode' set to 'AppShell'.`, ); }); + + it('should apply RenderMode matching the wildcard when no Angular routes are defined', async () => { + setAngularAppTestingManifest([], [{ path: '**', renderMode: RenderMode.Server }]); + + const { errors, routeTree } = await extractRoutesAndCreateRouteTree( + url, + /** manifest */ undefined, + /** invokeGetPrerenderParams */ false, + /** includePrerenderFallbackRoutes */ false, + ); + + expect(errors).toHaveSize(0); + expect(routeTree.toObject()).toEqual([{ route: '/', renderMode: RenderMode.Server }]); + }); });
9b56edc46c9a34b7dcbcefd462631af9c1d943c2
2017-02-02 01:46:09
Hans Larsen
release: v1.0.0-beta.27
false
v1.0.0-beta.27
release
diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cfabbdc923..06b6fea56f4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,75 @@ +<a name="1.0.0-beta.27"></a> +# [1.0.0-beta.27](https://github.com/angular/angular-cli/compare/v1.0.0-beta.26...v1.0.0-beta.27) (2017-02-01) + + +### Bug Fixes + +* **@ngtools/json-schema:** values of non-existent objects should return undefined ([#4300](https://github.com/angular/angular-cli/issues/4300)) ([95f28fd](https://github.com/angular/angular-cli/commit/95f28fd)) +* **@ngtools/webpack:** don't override context module deps ([#4153](https://github.com/angular/angular-cli/issues/4153)) ([4b9af62](https://github.com/angular/angular-cli/commit/4b9af62)), closes [#2496](https://github.com/angular/angular-cli/issues/2496) +* **@ngtools/webpack:** skip null files ([#4168](https://github.com/angular/angular-cli/issues/4168)) ([43c6861](https://github.com/angular/angular-cli/commit/43c6861)), closes [#4165](https://github.com/angular/angular-cli/issues/4165) +* **build:** don't leave dist folder on fail ([#4047](https://github.com/angular/angular-cli/issues/4047)) ([790dda6](https://github.com/angular/angular-cli/commit/790dda6)) +* **build:** ExtractTextWebpack 2.0.0-rc.1 and remove unsupported prop ([#4265](https://github.com/angular/angular-cli/issues/4265)) ([1bbd12d](https://github.com/angular/angular-cli/commit/1bbd12d)), closes [#4264](https://github.com/angular/angular-cli/issues/4264) +* **css:** emit css sourcemaps only when extracting ([#4280](https://github.com/angular/angular-cli/issues/4280)) ([3aa55d7](https://github.com/angular/angular-cli/commit/3aa55d7)) +* **deps:** pin lodash types ([#4260](https://github.com/angular/angular-cli/issues/4260)) ([5f6a7f2](https://github.com/angular/angular-cli/commit/5f6a7f2)) +* **deps:** update mocha dev dependency ([#4291](https://github.com/angular/angular-cli/issues/4291)) ([49d15b3](https://github.com/angular/angular-cli/commit/49d15b3)) +* **docs:** remove mention to code formatting ([c079ccf](https://github.com/angular/angular-cli/commit/c079ccf)), closes [#4144](https://github.com/angular/angular-cli/issues/4144) +* **lint:** fix new linting errors ([#4241](https://github.com/angular/angular-cli/issues/4241)) ([76f8827](https://github.com/angular/angular-cli/commit/76f8827)) +* **polyfills:** move polyfills to own entry point ([#3812](https://github.com/angular/angular-cli/issues/3812)) ([08bb738](https://github.com/angular/angular-cli/commit/08bb738)), closes [#2752](https://github.com/angular/angular-cli/issues/2752) [#3309](https://github.com/angular/angular-cli/issues/3309) [#4140](https://github.com/angular/angular-cli/issues/4140) +* **scripts:** allow using same lib inside app ([#3814](https://github.com/angular/angular-cli/issues/3814)) ([a2ea05e](https://github.com/angular/angular-cli/commit/a2ea05e)), closes [#2141](https://github.com/angular/angular-cli/issues/2141) +* **serve:** delete dist on serve ([#4293](https://github.com/angular/angular-cli/issues/4293)) ([8e82d17](https://github.com/angular/angular-cli/commit/8e82d17)) +* **serve:** improve error message when port is in use ([#4167](https://github.com/angular/angular-cli/issues/4167)) ([75e83a4](https://github.com/angular/angular-cli/commit/75e83a4)) +* **styles:** correctly output sourcemaps ([#4222](https://github.com/angular/angular-cli/issues/4222)) ([c29ed53](https://github.com/angular/angular-cli/commit/c29ed53)), closes [#2020](https://github.com/angular/angular-cli/issues/2020) + + +### Code Refactoring + +* **build:** consolidate build options ([#4105](https://github.com/angular/angular-cli/issues/4105)) ([e15433e](https://github.com/angular/angular-cli/commit/e15433e)) +* **lint:** use tslint api for linting ([#4248](https://github.com/angular/angular-cli/issues/4248)) ([0664beb](https://github.com/angular/angular-cli/commit/0664beb)), closes [#867](https://github.com/angular/angular-cli/issues/867) [#3993](https://github.com/angular/angular-cli/issues/3993) +* **test:** remove lint option from test command ([#4261](https://github.com/angular/angular-cli/issues/4261)) ([645c870](https://github.com/angular/angular-cli/commit/645c870)) + + +### Features + +* **@ngtools/webpack:** remove annotations ([#4301](https://github.com/angular/angular-cli/issues/4301)) ([439dcd7](https://github.com/angular/angular-cli/commit/439dcd7)) +* **angular-cli:** Add a postinstall warning for Node 4 deprecation. ([#4309](https://github.com/angular/angular-cli/issues/4309)) ([916e9bd](https://github.com/angular/angular-cli/commit/916e9bd)) +* **build:** minify/optimize component stylesheets ([#4259](https://github.com/angular/angular-cli/issues/4259)) ([499ef2f](https://github.com/angular/angular-cli/commit/499ef2f)) +* **serve:** Persist serve options in angular-cli.json ([#3908](https://github.com/angular/angular-cli/issues/3908)) ([da255b0](https://github.com/angular/angular-cli/commit/da255b0)), closes [#1156](https://github.com/angular/angular-cli/issues/1156) +* **update:** add ng update as alias of ng init ([#4142](https://github.com/angular/angular-cli/issues/4142)) ([2211172](https://github.com/angular/angular-cli/commit/2211172)), closes [#4007](https://github.com/angular/angular-cli/issues/4007) + + +### Performance Improvements + +* **@ngtools/webpack:** Improve rebuild performance ([#4145](https://github.com/angular/angular-cli/issues/4145)) ([9d033e7](https://github.com/angular/angular-cli/commit/9d033e7)) +* **@ngtools/webpack:** improve rebuild performance ([#4188](https://github.com/angular/angular-cli/issues/4188)) ([7edac2b](https://github.com/angular/angular-cli/commit/7edac2b)) +* **@ngtools/webpack:** reduce rebuild performance by typechecking more ([#4258](https://github.com/angular/angular-cli/issues/4258)) ([29b134d](https://github.com/angular/angular-cli/commit/29b134d)) + + +### BREAKING CHANGES + +* angular-cli: Node < 6.9 will be deprecated soon, and this will show a warning to users. Moving forward, that warning will be moved to an error with the next release. +* test: ng test no longer has the --lint flag available. +* lint: In order to use the updated `ng lint` command, the following section will have to be added to the project's `angular-cli.json` at the root level of the json object. + + ```json + "lint": [ + { + "files": "src/**/*.ts", + "project": "src/tsconfig.json" + }, + { + "files": "e2e/**/*.ts", + "project": "e2e/tsconfig.json" + } + ], + ``` + +Alternatively, you can run `ng update`. +* build: - `--extractCss` defaults to `false` on all `--dev` (`ng build` with no flags uses `--dev`) +- `--aot` defaults to true in `--prod` +- the alias for `--output-path` is now `-op` instead of `-o` + + + <a name="1.0.0-beta.26"></a> # [1.0.0-beta.26](https://github.com/angular/angular-cli/compare/v1.0.0-beta.25...v1.0.0-beta.26) (2017-01-19) diff --git a/package.json b/package.json index d3019180a662..3c6058cd58d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-cli", - "version": "1.0.0-beta.26", + "version": "1.0.0-beta.28.3", "description": "CLI tool for Angular", "main": "packages/angular-cli/lib/cli/index.js", "trackingCode": "UA-8594346-19", diff --git a/packages/@angular-cli/ast-tools/package.json b/packages/@angular-cli/ast-tools/package.json index a30f20497eab..c46185d18784 100644 --- a/packages/@angular-cli/ast-tools/package.json +++ b/packages/@angular-cli/ast-tools/package.json @@ -1,6 +1,6 @@ { "name": "@angular-cli/ast-tools", - "version": "1.0.15", + "version": "1.0.16", "description": "CLI tool for Angular", "main": "./src/index.js", "keywords": [ diff --git a/packages/@angular-cli/base-href-webpack/package.json b/packages/@angular-cli/base-href-webpack/package.json index 727befd52a0f..614d80678f37 100644 --- a/packages/@angular-cli/base-href-webpack/package.json +++ b/packages/@angular-cli/base-href-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@angular-cli/base-href-webpack", - "version": "1.0.15", + "version": "1.0.16", "description": "Base HREF Webpack plugin", "main": "./src/index.js", "keywords": [ diff --git a/packages/@ngtools/json-schema/package.json b/packages/@ngtools/json-schema/package.json index e10947730cdf..2834740071ca 100644 --- a/packages/@ngtools/json-schema/package.json +++ b/packages/@ngtools/json-schema/package.json @@ -1,6 +1,6 @@ { "name": "@ngtools/json-schema", - "version": "1.0.1", + "version": "1.0.2", "description": "Schema validating and reading for configurations, similar to Angular CLI config.", "main": "./src/index.js", "typings": "src/index.d.ts", diff --git a/packages/@ngtools/logger/package.json b/packages/@ngtools/logger/package.json index d11d5beb5df6..c1617ff31404 100644 --- a/packages/@ngtools/logger/package.json +++ b/packages/@ngtools/logger/package.json @@ -1,6 +1,6 @@ { "name": "@ngtools/logger", - "version": "0.1.2", + "version": "0.1.3", "description": "", "main": "./src/index.js", "license": "MIT", diff --git a/packages/@ngtools/webpack/package.json b/packages/@ngtools/webpack/package.json index 1f9978e135fc..dd25caa7cf46 100644 --- a/packages/@ngtools/webpack/package.json +++ b/packages/@ngtools/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@ngtools/webpack", - "version": "1.2.4", + "version": "1.2.5", "description": "Webpack plugin that AoT compiles your Angular components and modules.", "main": "./src/index.js", "typings": "src/index.d.ts", diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json index 8253a4c88761..0f04ef0bc452 100644 --- a/packages/angular-cli/package.json +++ b/packages/angular-cli/package.json @@ -1,6 +1,6 @@ { "name": "angular-cli", - "version": "1.0.0-beta.26", + "version": "1.0.0-beta.28.3", "description": "CLI tool for Angular", "main": "lib/cli/index.js", "trackingCode": "UA-8594346-19", diff --git a/scripts/publish/shrinkwrap.js b/scripts/publish/shrinkwrap.js index 508aed24cfac..409c78e4eb1e 100755 --- a/scripts/publish/shrinkwrap.js +++ b/scripts/publish/shrinkwrap.js @@ -9,10 +9,24 @@ function removeResolvedKeys(json) { if (json['_resolved']) { delete json['_resolved']; } + if (json['from']) { + delete json['from']; + } + if (json['_from']) { + delete json['_from']; + } const deps = json['dependencies'] || {}; for (const key of Object.keys(deps)) { - deps[key] = removeResolvedKeys(deps[key]); + if (key.startsWith('@angular/')) { + delete deps[key]; + } else if (key.startsWith('@ngtools/')) { + delete deps[key]; + } else if (key.startsWith('@angular-cli/')) { + delete deps[key]; + } else { + deps[key] = removeResolvedKeys(deps[key]); + } } return json; @@ -22,7 +36,7 @@ function removeResolvedKeys(json) { const fs = require('fs'); const path = require('path'); -const shrinkwrapPath = path.join(__dirname, '../../npm-shrinkwrap.json'); +const shrinkwrapPath = path.join(process.cwd(), 'npm-shrinkwrap.json'); const shrinkwrap = JSON.parse(fs.readFileSync(shrinkwrapPath, 'utf-8')); const newJson = removeResolvedKeys(shrinkwrap);
5220e6e8b1d6c02fb436ad2344dcda388c875e79
2016-09-01 10:28:55
PatrickJS
style: spaces
false
spaces
style
diff --git a/examples/hello-world/src/app/index.ts b/examples/hello-world/src/app/index.ts index f4b6e0c24c35..743b4c99e852 100644 --- a/examples/hello-world/src/app/index.ts +++ b/examples/hello-world/src/app/index.ts @@ -22,7 +22,7 @@ export class App implements OnInit { } ngOnInit() { - this.jsonp.request('https://api.github.com?callback=JSONP_CALLBACK') + this.jsonp.request('https://api.github.com?callback=JSONP_CALLBACK') .subscribe((res) => { var json = res.json(); this.response = json;
d3648f2a0c02b3bd20d8eb941a4ab873653920af
2025-01-18 04:17:04
Doug Parker
docs: release notes for the v19.1.2 release
false
release notes for the v19.1.2 release
docs
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2186b0987a30..e1fae0df6b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +<a name="19.1.2"></a> + +# 19.1.2 (2025-01-17) + +### @angular/build + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------------------ | +| [939d1612a](https://github.com/angular/angular-cli/commit/939d1612add13bab9aed6cc77bce0e17555bfe3b) | fix | perform incremental background file updates with component updates | +| [304027207](https://github.com/angular/angular-cli/commit/30402720707b7a8b9042a6046692d62a768cdc64) | fix | prevent full page reload on HMR updates with SSR enabled | +| [148acbd58](https://github.com/angular/angular-cli/commit/148acbd58a13b1ba8c4a3349bd6042c24a9f93b5) | fix | reset component updates on dev-server index request | + +<!-- CHANGELOG SPLIT MARKER --> + <a name="19.1.1"></a> # 19.1.1 (2025-01-16)
b9c4d6e736d62165bd665edcd9e497495e483848
2020-07-25 13:56:45
Renovate Bot
build: update jasmine-core to version ~3.6.0
false
update jasmine-core to version ~3.6.0
build
diff --git a/package.json b/package.json index 69aa4a9d6bea..4f6f996622bb 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "husky": "^4.0.10", "inquirer": "7.1.0", "jasmine": "^3.3.1", - "jasmine-core": "~3.5.0", + "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "~5.0.0", "jest-worker": "26.0.0", "jquery": "^3.3.1", diff --git a/yarn.lock b/yarn.lock index 447fbfea50e8..aeb9f381f9a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7156,6 +7156,11 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= +jasmine-core@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20" + integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw== + jasmine-reporters@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/jasmine-reporters/-/jasmine-reporters-2.3.2.tgz#898818ffc234eb8b3f635d693de4586f95548d43"
421dcb97ca5fbbbb71c3c91ef53aa59005777781
2021-04-12 18:01:54
Renovate Bot
build: update to version
false
update to version
build
diff --git a/yarn.lock b/yarn.lock index 6251220062d1..ef95de7d1df0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -226,6 +226,7 @@ "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#001abdbcf9bd49e46dd3a678898dc104c8148a9f": version "0.0.0" + uid "001abdbcf9bd49e46dd3a678898dc104c8148a9f" resolved "https://github.com/angular/dev-infra-private-builds.git#001abdbcf9bd49e46dd3a678898dc104c8148a9f" dependencies: "@angular/benchpress" "0.2.1" @@ -302,9 +303,9 @@ "@babel/highlight" "^7.12.13" "@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.8": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1" - integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4" + integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA== "@babel/[email protected]": version "7.13.13" @@ -329,18 +330,18 @@ source-map "^0.5.0" "@babel/core@^7.7.5", "@babel/core@^7.8.6": - version "7.13.14" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06" - integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0" + integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ== dependencies: "@babel/code-frame" "^7.12.13" "@babel/generator" "^7.13.9" "@babel/helper-compilation-targets" "^7.13.13" "@babel/helper-module-transforms" "^7.13.14" "@babel/helpers" "^7.13.10" - "@babel/parser" "^7.13.13" + "@babel/parser" "^7.13.15" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.13" + "@babel/traverse" "^7.13.15" "@babel/types" "^7.13.14" convert-source-map "^1.7.0" debug "^4.1.0" @@ -565,10 +566,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.13", "@babel/parser@^7.13.13": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" - integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== +"@babel/parser@^7.12.13", "@babel/parser@^7.13.13", "@babel/parser@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8" + integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -580,9 +581,9 @@ "@babel/plugin-proposal-optional-chaining" "^7.13.12" "@babel/plugin-proposal-async-generator-functions@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" - integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" + integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-remap-async-to-generator" "^7.13.0" @@ -956,9 +957,9 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-regenerator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" + integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== dependencies: regenerator-transform "^0.14.2" @@ -1134,17 +1135,17 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d" - integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7" + integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ== dependencies: "@babel/code-frame" "^7.12.13" "@babel/generator" "^7.13.9" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.13" - "@babel/types" "^7.13.13" + "@babel/parser" "^7.13.15" + "@babel/types" "^7.13.14" debug "^4.1.0" globals "^11.1.0" @@ -1734,17 +1735,15 @@ once "^1.4.0" "@octokit/request@^5.0.0", "@octokit/request@^5.3.0": - version "5.4.14" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.14.tgz#ec5f96f78333bb2af390afa5ff66f114b063bc96" - integrity sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA== + version "5.4.15" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.15.tgz#829da413dc7dd3aa5e2cdbb1c7d0ebe1f146a128" + integrity sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.0.0" "@octokit/types" "^6.7.1" - deprecation "^2.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.1" - once "^1.4.0" universal-user-agent "^6.0.0" "@octokit/[email protected]": @@ -1987,9 +1986,9 @@ integrity sha512-gs6MKMKXzWpSqeYsPaDIDAxD8jLNg7aFxgAJE6Jnc+ns072Z9fuh39/NF5gSk1KNoGCLnIpeZ0etT9gY9QDCKg== "@types/hapi__hapi@*", "@types/hapi__hapi@^20.0.0": - version "20.0.5" - resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-20.0.5.tgz#1cc41892a8ada002f4ee45fb8095b0aad0b0c17b" - integrity sha512-xzGVjTr2i4xsJKKVrIOxVUq6H2m04ATtDiwOQHXdVBVnuEZoWbkN8tbb0L2S+DRXV7k2Zw5pW73YzDQHhbX5pw== + version "20.0.6" + resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-20.0.6.tgz#4c45a713891918ec8cddb598cb1115f6f6e657cf" + integrity sha512-XTiwQO4X7aJ3EDEwYFx8ONlXaX7nVpSOWkmHmqEjaSGOndakNGH8jkevxexNPgPSnJluPiL52EDbKrPUx4thbQ== dependencies: "@hapi/boom" "^9.0.0" "@hapi/iron" "^6.0.0" @@ -2401,9 +2400,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe" - integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA== + version "8.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff" + integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g== [email protected]: version "3.0.0" @@ -3354,9 +3353,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: - version "1.0.30001207" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz#364d47d35a3007e528f69adb6fecb07c2bb2cc50" - integrity sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw== + version "1.0.30001208" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9" + integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA== [email protected]: version "1.0.0" @@ -3446,11 +3445,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -4559,9 +4556,9 @@ [email protected]: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.649: - version "1.3.710" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.710.tgz#b33d316e5d6de92b916e766d8a478d19796ffe11" - integrity sha512-b3r0E2o4yc7mNmBeJviejF1rEx49PUBi+2NPa7jHEX3arkAXnVgLhR0YmV8oi6/Qf3HH2a8xzQmCjHNH0IpXWQ== + version "1.3.712" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz#ae467ffe5f95961c6d41ceefe858fc36eb53b38f" + integrity sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw== elliptic@^6.5.3: version "6.5.4" @@ -5720,12 +5717,11 @@ [email protected]: micromatch "^3.1.10" http-proxy-middleware@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.0.tgz#b896b2cc6836019af4a4f2d5f7b21b99c77ea13f" - integrity sha512-OnjU5vyVgcZVe2AjLJyMrk8YLNOC2lspCHirB5ldM+B/dwEfZ5bgVTrFyzE9R7xRWAP/i/FXtvIqKjTNEZBhBg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz#48900a68cd9d388c735d1dd97302c919b7e94a13" + integrity sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA== dependencies: "@types/http-proxy" "^1.17.5" - camelcase "^6.2.0" http-proxy "^1.18.1" is-glob "^4.0.1" is-plain-obj "^3.0.0" @@ -6125,9 +6121,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.0.tgz#b037c8815281edaad6c2562648a5f5f18839d5f7" - integrity sha512-K4GwB4i/HzhAzwP/XSlspzRdFTI9N8OxJOyOU7Y5Rz+p+WBokXWVWblaJeBkggthmoSV0OoGTH5thJNvplpkvQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -6515,9 +6511,9 @@ jsbn@~0.1.0: integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.5.2" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.2.tgz#583fac89a0aea31dbf6237e7e4bedccd9beab472" - integrity sha512-JxNtPt9C1ut85boCbJmffaQ06NBnzkQY/MWO3YxPW8IWS38A26z+B1oBvA9LwKrytewdfymnhi4UNH3/RAgZrg== + version "16.5.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" + integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== dependencies: abab "^2.0.5" acorn "^8.1.0" @@ -7110,12 +7106,12 @@ micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" miller-rabin@^4.0.0: version "4.0.1" @@ -8107,9 +8103,9 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -8127,10 +8123,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^2.0.0, pify@^2.3.0: version "2.3.0" @@ -8814,7 +8810,7 @@ [email protected]: source-map "^0.6.1" supports-color "^6.1.0" [email protected], postcss@^8.2.4: [email protected]: version "8.2.9" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.9.tgz#fd95ff37b5cee55c409b3fdd237296ab4096fba3" integrity sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q== @@ -8832,6 +8828,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^8.2.4: + version "8.2.10" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b" + integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.22" + source-map "^0.6.1" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -10937,9 +10942,9 @@ typescript@~4.2.3: integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== ua-parser-js@^0.7.18: - version "0.7.27" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.27.tgz#b54f8ce9eb6c7abf3584edeaf9a3d8b3bd92edba" - integrity sha512-eXMaRYK2skomGocoX0x9sBXzx5A1ZVQgXfrW4mTc8dT0zS7olEcyfudAzRC5tIIRgLxQ69B6jut3DI+n5hslPA== + version "0.7.28" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" + integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== unbox-primitive@^1.0.0: version "1.0.1"
3b6264e27324c6ae8a2a18240292b974631bf5e2
2022-08-22 14:27:46
Angular Robot
build: update github/codeql-action action to v2.1.19
false
update github/codeql-action action to v2.1.19
build
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 3f7bd504a42c..af39fef6b3df 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -45,6 +45,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: 'Upload to code-scanning' - uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63 # tag=v2.1.18 + uses: github/codeql-action/upload-sarif@f5d217be74900c6ac8fbbe53f3c10376ba4e64da # tag=v2.1.19 with: sarif_file: results.sarif
83c8df81dc9787ab390ad029edf0a9a3b4f035a9
2016-05-30 02:57:45
PatrickJS
refactor(examples): test_html routes
false
test_html routes
refactor
diff --git a/examples/src/server/express/routes.ts b/examples/src/server/express/routes.ts index d16e440a0d8b..62007ef3d99d 100644 --- a/examples/src/server/express/routes.ts +++ b/examples/src/server/express/routes.ts @@ -220,19 +220,10 @@ module.exports = function(ROOT) { let queryParams: any = queryParamsToBoolean(req.query); let options: BootloaderConfig = Object.assign(queryParams , { // client url for systemjs - buildClientScripts: true, - systemjs: { - componentUrl: 'examples/src/universal/html/browser', - map: { - 'angular2-universal': 'node_modules/angular2-universal', - '@angular': 'node_modules/@angular' - }, - packages: PACKAGES - }, directives: [htmlApp.Html], platformProviders: [ provide(ORIGIN_URL, {useValue: 'http://localhost:3000'}), - provide(BASE_URL, {useValue: '/examples/html'}) + provide(BASE_URL, {useValue: '/'}) ], providers: [ provide(REQUEST_URL, {useValue: req.originalUrl}), @@ -244,7 +235,7 @@ module.exports = function(ROOT) { ], data: {}, - preboot: queryParams.preboot === false ? null : {debug: true, uglify: false} + preboot: false // queryParams.preboot === false ? null : {debug: true, uglify: false} }); @@ -343,15 +334,18 @@ module.exports = function(ROOT) { client: false, directives: [routerApp.App], + platformProviders: [ + provide(ORIGIN_URL, {useValue: 'http://localhost:3000'}), + provide(BASE_URL, {useValue: '/examples/router'}) + ], providers: [ - // NODE_HTTP_PROVIDERS, - provide(BASE_URL, {useValue: baseUrl}), + NODE_HTTP_PROVIDERS, provide(REQUEST_URL, {useValue: url}), NODE_ROUTER_PROVIDERS, ], data: {}, - preboot: queryParams.preboot === false ? null : {debug: true, uglify: false} + preboot: false // queryParams.preboot === false ? null : {debug: true, uglify: false} }); diff --git a/examples/src/universal/html/browser.ts b/examples/src/universal/html/browser.ts index 97e1b40e0c53..96ef79a6db66 100644 --- a/examples/src/universal/html/browser.ts +++ b/examples/src/universal/html/browser.ts @@ -2,6 +2,7 @@ console.time('@angular/core in client'); import * as angular from '@angular/core'; console.timeEnd('@angular/core in client'); +import {APP_BASE_HREF, LocationStrategy, HashLocationStrategy} from '@angular/common'; import {bootstrap} from '@angular/platform-browser-dynamic'; import {HTTP_PROVIDERS} from '@angular/http'; import {ROUTER_PROVIDERS} from '@angular/router-deprecated'; @@ -17,6 +18,8 @@ import {App} from './app'; export function main() { return bootstrap(App, [ ...HTTP_PROVIDERS, - ...ROUTER_PROVIDERS + ...ROUTER_PROVIDERS, + {provide: APP_BASE_HREF, useValue: '/'}, + {provide: LocationStrategy, useClass: HashLocationStrategy } ]); } diff --git a/examples/src/universal/html/html.ts b/examples/src/universal/html/html.ts index 7ad33f61fd80..9040cf1467c7 100644 --- a/examples/src/universal/html/html.ts +++ b/examples/src/universal/html/html.ts @@ -35,7 +35,6 @@ export class ServerOnlyApp { <universal-styles></universal-styles> - <base [attr.href]="seo.baseUrl"> </head> <body> <app> @@ -44,7 +43,76 @@ export class ServerOnlyApp { <server-only-app> Loading... </server-only-app> - <script [attr.src]="seo.src"></script> + + <!-- Browser polyfills --> + <script src="/node_modules/zone.js/dist/zone.js"></script> + <script src="/node_modules/reflect-metadata/Reflect.js"></script> + <!-- SystemJS --> + <script src="/node_modules/systemjs/dist/system.js"></script> + <script type="text/javascript"> + System.config({ + baseURL: '/', + defaultJSExtensions: true, + map: { + 'angular2-universal': 'node_modules/angular2-universal', + '@angular': 'node_modules/@angular' + }, + packages: { + 'angular2-universal/polyfills': { + format: 'cjs', + main: 'dist/polyfills', + defaultExtension: 'js' + }, + 'angular2-universal': { + format: 'cjs', + main: 'dist/browser/index', + defaultExtension: 'js' + }, + '@angular/core': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/router-deprecated': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/platform-browser': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/platform-browser-dynamic': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/http': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/common': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + }, + '@angular/compiler': { + format: 'cjs', + main: 'index', + defaultExtension: 'js' + } + } + }); + System.import("/examples/src/universal/html/browser") + .then(function(module) { + return module.main(); + }) + .then(function() { + if ('preboot' in window) { preboot.complete(); } + }); + </script> </body> ` }) @@ -56,8 +124,7 @@ export class ServerOnlyApp { ]) export class Html { seo = { - baseUrl: '/', - src: '/dist/client/bundle.js', + src: '/examples/src/universal/html/browser.js', title: 'Angular 2 Universal Starter - this component replaces the title element' };
2deea8659570153a23c0bdc6c3cd0f82956476c9
2017-04-25 20:04:56
Mark Pieszak
feat(ng-aspnetcore-engine): adding initial new engine (#682)
false
adding initial new engine (#682)
feat
diff --git a/modules/aspnetcore-engine/README.md b/modules/aspnetcore-engine/README.md new file mode 100644 index 000000000000..e3e57c9eb67c --- /dev/null +++ b/modules/aspnetcore-engine/README.md @@ -0,0 +1,342 @@ +# Angular & ASP.NET Core Engine + +This is an ASP.NET Core Engine for running Angular Apps on the server for server side rendering. + +--- + +## Example Application utilizing this Engine + +#### [Asp.net Core & Angular advanced starter application](https://github.com/MarkPieszak/aspnetcore-angular2-universal) + +# Usage + +> Things have changed since the previous ASP.NET Core & Angular Universal useage. We're no longer using TagHelpers, but now invoking the **boot-server** file from the **Home Controller** *itself*, and passing all the data down to .NET. + +Within our boot-server file, things haven't changed much, you still have your `createServerRenderer()` function that's being exported (this is what's called within the Node process) which is expecting a `Promise` to be returned. + +Within that promise we simply call the ngAspnetCoreEngine itself, passing in our providers Array (here we give it the current `url` from the Server, and also our Root application, which in our case is just `<app></app>`). + + +```ts +// Polyfills +import 'es6-promise'; +import 'es6-shim'; +import 'reflect-metadata'; +import 'zone.js'; + +import { enableProdMode } from '@angular/core'; +import { INITIAL_CONFIG } from '@angular/platform-server'; +import { createServerRenderer, RenderResult } from 'aspnet-prerendering'; +// Grab the (Node) server-specific NgModule +import { AppServerModule } from './app/app.server.module'; +// ***** The ASPNETCore Angular Engine ***** +import { ngAspnetCoreEngine } from '@universal/ng-aspnetcore-engine'; + +enableProdMode(); // for faster server rendered builds + +export default createServerRenderer(params => { + + /* + * How can we access data we passed from .NET ? + * you'd access it directly from `params.data` under the name you passed it + * ie: params.data.WHATEVER_YOU_PASSED + * ------- + * We'll show in the next section WHERE you pass this Data in on the .NET side + */ + + // Platform-server provider configuration + const setupOptions: IEngineOptions = { + appSelector: '<app></app>', + ngModule: ServerAppModule, + request: params, + providers: [ + /* Other providers you want to pass into the App would go here + * { provide: CookieService, useClass: ServerCookieService } + + * ie: Just an example of Dependency injecting a Class for providing Cookies (that you passed down from the server) + (Where on the browser you'd have a different class handling cookies normally) + */ + ] + }; + + // ***** Pass in those Providers & your Server NgModule, and that's it! + return ngAspnetCoreEngine(setupOptions).then(response => { + + // Want to transfer data from Server -> Client? + + // Add transferData to the response.globals Object, and call createTransferScript({}) passing in the Object key/values of data + // createTransferScript() will JSON Stringify it and return it as a <script> window.TRANSFER_CACHE={}</script> + // That your browser can pluck and grab the data from + response.globals.transferData = createTransferScript({ + someData: 'Transfer this to the client on the window.TRANSFER_CACHE {} object', + fromDotnet: params.data.thisCameFromDotNET // example of data coming from dotnet, in HomeController + }); + + return ({ + html: response.html, + globals: response.globals + }); + + }); +}); + +``` + +# What about on the .NET side? + +Previously, this was all done with TagHelpers and you passed in your boot-server file to it: `<app asp-prerender-module="dist/boot-server.js"></app>`, but this hindered us from getting the SEO benefits of prerendering. + +Because .NET has control over the Html, using the ngAspnetCoreEngine, we're able to *pull out the important pieces*, and give them back to .NET to place them through out the View. + +Below is how you can invoke the boot-server file which gets everything started: + +> Hopefully in the future this will be cleaned up and less code as well. + +### HomeController.cs + +```csharp +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +using Microsoft.AspNetCore.SpaServices.Prerendering; +using Microsoft.AspNetCore.NodeServices; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features; + +namespace WebApplicationBasic.Controllers +{ + public class HomeController : Controller + { + public async Task<IActionResult> Index() + { + var nodeServices = Request.HttpContext.RequestServices.GetRequiredService<INodeServices>(); + var hostEnv = Request.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>(); + + var applicationBasePath = hostEnv.ContentRootPath; + var requestFeature = Request.HttpContext.Features.Get<IHttpRequestFeature>(); + var unencodedPathAndQuery = requestFeature.RawTarget; + var unencodedAbsoluteUrl = $"{Request.Scheme}://{Request.Host}{unencodedPathAndQuery}"; + + // ********************************* + // This parameter is where you'd pass in an Object of data you want passed down to Angular + // to be used in the Server-rendering + + // ** TransferData concept ** + // Here we can pass any Custom Data we want ! + + // By default we're passing down the REQUEST Object (Cookies, Headers, Host) from the Request object here + TransferData transferData = new TransferData(); + transferData.request = AbstractHttpContextRequestInfo(Request); // You can automatically grab things from the REQUEST object in Angular because of this + transferData.thisCameFromDotNET = "Hi Angular it's asp.net :)"; + // Add more customData here, add it to the TransferData class + + // Prerender / Serialize application (with Universal) + var prerenderResult = await Prerenderer.RenderToString( + "/", // baseURL + nodeServices, + new JavaScriptModuleExport(applicationBasePath + "/ClientApp/dist/main-server"), + unencodedAbsoluteUrl, + unencodedPathAndQuery, + // Our Transfer data here will be passed down to Angular (within the boot-server file) + // Available there via `params.data.yourData` + transferData, + 30000, // timeout duration + Request.PathBase.ToString() + ); + + // This is where everything is now spliced out, and given to .NET in pieces + ViewData["SpaHtml"] = prerenderResult.Html; + ViewData["Title"] = prerenderResult.Globals["title"]; + ViewData["Styles"] = prerenderResult.Globals["styles"]; + ViewData["Meta"] = prerenderResult.Globals["meta"]; + ViewData["Links"] = prerenderResult.Globals["links"]; + ViewData["TransferData"] = prerenderResult.Globals["transferData"]; // our transfer data set to window.TRANSFER_CACHE = {}; + + // Let's render that Home/Index view + return View(); + } + + private IRequest AbstractHttpContextRequestInfo(HttpRequest request) + { + + IRequest requestSimplified = new IRequest(); + requestSimplified.cookies = request.Cookies; + requestSimplified.headers = request.Headers; + requestSimplified.host = request.Host; + + return requestSimplified; + } + + } + + public class IRequest + { + public object cookies { get; set; } + public object headers { get; set; } + public object host { get; set; } + } + + public class TransferData + { + // By default we're expecting the REQUEST Object (in the aspnet engine), so leave this one here + public dynamic request { get; set; } + + // Your data here ? + public object thisCameFromDotNET { get; set; } + } +} +``` + +### Startup.cs : Make sure you add NodeServices to ConfigureServices: + +```csharp +public void ConfigureServices(IServiceCollection services) +{ + // ... other things ... + + services.AddNodeServices(); // <-- +} +``` + +# What updates do our Views need now? + +Now we have a whole assortment of SEO goodness we can spread around our .NET application. Not only do we have our serialized Application in a String... + +We also have `<title>`, `<meta>`, `<link>'s`, and our applications `<styles>` + +In our _layout.cshtml, we're going to want to pass in our different `ViewData` pieces and place these where they needed to be. + +> Notice `ViewData[]` sprinkled through out. These came from our Angular application, but it returned an entire HTML document, we want to build up our document ourselves so .NET handles it! + +```html +<!DOCTYPE html> +<html> + <head> + <base href="/" /> + <!-- Title will be the one you set in your Angular application --> + <title>@ViewData["Title"]</title> + + @Html.Raw(ViewData["Meta"]) <!-- <meta /> tags --> + @Html.Raw(ViewData["Links"]) <!-- <link /> tags --> + @Html.Raw(ViewData["Styles"]) <!-- <styles /> tags --> + + </head> + <body> + <!-- Our Home view will be rendered here --> + @RenderBody() + + <!-- Here we're passing down any data to be used by grabbed and parsed by Angular --> + @Html.Raw(ViewData["TransferData"]) + + @RenderSection("scripts", required: false) + </body> +</html> +``` + +--- + +# Your Home View - where the App gets displayed: + +You may have seen or used a TagHelper here in the past (that's where it used to invoke the Node process and everything), but now since we're doing everything +in the **Controller**, we only need to grab our `ViewData["SpaHtml"]` and inject it! + +This `SpaHtml` was set in our HomeController, and it's just a serialized string of your Angular application, but **only** the `<app>/* inside is all serialized */</app>` part, not the entire Html, since we split that up, and let .NET build out our Document. + +```html [email protected](ViewData["SpaHtml"]) <!-- magic --> + +<!-- here you probably have your webpack vendor & main files as well --> +<script src="~/dist/vendor.js" asp-append-version="true"></script> +@section scripts { + <script src="~/dist/main-client.js" asp-append-version="true"></script> +} +``` + +--- + +# What happens after the App gets server rendered? + +Well now, your Client-side Angular will take over, and you'll have a fully functioning SPA. (With all these great SEO benefits of being server-rendered) ! + +:sparkles: + +--- + +## Bootstrap + +The engine also calls the ngOnBootstrap lifecycle hook of the module being bootstrapped, this is how the TransferData gets taken. +Check [https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/master/Client/modules](https://github.com/MarkPieszak/aspnetcore-angular2-universal/tree/master/Client/modules) to see how to setup your Transfer classes. + +```ts +@NgModule({ + bootstrap: [AppComponent] +}) +export class ServerAppModule { + // Make sure to define this an arrow function to keep the lexical scope + ngOnBootstrap = () => { + console.log('bootstrapped'); + } +} +``` + +# Tokens + +Along with the engine doing serializing and separating out the chunks of your Application (so we can let .NET handle it), you may have noticed we passed in the HttpRequest object from .NET into it as well. + +This was done so that we could take a few things from it, and using dependency injection, "provide" a few things to the Angular application. + +```typescript +ORIGIN_URL +// and +REQUEST + +// imported +import { ORIGIN_URL, REQUEST } from '@ng-universal/ng-aspnetcore-engine'; +``` + +Make sure in your BrowserModule you provide these tokens as well, if you're going to use them! + +```typescript +@NgModule({ + ..., + providers: [ + { + // We need this for our Http calls since they'll be using an ORIGIN_URL provided in main.server + // (Also remember the Server requires Absolute URLs) + provide: ORIGIN_URL, + useFactory: (getOriginUrl) + }, { + // The server provides these in main.server + provide: REQUEST, + useFactory: (getRequest) + } + ] +} export class BrowserAppModule() {} +``` + +Don't forget that the server needs Absolute URLs for paths when doing Http requests! So if your server api is at the same location as this Angular app, you can't just do `http.get('/api/whatever')` so use the ORIGIN_URL Injection Token. + +```typescript + import { ORIGIN_URL } from '@ng-universal/ng-aspnetcore-engine'; + + constructor(@Inject(ORIGIN_URL) private originUrl: string, private http: Http) { + this.http.get(`${this.originUrl}/api/whatever`) + } +``` + +As for the REQUEST object, you'll find Cookies, Headers, and Host (from .NET that we passed down in our HomeController. They'll all be accessible from that Injection Token as well. + +```typescript + import { REQUEST } from '@ng-universal/ng-aspnetcore-engine'; + + constructor(@Inject(REQUEST) private request) { + // this.request.cookies + // this.request.headers + // etc + } + +``` + + + diff --git a/modules/aspnetcore-engine/index.ts b/modules/aspnetcore-engine/index.ts new file mode 100644 index 000000000000..0a23d586a9b0 --- /dev/null +++ b/modules/aspnetcore-engine/index.ts @@ -0,0 +1,8 @@ + +export { ngAspnetCoreEngine } from './src/main'; +export { createTransferScript } from './src/create-transfer-script'; + +export { REQUEST, ORIGIN_URL } from './src/tokens'; + +export { IEngineOptions } from './src/interfaces/engine-options'; +export { IRequestParams } from './src/interfaces/request-params'; diff --git a/modules/aspnetcore-engine/package.json b/modules/aspnetcore-engine/package.json new file mode 100644 index 000000000000..cf3df18afb42 --- /dev/null +++ b/modules/aspnetcore-engine/package.json @@ -0,0 +1,54 @@ +{ + "name": "@universal/ng-aspnetcore-engine", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "version": "1.0.0-beta.0", + "description": "ASP.NET Core Engine for running Server Angular Apps", + "homepage": "https://github.com/angular/universal", + "license": "MIT", + "author": { + "name": "MarkPieszak", + "email": "[email protected]", + "url": "github.com/markpieszak" + }, + "contributors": [ + "MarkPieszak" + ], + "repository": { + "type": "git", + "url": "https://github.com/angular/universal" + }, + "bugs": { + "url": "https://github.com/angular/universal/issues" + }, + "config": { + "engine-strict": true + }, + "engines": { + "node": ">= 5.4.1 <= 7", + "npm": ">= 3" + }, + "scripts": { + "build": "tsc", + "prebuild": "rimraf dist" + }, + "peerDependencies": { + "@angular/core": "^4.0.0", + "@angular/platform-server": "^4.0.0" + }, + "devDependencies": { + "@angular/common": "^4.0.0", + "@angular/compiler": "^4.0.0", + "@angular/core": "^4.0.0", + "@angular/http": "^4.0.0", + "@angular/platform-browser": "^4.0.0", + "@angular/platform-server": "^4.0.0", + "rimraf": "^2.6.1", + "rxjs": "^5.2.0", + "typescript": "^2.2.1", + "zone.js": "^0.8.4" + }, + "dependencies": { + "@types/node": "^7.0.13" + } +} diff --git a/modules/aspnetcore-engine/src/create-transfer-script.ts b/modules/aspnetcore-engine/src/create-transfer-script.ts new file mode 100644 index 000000000000..15b299d07f27 --- /dev/null +++ b/modules/aspnetcore-engine/src/create-transfer-script.ts @@ -0,0 +1,3 @@ +export function createTransferScript(transferData: Object): string { + return `<script>window['TRANSFER_CACHE'] = ${JSON.stringify(transferData)};</script>`; +} \ No newline at end of file diff --git a/modules/aspnetcore-engine/src/file-loader.ts b/modules/aspnetcore-engine/src/file-loader.ts new file mode 100644 index 000000000000..430fc9174e97 --- /dev/null +++ b/modules/aspnetcore-engine/src/file-loader.ts @@ -0,0 +1,17 @@ +import * as fs from 'fs'; +import { ResourceLoader } from '@angular/compiler'; + +export class FileLoader implements ResourceLoader { + get(url: string): Promise<string> { + return new Promise((resolve, reject) => { + // install node types + fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => { + if (err) { + return reject(err); + } + + resolve(buffer.toString()); + }); + }); + } +} diff --git a/modules/aspnetcore-engine/src/interfaces/engine-options.ts b/modules/aspnetcore-engine/src/interfaces/engine-options.ts new file mode 100644 index 000000000000..8b9bd735585a --- /dev/null +++ b/modules/aspnetcore-engine/src/interfaces/engine-options.ts @@ -0,0 +1,9 @@ +import { IRequestParams } from "./request-params"; +import { Type, NgModuleFactory, Provider } from '@angular/core'; + +export interface IEngineOptions { + appSelector: string; + request: IRequestParams; + ngModule: Type<{}> | NgModuleFactory<{}>; + providers?: Provider[]; +}; diff --git a/modules/aspnetcore-engine/src/interfaces/request-params.ts b/modules/aspnetcore-engine/src/interfaces/request-params.ts new file mode 100644 index 000000000000..2d989eca0644 --- /dev/null +++ b/modules/aspnetcore-engine/src/interfaces/request-params.ts @@ -0,0 +1,9 @@ +export interface IRequestParams { + location: any; // e.g., Location object containing information '/some/path' + origin: string; // e.g., 'https://example.com:1234' + url: string; // e.g., '/some/path' + baseUrl: string; // e.g., '' or '/myVirtualDir' + absoluteUrl: string; // e.g., 'https://example.com:1234/some/path' + domainTasks: Promise<any>; + data: any; // any custom object passed through from .NET +} \ No newline at end of file diff --git a/modules/aspnetcore-engine/src/main.ts b/modules/aspnetcore-engine/src/main.ts new file mode 100644 index 000000000000..0c1afbd603d9 --- /dev/null +++ b/modules/aspnetcore-engine/src/main.ts @@ -0,0 +1,203 @@ +import { Type, NgModuleFactory, NgModuleRef, ApplicationRef, CompilerFactory, Compiler } from '@angular/core'; +import { platformServer, platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server'; +import { ResourceLoader } from '@angular/compiler'; + +import { REQUEST, ORIGIN_URL } from './tokens'; +import { FileLoader } from './file-loader'; + +import { IEngineOptions } from './interfaces/engine-options'; + +import 'rxjs/add/operator/filter'; +import 'rxjs/add/operator/first'; + +export function ngAspnetCoreEngine( + options: IEngineOptions +): Promise<{ html: string, globals: { styles: string, title: string, meta: string, transferData?: {}, [key: string]: any } }> { + + options.providers = options.providers || []; + + const compilerFactory: CompilerFactory = platformDynamicServer().injector.get(CompilerFactory); + const compiler: Compiler = compilerFactory.createCompiler([ + { + providers: [ + { provide: ResourceLoader, useClass: FileLoader } + ] + } + ]); + + return new Promise((resolve, reject) => { + + try { + const moduleOrFactory = options.ngModule; + if (!moduleOrFactory) { + throw new Error('You must pass in a NgModule or NgModuleFactory to be bootstrapped'); + } + + const extraProviders = options.providers.concat( + options.providers, + [ + { + provide: INITIAL_CONFIG, + useValue: { + document: options.appSelector, + url: options.request.url + } + }, + { + provide: ORIGIN_URL, + useValue: options.request.origin + }, { + provide: REQUEST, + useValue: options.request.data.request + } + ] + ); + + const platform = platformServer(extraProviders); + + getFactory(moduleOrFactory, compiler) + .then((factory: NgModuleFactory<{}>) => { + + return platform.bootstrapModuleFactory(factory).then((moduleRef: NgModuleRef<{}>) => { + + const state: PlatformState = moduleRef.injector.get(PlatformState); + const appRef: ApplicationRef = moduleRef.injector.get(ApplicationRef); + + appRef.isStable + .filter((isStable: boolean) => isStable) + .first() + .subscribe(() => { + + // Fire the TransferState Cache + const bootstrap = moduleRef.instance['ngOnBootstrap']; + bootstrap && bootstrap(); + + // The parse5 Document itself + const AST_DOCUMENT = state.getDocument(); + + // Strip out the Angular application + const htmlDoc = state.renderToString(); + + const APP_HTML = htmlDoc.substring( + htmlDoc.indexOf('<body>') + 6, + htmlDoc.indexOf('</body>') + ); + + // Strip out Styles / Meta-tags / Title + // const STYLES = []; + const META = []; + const LINKS = []; + let TITLE = ''; + + let STYLES_STRING = htmlDoc.substring( + htmlDoc.indexOf('<style ng-transition'), + htmlDoc.lastIndexOf('</style>') + 8 + ); + // STYLES_STRING = STYLES_STRING.replace(/\s/g, '').replace('<styleng-transition', '<style ng-transition'); + + const HEAD = AST_DOCUMENT.head; + + let count = 0; + + for (let i = 0; i < HEAD.children.length; i++) { + let element = HEAD.children[i]; + + if (element.name === 'title') { + TITLE = element.children[0].data; + } + + // Broken after 4.0 (worked in rc) - needs investigation + // As other things could be in <style> so we ideally want to get them this way + + // if (element.name === 'style') { + // let styleTag = '<style '; + // for (let key in element.attribs) { + // if (key) { + // styleTag += `${key}="${element.attribs[key]}">`; + // } + // } + + // styleTag += `${element.children[0].data}</style>`; + // STYLES.push(styleTag); + // } + + if (element.name === 'meta') { + count = count + 1; + let metaString = '<meta'; + for (let key in element.attribs) { + if (key) { + metaString += ` ${key}="${element.attribs[key]}"`; + } + } + META.push(`${metaString} />\n`); + } + + if (element.name === 'link') { + let linkString = '<link'; + for (let key in element.attribs) { + if (key) { + linkString += ` ${key}="${element.attribs[key]}"`; + } + } + LINKS.push(`${linkString} />\n`); + } + } + + // Return parsed App + resolve({ + html: APP_HTML, + globals: { + styles: STYLES_STRING, + title: TITLE, + meta: META.join(' '), + links: LINKS.join(' ') + } + }); + + moduleRef.destroy(); + + }, (err) => { + reject(err); + }); + + }); + }); + + } catch (ex) { + reject(ex); + } + + }); +} + +/* ********************** Private / Internal ****************** */ + +const factoryCacheMap = new Map<Type<{}>, NgModuleFactory<{}>>(); +function getFactory( + moduleOrFactory: Type<{}> | NgModuleFactory<{}>, compiler: Compiler +): Promise<NgModuleFactory<{}>> { + return new Promise<NgModuleFactory<{}>>((resolve, reject) => { + // If module has been compiled AoT + if (moduleOrFactory instanceof NgModuleFactory) { + resolve(moduleOrFactory); + return; + } else { + let moduleFactory = factoryCacheMap.get(moduleOrFactory); + + // If module factory is cached + if (moduleFactory) { + resolve(moduleFactory); + return; + } + + // Compile the module and cache it + compiler.compileModuleAsync(moduleOrFactory) + .then((factory) => { + factoryCacheMap.set(moduleOrFactory, factory); + resolve(factory); + }, (err => { + reject(err); + })); + } + }); +} diff --git a/modules/aspnetcore-engine/src/tokens.ts b/modules/aspnetcore-engine/src/tokens.ts new file mode 100644 index 000000000000..701e7670b3b4 --- /dev/null +++ b/modules/aspnetcore-engine/src/tokens.ts @@ -0,0 +1,4 @@ +import { InjectionToken } from '@angular/core'; + +export const REQUEST = new InjectionToken<string>('REQUEST'); +export const ORIGIN_URL = new InjectionToken<string>('ORIGIN_URL'); diff --git a/modules/aspnetcore-engine/tsconfig.json b/modules/aspnetcore-engine/tsconfig.json new file mode 100644 index 000000000000..1b8e7f387374 --- /dev/null +++ b/modules/aspnetcore-engine/tsconfig.json @@ -0,0 +1,36 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "es2015", + "moduleResolution": "node", + "declaration": true, + "noImplicitAny": false, + "noUnusedLocals": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "noUnusedParameters": true, + "removeComments": false, + "baseUrl": ".", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "sourceMap": true, + "inlineSources": true, + "rootDir": ".", + "outDir": "dist", + "lib": [ + "dom", + "es6" + ], + "types": [ + "node" + ] + }, + "files": [ + "index.ts" + ], + "compileOnSave": false, + "buildOnSave": false, + "atom": { + "rewriteTsconfig": false + } +} \ No newline at end of file
00f21d3a12bd2669c96f3a255df2f60d712820c9
2017-02-23 21:16:12
Filipe Silva
refactor: removed unused lint comment (#4950)
false
removed unused lint comment (#4950)
refactor
diff --git a/packages/@angular/cli/blueprints/ng/files/protractor.conf.js b/packages/@angular/cli/blueprints/ng/files/protractor.conf.js index 2cbc3293913f..1c5e1e5a44ea 100644 --- a/packages/@angular/cli/blueprints/ng/files/protractor.conf.js +++ b/packages/@angular/cli/blueprints/ng/files/protractor.conf.js @@ -1,7 +1,6 @@ // Protractor configuration file, see link for more information // https://github.com/angular/protractor/blob/master/lib/config.ts -/*global jasmine */ const { SpecReporter } = require('jasmine-spec-reporter'); exports.config = {
4b58204b3b8b8d3d04fc57ac237cbf07d9a68d21
2017-08-17 19:24:58
Charles Lyding
refactor(@angular/cli): remove unneeded ember-cli blueprint files
false
remove unneeded ember-cli blueprint files
refactor
diff --git a/package.json b/package.json index 70fb5551b256..1e61cf63d77f 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,6 @@ "css-loader": "^0.28.1", "cssnano": "^3.10.0", "denodeify": "^1.2.1", - "diff": "^3.1.0", - "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.0.0", "enhanced-resolve": "^3.4.1", "exports-loader": "^0.6.3", @@ -64,9 +62,7 @@ "heimdalljs": "^0.2.4", "heimdalljs-logger": "^0.1.9", "html-webpack-plugin": "^2.29.0", - "inflection": "^1.7.0", "inquirer": "^3.0.0", - "isbinaryfile": "^3.0.0", "istanbul-instrumenter-loader": "^2.0.0", "karma-source-map-support": "^1.2.0", "less": "^2.7.2", @@ -76,7 +72,6 @@ "lodash": "^4.11.1", "magic-string": "^0.22.3", "memory-fs": "^0.4.1", - "minimatch": "^3.0.3", "node-modules-path": "^1.0.0", "nopt": "^4.0.1", "opn": "~5.1.0", @@ -97,10 +92,8 @@ "style-loader": "^0.13.1", "stylus": "^0.54.5", "stylus-loader": "^3.0.1", - "temp": "0.8.3", "typescript": "~2.4.2", "url-loader": "^0.5.7", - "walk-sync": "^0.3.1", "webpack": "~3.4.1", "webpack-dev-middleware": "^1.11.0", "webpack-dev-server": "~2.5.1", @@ -141,10 +134,12 @@ "rewire": "^2.5.1", "spdx-satisfies": "^0.1.3", "tar": "^3.1.5", + "temp": "0.8.3", "through": "^2.3.6", "tree-kill": "^1.0.0", "ts-node": "^3.2.0", - "tslint": "^5.1.0" + "tslint": "^5.1.0", + "walk-sync": "^0.3.1" }, "optionalDependencies": { "node-sass": "^4.3.0" diff --git a/packages/@angular/cli/blueprints/class/files/__path__/__name__.spec.ts b/packages/@angular/cli/blueprints/class/files/__path__/__name__.spec.ts deleted file mode 100644 index 86dd09076edd..000000000000 --- a/packages/@angular/cli/blueprints/class/files/__path__/__name__.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {<%= classifiedModuleName %>} from './<%= fileName %>'; - -describe('<%= classifiedModuleName %>', () => { - it('should create an instance', () => { - expect(new <%= classifiedModuleName %>()).toBeTruthy(); - }); -}); diff --git a/packages/@angular/cli/blueprints/class/files/__path__/__name__.ts b/packages/@angular/cli/blueprints/class/files/__path__/__name__.ts deleted file mode 100644 index 54c3f4c0b4cb..000000000000 --- a/packages/@angular/cli/blueprints/class/files/__path__/__name__.ts +++ /dev/null @@ -1,2 +0,0 @@ -export class <%= classifiedModuleName %> { -} diff --git a/packages/@angular/cli/blueprints/class/index.ts b/packages/@angular/cli/blueprints/class/index.ts deleted file mode 100644 index 1b65e1104ed4..000000000000 --- a/packages/@angular/cli/blueprints/class/index.ts +++ /dev/null @@ -1,86 +0,0 @@ -import {getAppFromConfig} from '../../utilities/app-utils'; -import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser'; -import {CliConfig} from '../../models/config'; - -const stringUtils = require('ember-cli-string-utils'); -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'class', - description: '', - aliases: ['cl'], - - availableOptions: [ - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName: entityName.split('.')[0], - appConfig, - dryRun: this.options.dryRun - }; - - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - const rawName = options.args[1] as string; - const nameParts = rawName.split('.') - .filter(part => part.length !== 0); - - const classType = nameParts[1]; - this.fileName = stringUtils.dasherize(options.entity.name); - if (classType) { - this.fileName += '.' + classType.toLowerCase(); - } - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.class.spec'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat, - fileName: this.fileName - }; - }, - - files: function() { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function () { - // Return custom template variables here. - return { - __path__: () => { - this.generatePath = this.dynamicPath.dir; - return this.generatePath; - }, - __name__: () => { - return this.fileName; - } - }; - } -}); diff --git a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.__styleext__ b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.__styleext__ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.html b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.html deleted file mode 100644 index 200001f88129..000000000000 --- a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.html +++ /dev/null @@ -1,3 +0,0 @@ -<p> - <%= dasherizedModuleName %> works! -</p> diff --git a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.spec.ts b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.spec.ts deleted file mode 100644 index fbbacebd8d03..000000000000 --- a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component'; - -describe('<%= classifiedModuleName %>Component', () => { - let component: <%= classifiedModuleName %>Component; - let fixture: ComponentFixture<<%= classifiedModuleName %>Component>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ <%= classifiedModuleName %>Component ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(<%= classifiedModuleName %>Component); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.ts b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.ts deleted file mode 100644 index 2b23a2899848..000000000000 --- a/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit<% if(viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection) { %>, ChangeDetectionStrategy<% }%> } from '@angular/core'; - -@Component({ - selector: '<%= selector %>',<% if(inlineTemplate) { %> - template: ` - <p> - <%= dasherizedModuleName %> Works! - </p> - `,<% } else { %> - templateUrl: './<%= dasherizedModuleName %>.component.html',<% } if(inlineStyle) { %> - styles: []<% } else { %> - styleUrls: ['./<%= dasherizedModuleName %>.component.<%= styleExt %>']<% } %><% if(viewEncapsulation) { %>, - encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection) { %>, - changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> -}) -export class <%= classifiedModuleName %>Component implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/packages/@angular/cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts deleted file mode 100644 index e618d41470bc..000000000000 --- a/packages/@angular/cli/blueprints/component/index.ts +++ /dev/null @@ -1,291 +0,0 @@ -import * as chalk from 'chalk'; -import * as fs from 'fs'; -import * as path from 'path'; -import { oneLine } from 'common-tags'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; - -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const findParentModule = require('../../utilities/find-parent-module').default; -const getFiles = Blueprint.prototype.files; -const stringUtils = require('ember-cli-string-utils'); -const astUtils = require('../../utilities/ast-utils'); - -const viewEncapsulationMap: any = { - 'emulated': 'Emulated', - 'native': 'Native', - 'none': 'None' -}; - -const changeDetectionMap: any = { - 'default': 'Default', - 'onpush': 'OnPush' -}; - -function correctCase(options: any) { - if (options.viewEncapsulation) { - options.viewEncapsulation = viewEncapsulationMap[options.viewEncapsulation.toLowerCase()]; - } - - if (options.changeDetection) { - options.changeDetection = changeDetectionMap[options.changeDetection.toLowerCase()]; - } -} - -export default Blueprint.extend({ - name: 'component', - description: '', - aliases: ['c'], - - availableOptions: [ - { - name: 'flat', - type: Boolean, - description: 'Flag to indicate if a dir is created.' - }, - { - name: 'inline-template', - type: Boolean, - aliases: ['it'], - description: 'Specifies if the template will be in the ts file.' - }, - { - name: 'inline-style', - type: Boolean, - aliases: ['is'], - description: 'Specifies if the style will be in the ts file.' - }, - { - name: 'prefix', - type: String, - default: null, - description: 'Specifies whether to use the prefix.' - }, - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'view-encapsulation', - type: String, - aliases: ['ve'], - description: 'Specifies the view encapsulation strategy.' - }, - { - name: 'change-detection', - type: String, - aliases: ['cd'], - description: 'Specifies the change detection strategy.' - }, - { - name: 'skip-import', - type: Boolean, - default: false, - description: 'Allows for skipping the module import.' - }, - { - name: 'module', - type: String, - aliases: ['m'], - description: 'Allows specification of the declaring module.' - }, - { - name: 'export', - type: Boolean, - default: false, - description: 'Specifies if declaring module exports the component.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - beforeInstall: function (options: any) { - const appConfig = getAppFromConfig(this.options.app); - if (options.module) { - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } else { - try { - this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath); - } catch (e) { - if (!options.skipImport) { - throw `Error locating module for declaration\n\t${e}`; - } - } - } - }, - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - - const defaultPrefix = (appConfig && appConfig.prefix) || ''; - - let prefix = (this.options.prefix === 'false' || this.options.prefix === '') - ? '' : (this.options.prefix || defaultPrefix); - prefix = prefix && `${prefix}-`; - - this.selector = stringUtils.dasherize(prefix + parsedPath.name); - - if (this.selector.indexOf('-') === -1) { - this._writeStatusToUI(chalk.yellow, 'WARNING', 'selectors should contain a dash'); - } - - return parsedPath.name; - }, - - locals: function (options: any) { - this.styleExt = CliConfig.getValue('defaults.styleExt') || 'css'; - - options.inlineStyle = options.inlineStyle !== undefined ? - options.inlineStyle : CliConfig.getValue('defaults.component.inlineStyle'); - - options.inlineTemplate = options.inlineTemplate !== undefined ? - options.inlineTemplate : CliConfig.getValue('defaults.component.inlineTemplate'); - - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.component.flat'); - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.component.spec'); - - options.viewEncapsulation = options.viewEncapsulation !== undefined ? - options.viewEncapsulation : CliConfig.getValue('defaults.component.viewEncapsulation'); - - options.changeDetection = options.changeDetection !== undefined ? - options.changeDetection : CliConfig.getValue('defaults.component.changeDetection'); - - correctCase(options); - - return { - dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''), - flat: options.flat, - spec: options.spec, - inlineTemplate: options.inlineTemplate, - inlineStyle: options.inlineStyle, - route: options.route, - isAppComponent: !!options.isAppComponent, - selector: this.selector, - styleExt: this.styleExt, - viewEncapsulation: options.viewEncapsulation, - changeDetection: options.changeDetection - }; - }, - - files: function () { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && this.options.inlineTemplate) { - fileList = fileList.filter(p => p.indexOf('.html') < 0); - } - if (this.options && this.options.inlineStyle) { - fileList = fileList.filter(p => p.indexOf('.__styleext__') < 0); - } - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.component.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - const appConfig = getAppFromConfig(this.options.app); - - // Return custom template variables here. - return { - __path__: () => { - let dir = this.dynamicPath.dir; - if (!options.locals.flat) { - dir += path.sep + options.dasherizedModuleName; - } - const srcDir = appConfig.root; - this.appDir = dir.substr(dir.indexOf(srcDir) + srcDir.length); - this.generatePath = dir; - return dir; - }, - __styleext__: () => { - return this.styleExt; - } - }; - }, - - afterInstall: function (options: any) { - const appConfig = getAppFromConfig(this.options.app); - if (options.prefix && appConfig.prefix && appConfig.prefix !== options.prefix) { - this._writeStatusToUI(chalk.yellow, 'WARNING', oneLine` - You are using a different prefix than the app ['${appConfig.prefix}'] - and may receive lint failures. - Please verify/update 'tslint.json' accordingly. - `); - } - - const returns: Array<any> = []; - const className = stringUtils.classify(`${options.entity.name}Component`); - const fileName = stringUtils.dasherize(`${options.entity.name}.component`); - const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath); - const normalizeRelativeDir = componentDir.startsWith('.') ? componentDir : `./${componentDir}`; - const importPath = componentDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`; - - if (!options.skipImport) { - if (options.dryRun) { - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - return; - } - - let preChange: any; - try { - preChange = fs.readFileSync(this.pathToModule, 'utf8'); - } catch (err) { - if (err.code === 'EISDIR') { - throw 'Module specified should be a file, not a directory'; - } else { - throw err; - } - } - - returns.push( - astUtils.addDeclarationToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)) - .then((result: any) => { - if (options.export) { - return astUtils.addExportToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)); - } - return result; - }) - .then(() => { - const postChange = fs.readFileSync(this.pathToModule, 'utf8'); - let moduleStatus = 'update'; - - if (postChange === preChange) { - moduleStatus = 'identical'; - } - - this._writeStatusToUI(chalk.yellow, - moduleStatus, - path.relative(this.project.root, this.pathToModule)); - this.addModifiedFile(this.pathToModule); - })); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.spec.ts b/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.spec.ts deleted file mode 100644 index c1b936ba8e9b..000000000000 --- a/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { <%= classifiedModuleName %>Directive } from './<%= dasherizedModuleName %>.directive'; - -describe('<%= classifiedModuleName %>Directive', () => { - it('should create an instance', () => { - const directive = new <%= classifiedModuleName %>Directive(); - expect(directive).toBeTruthy(); - }); -}); diff --git a/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.ts b/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.ts deleted file mode 100644 index ee8bd3254f68..000000000000 --- a/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Directive } from '@angular/core'; - -@Directive({ - selector: '[<%= selector %>]' -}) -export class <%= classifiedModuleName %>Directive { - - constructor() { } - -} diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts deleted file mode 100644 index d5c9bf0f0b79..000000000000 --- a/packages/@angular/cli/blueprints/directive/index.ts +++ /dev/null @@ -1,181 +0,0 @@ -import * as chalk from 'chalk'; -import * as path from 'path'; -import { oneLine } from 'common-tags'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; - -const stringUtils = require('ember-cli-string-utils'); -const astUtils = require('../../utilities/ast-utils'); -const findParentModule = require('../../utilities/find-parent-module').default; -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'directive', - description: '', - aliases: ['d'], - - availableOptions: [ - { - name: 'flat', - type: Boolean, - description: 'Flag to indicate if a dir is created.' - }, - { - name: 'prefix', - type: String, - default: null, - description: 'Specifies whether to use the prefix.' - }, - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'skip-import', - type: Boolean, - default: false, - description: 'Allows for skipping the module import.' - }, - { - name: 'module', - type: String, aliases: ['m'], - description: 'Allows specification of the declaring module.' - }, - { - name: 'export', - type: Boolean, - default: false, - description: 'Specifies if declaring module exports the component.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - beforeInstall: function (options: any) { - const appConfig = getAppFromConfig(this.options.app); - if (options.module) { - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } else { - try { - this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath); - } catch (e) { - if (!options.skipImport) { - throw `Error locating module for declaration\n\t${e}`; - } - } - } - }, - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - - const defaultPrefix = (appConfig && appConfig.prefix) || ''; - - let prefix = (this.options.prefix === 'false' || this.options.prefix === '') - ? '' : (this.options.prefix || defaultPrefix); - prefix = prefix && `${prefix}-`; - - - this.selector = stringUtils.camelize(prefix + parsedPath.name); - return parsedPath.name; - }, - - locals: function (options: any) { - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.directive.spec'); - - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.directive.flat'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat, - selector: this.selector - }; - }, - - files: function () { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.directive.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - return { - __path__: () => { - let dir = this.dynamicPath.dir; - if (!options.locals.flat) { - dir += path.sep + options.dasherizedModuleName; - } - this.generatePath = dir; - return dir; - } - }; - }, - - afterInstall: function (options: any) { - const appConfig = getAppFromConfig(this.options.app); - if (options.prefix && appConfig.prefix && appConfig.prefix !== options.prefix) { - console.log(chalk.yellow(oneLine`You are using different prefix from app, - you might get lint errors. Please update "tslint.json" accordingly.`)); - } - - const returns: Array<any> = []; - const className = stringUtils.classify(`${options.entity.name}Directive`); - const fileName = stringUtils.dasherize(`${options.entity.name}.directive`); - const fullGeneratePath = path.join(this.project.root, this.generatePath); - const moduleDir = path.parse(this.pathToModule).dir; - const relativeDir = path.relative(moduleDir, fullGeneratePath); - const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`; - const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`; - - if (!options.skipImport) { - if (options.dryRun) { - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - return; - } - returns.push( - astUtils.addDeclarationToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)) - .then((result: any) => { - if (options.export) { - return astUtils.addExportToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)); - } - return result; - })); - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - this.addModifiedFile(this.pathToModule); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/blueprints/enum/files/__path__/__name__.enum.ts b/packages/@angular/cli/blueprints/enum/files/__path__/__name__.enum.ts deleted file mode 100644 index 18ef0183ef09..000000000000 --- a/packages/@angular/cli/blueprints/enum/files/__path__/__name__.enum.ts +++ /dev/null @@ -1,2 +0,0 @@ -export enum <%= classifiedModuleName %> { -} diff --git a/packages/@angular/cli/blueprints/enum/index.ts b/packages/@angular/cli/blueprints/enum/index.ts deleted file mode 100644 index 9d5ed0d4bce6..000000000000 --- a/packages/@angular/cli/blueprints/enum/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -import {getAppFromConfig} from '../../utilities/app-utils'; -import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser'; - -const stringUtils = require('ember-cli-string-utils'); -const Blueprint = require('../../ember-cli/lib/models/blueprint'); - -export default Blueprint.extend({ - name: 'enum', - description: '', - aliases: ['e'], - - availableOptions: [ - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - this.fileName = stringUtils.dasherize(options.entity.name); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat, - fileName: this.fileName - }; - }, - - fileMapTokens: function () { - // Return custom template variables here. - return { - __path__: () => { - this.generatePath = this.dynamicPath.dir; - return this.generatePath; - }, - __name__: () => { - return this.fileName; - } - }; - } -}); diff --git a/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.spec.ts b/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.spec.ts deleted file mode 100644 index fbf8ae80186e..000000000000 --- a/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, async, inject } from '@angular/core/testing'; - -import { <%= classifiedModuleName %>Guard } from './<%= dasherizedModuleName %>.guard'; - -describe('<%= classifiedModuleName %>Guard', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [<%= classifiedModuleName %>Guard] - }); - }); - - it('should ...', inject([<%= classifiedModuleName %>Guard], (guard: <%= classifiedModuleName %>Guard) => { - expect(guard).toBeTruthy(); - })); -}); diff --git a/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.ts b/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.ts deleted file mode 100644 index c2745d94d1bb..000000000000 --- a/packages/@angular/cli/blueprints/guard/files/__path__/__name__.guard.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; - -@Injectable() -export class <%= classifiedModuleName %>Guard implements CanActivate { - canActivate( - next: ActivatedRouteSnapshot, - state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean { - return true; - } -} diff --git a/packages/@angular/cli/blueprints/guard/index.ts b/packages/@angular/cli/blueprints/guard/index.ts deleted file mode 100644 index 40dbb695bdb9..000000000000 --- a/packages/@angular/cli/blueprints/guard/index.ts +++ /dev/null @@ -1,133 +0,0 @@ -import * as chalk from 'chalk'; -import * as path from 'path'; -import { oneLine } from 'common-tags'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; - -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const stringUtils = require('ember-cli-string-utils'); -const astUtils = require('../../utilities/ast-utils'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'guard', - description: '', - aliases: ['g'], - - availableOptions: [ - { - name: 'flat', - type: Boolean, - description: 'Indicate if a dir is created.' - }, - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'module', - type: String, - aliases: ['m'], - description: 'Specifies where the guard should be provided.' - } - ], - - beforeInstall: function (options: any) { - if (options.module) { - const appConfig = getAppFromConfig(this.options.app); - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } - }, - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.guard.flat'); - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.guard.spec'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat - }; - }, - - files: function () { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.guard.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - return { - __path__: () => { - let dir = this.dynamicPath.dir; - if (!options.locals.flat) { - dir += path.sep + options.dasherizedModuleName; - } - this.generatePath = dir; - return dir; - } - }; - }, - - afterInstall(options: any) { - const returns: Array<any> = []; - - if (!this.pathToModule) { - const warningMessage = oneLine` - Guard is generated but not provided, - it must be provided to be used - `; - this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage); - } else { - if (options.dryRun) { - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - return; - } - - const className = stringUtils.classify(`${options.entity.name}Guard`); - const fileName = stringUtils.dasherize(`${options.entity.name}.guard`); - const fullGeneratePath = path.join(this.project.root, this.generatePath); - const moduleDir = path.parse(this.pathToModule).dir; - const relativeDir = path.relative(moduleDir, fullGeneratePath); - const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`; - const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`; - returns.push( - astUtils.addProviderToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost))); - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - this.addModifiedFile(this.pathToModule); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/blueprints/interface/files/__path__/__name__.ts b/packages/@angular/cli/blueprints/interface/files/__path__/__name__.ts deleted file mode 100644 index a329d9e8dd0b..000000000000 --- a/packages/@angular/cli/blueprints/interface/files/__path__/__name__.ts +++ /dev/null @@ -1,2 +0,0 @@ -export interface <%= prefix %><%= classifiedModuleName %> { -} diff --git a/packages/@angular/cli/blueprints/interface/index.ts b/packages/@angular/cli/blueprints/interface/index.ts deleted file mode 100644 index dd84787a638f..000000000000 --- a/packages/@angular/cli/blueprints/interface/index.ts +++ /dev/null @@ -1,67 +0,0 @@ -import {CliConfig} from '../../models/config'; -import {getAppFromConfig} from '../../utilities/app-utils'; -import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser'; - -const stringUtils = require('ember-cli-string-utils'); -const Blueprint = require('../../ember-cli/lib/models/blueprint'); - -export default Blueprint.extend({ - name: 'interface', - description: '', - aliases: ['i'], - - anonymousOptions: [ - '<interface-type>' - ], - - availableOptions: [ - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - const interfaceType = options.args[2]; - this.fileName = stringUtils.dasherize(options.entity.name); - if (interfaceType) { - this.fileName += '.' + interfaceType; - } - const prefix = CliConfig.getValue('defaults.interface.prefix'); - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat, - fileName: this.fileName, - prefix: prefix - }; - }, - - fileMapTokens: function () { - // Return custom template variables here. - return { - __path__: () => { - this.generatePath = this.dynamicPath.dir; - return this.generatePath; - }, - __name__: () => { - return this.fileName; - } - }; - } -}); diff --git a/packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts deleted file mode 100644 index 9d822650edbb..000000000000 --- a/packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -const routes: Routes = []; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class <%= classifiedModuleName %>RoutingModule { } diff --git a/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.spec.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.spec.ts deleted file mode 100644 index df140e2a7b80..000000000000 --- a/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { <%= classifiedModuleName %>Module } from './<%= dasherizedModuleName %>.module'; - -describe('<%= classifiedModuleName %>Module', () => { - let <%= camelizedModuleName %>Module: <%= classifiedModuleName %>Module; - - beforeEach(() => { - <%= camelizedModuleName %>Module = new <%= classifiedModuleName %>Module(); - }); - - it('should create an instance', () => { - expect(<%= camelizedModuleName %>Module).toBeTruthy(); - }); -}); diff --git a/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.ts deleted file mode 100644 index 2fadb7236d50..000000000000 --- a/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common';<% if (routing) { %> - -import { <%= classifiedModuleName %>RoutingModule } from './<%= dasherizedModuleName %>-routing.module';<% } %> - -@NgModule({ - imports: [ - CommonModule<% if (routing) { %>, - <%= classifiedModuleName %>RoutingModule<% } %> - ], - declarations: [] -}) -export class <%= classifiedModuleName %>Module { } diff --git a/packages/@angular/cli/blueprints/module/index.ts b/packages/@angular/cli/blueprints/module/index.ts deleted file mode 100644 index 9b5d2d46cbd6..000000000000 --- a/packages/@angular/cli/blueprints/module/index.ts +++ /dev/null @@ -1,145 +0,0 @@ -import * as chalk from 'chalk'; -import * as path from 'path'; -import { oneLine } from 'common-tags'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; - -const stringUtils = require('ember-cli-string-utils'); -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const astUtils = require('../../utilities/ast-utils'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'module', - description: '', - aliases: ['m'], - - availableOptions: [ - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'flat', - type: Boolean, - description: 'Flag to indicate if a dir is created.' - }, - { - name: 'routing', - type: Boolean, - default: false, - description: 'Specifies if a routing module file should be generated.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - }, - { - name: 'module', - type: String, aliases: ['m'], - description: 'Specifies where the module should be imported.' - } - ], - - beforeInstall: function(options: any) { - if (options.module) { - const appConfig = getAppFromConfig(this.options.app); - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } - }, - - normalizeEntityName: function (entityName: string) { - this.entityName = entityName; - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.module.flat'); - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.module.spec'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat, - spec: options.spec, - routing: options.routing - }; - }, - - files: function () { - let fileList = getFiles.call(this) as Array<string>; - - if (!this.options || !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.module.spec.ts') < 0); - } - if (this.options && !this.options.routing) { - fileList = fileList.filter(p => p.indexOf('__name__-routing.module.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - this.dasherizedModuleName = options.dasherizedModuleName; - return { - __path__: () => { - this.generatePath = this.dynamicPath.dir; - if (!options.locals.flat) { - this.generatePath += path.sep + options.dasherizedModuleName; - } - return this.generatePath; - } - }; - }, - - afterInstall(options: any) { - const returns: Array<any> = []; - - if (!this.pathToModule) { - const warningMessage = oneLine` - Module is generated but not provided, - it must be provided to be used - `; - this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage); - } else { - let className = stringUtils.classify(`${options.entity.name}Module`); - let fileName = stringUtils.dasherize(`${options.entity.name}.module`); - if (options.routing) { - className = stringUtils.classify(`${options.entity.name}RoutingModule`); - fileName = stringUtils.dasherize(`${options.entity.name}-routing.module`); - } - const fullGeneratePath = path.join(this.project.root, this.generatePath); - const moduleDir = path.parse(this.pathToModule).dir; - const relativeDir = path.relative(moduleDir, fullGeneratePath); - const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`; - returns.push( - astUtils.addImportToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost))); - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/blueprints/ng/files/.editorconfig b/packages/@angular/cli/blueprints/ng/files/.editorconfig deleted file mode 100644 index 6e87a003da89..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# Editor configuration, see http://editorconfig.org -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -insert_final_newline = true -trim_trailing_whitespace = true - -[*.md] -max_line_length = off -trim_trailing_whitespace = false diff --git a/packages/@angular/cli/blueprints/ng/files/README.md b/packages/@angular/cli/blueprints/ng/files/README.md deleted file mode 100755 index 8284e1c45d56..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# <%= jsComponentName %> - -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version <%= version %>. - -## Development server - -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. - -## Code scaffolding - -Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. - -## Build - -Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. - -## Running unit tests - -Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Running end-to-end tests - -Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). -Before running the tests make sure you are serving the app via `ng serve`. - -## Further help - -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts deleted file mode 100644 index 5b7d25b9a403..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -const routes: Routes = [ - { - path: '', - children: [] - } -]; - -@NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] -}) -export class AppRoutingModule { } diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.__styleext__ b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.__styleext__ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html deleted file mode 100644 index 8aa3f3f387cf..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html +++ /dev/null @@ -1,21 +0,0 @@ -<!--The content below is only a placeholder and can be replaced.--> -<div style="text-align:center"> - <h1> - Welcome to {{title}}! - </h1> - <img width="300" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo="> -</div> -<h2>Here are some links to help you start: </h2> -<ul> - <li> - <h2><a target="_blank" href="https://angular.io/tutorial">Tour of Heroes</a></h2> - </li> - <li> - <h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2> - </li> - <li> - <h2><a target="_blank" href="https://blog.angular.io//">Angular blog</a></h2> - </li> -</ul> -<% if (routing) { %> -<router-outlet></router-outlet><% } %> diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.spec.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.spec.ts deleted file mode 100644 index 4676e293f152..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.spec.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { TestBed, async } from '@angular/core/testing';<% if (routing) { %> -import { RouterTestingModule } from '@angular/router/testing';<% } %> - -import { AppComponent } from './app.component'; - -describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({<% if (routing) { %> - imports: [ - RouterTestingModule - ],<% } %> - declarations: [ - AppComponent - ], - }).compileComponents(); - })); - - it('should create the app', async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app).toBeTruthy(); - })); - - it(`should have as title '<%= prefix %>'`, async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('<%= prefix %>'); - })); - - it('should render title in a h1 tag', async(() => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('Welcome to <%= prefix %>!'); - })); -}); diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.ts deleted file mode 100644 index e27843c1c26b..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: '<%= prefix %>-root',<% if (inlineTemplate) { %> - template: ` - <h1> - Welcome to {{title}}!! - </h1><% if (routing) { %> - <router-outlet></router-outlet><% } %> - `,<% } else { %> - templateUrl: './app.component.html',<% } %><% if (inlineStyle) { %> - styles: []<% } else { %> - styleUrls: ['./app.component.<%= styleExt %>']<% } %> -}) -export class AppComponent { - title = '<%= prefix %>'; -} diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.module.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.module.ts deleted file mode 100644 index 2c4bc05c64e6..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/app/app.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; -<% if (routing) { %> -import { AppRoutingModule } from './app-routing.module';<% } %> -import { AppComponent } from './app.component'; - -@NgModule({ - declarations: [ - AppComponent - ], - imports: [ - BrowserModule<% if (routing) { %>, - AppRoutingModule<% } %> - ], - providers: [], - bootstrap: [AppComponent] -}) -export class AppModule { } diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/assets/.gitkeep b/packages/@angular/cli/blueprints/ng/files/__path__/assets/.gitkeep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.prod.ts b/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.prod.ts deleted file mode 100644 index 3612073bc31c..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.prod.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const environment = { - production: true -}; diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.ts b/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.ts deleted file mode 100644 index b7f639aecac5..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.ts +++ /dev/null @@ -1,8 +0,0 @@ -// The file contents for the current environment will overwrite these during build. -// The build system defaults to the dev environment which uses `environment.ts`, but if you do -// `ng build --env=prod` then `environment.prod.ts` will be used instead. -// The list of which env maps to which file can be found in `.angular-cli.json`. - -export const environment = { - production: false -}; diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/favicon.ico b/packages/@angular/cli/blueprints/ng/files/__path__/favicon.ico deleted file mode 100644 index 8081c7ceaf2b..000000000000 Binary files a/packages/@angular/cli/blueprints/ng/files/__path__/favicon.ico and /dev/null differ diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/index.html b/packages/@angular/cli/blueprints/ng/files/__path__/index.html deleted file mode 100644 index 7dd47bfdf799..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/index.html +++ /dev/null @@ -1,14 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title><%= jsComponentName %></title> - <base href="/"> - - <meta name="viewport" content="width=device-width, initial-scale=1"><% if (!minimal) { %> - <link rel="icon" type="image/x-icon" href="favicon.ico"><% } %> -</head> -<body> - <<%= prefix %>-root></<%= prefix %>-root> -</body> -</html> diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/main.ts b/packages/@angular/cli/blueprints/ng/files/__path__/main.ts deleted file mode 100644 index a9ca1caf8cee..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/main.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; - -if (environment.production) { - enableProdMode(); -} - -platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/polyfills.ts b/packages/@angular/cli/blueprints/ng/files/__path__/polyfills.ts deleted file mode 100644 index 7831e97b79a4..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/polyfills.ts +++ /dev/null @@ -1,72 +0,0 @@ -/** - * This file includes polyfills needed by Angular and is loaded before the app. - * You can add your own extra polyfills to this file. - * - * This file is divided into 2 sections: - * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. - * 2. Application imports. Files imported after ZoneJS that should be loaded before your main - * file. - * - * The current setup is for so-called "evergreen" browsers; the last versions of browsers that - * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), - * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. - * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html - */ - -/*************************************************************************************************** - * BROWSER POLYFILLS - */ - -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -// import 'core-js/es6/symbol'; -// import 'core-js/es6/object'; -// import 'core-js/es6/function'; -// import 'core-js/es6/parse-int'; -// import 'core-js/es6/parse-float'; -// import 'core-js/es6/number'; -// import 'core-js/es6/math'; -// import 'core-js/es6/string'; -// import 'core-js/es6/date'; -// import 'core-js/es6/array'; -// import 'core-js/es6/regexp'; -// import 'core-js/es6/map'; -// import 'core-js/es6/weak-map'; -// import 'core-js/es6/set'; - -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - -/** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; - - -/** - * Required to support Web Animations `@angular/animation`. - * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation - **/ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - - -/*************************************************************************************************** - * Zone JS is required by Angular itself. - */ -import 'zone.js/dist/zone'; // Included with Angular CLI. - - - -/*************************************************************************************************** - * APPLICATION IMPORTS - */ - -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -// import 'intl'; // Run `npm install --save intl`. -/** - * Need to import at least one locale-data with intl. - */ -// import 'intl/locale-data/jsonp/en'; diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/styles.__styleext__ b/packages/@angular/cli/blueprints/ng/files/__path__/styles.__styleext__ deleted file mode 100644 index 90d4ee0072ce..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/styles.__styleext__ +++ /dev/null @@ -1 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/test.ts b/packages/@angular/cli/blueprints/ng/files/__path__/test.ts deleted file mode 100644 index cd612eeb0e2f..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/test.ts +++ /dev/null @@ -1,32 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. -declare const __karma__: any; -declare const require: any; - -// Prevent Karma from running prematurely. -__karma__.loaded = function () {}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); -// Finally, start Karma to run the tests. -__karma__.start(); diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.app.json b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.app.json deleted file mode 100644 index b9d68b57b881..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.app.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "<%= relativeRootPath %>/tsconfig.json", - "compilerOptions": { - "outDir": "<%= relativeRootPath %>/out-tsc/app", - "baseUrl": "./", - "module": "es2015", - "types": [] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts" - ] -} diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json deleted file mode 100644 index 06529a688f8a..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "<%= relativeRootPath %>/tsconfig.json", - "compilerOptions": { - "outDir": "<%= relativeRootPath %>/out-tsc/spec", - "baseUrl": "./", - "module": "commonjs", - "target": "es5", - "types": [ - "jasmine", - "node" - ] - }, - "files": [ - "test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts b/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts deleted file mode 100644 index ef5c7bd62057..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/__path__/typings.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* SystemJS module definition */ -declare var module: NodeModule; -interface NodeModule { - id: string; -} diff --git a/packages/@angular/cli/blueprints/ng/files/angular-cli.json b/packages/@angular/cli/blueprints/ng/files/angular-cli.json deleted file mode 100644 index c287ee979cbb..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/angular-cli.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "<%= htmlComponentName %>" - }, - "apps": [ - { - "root": "<%= sourceDir %>", - "outDir": "dist", - "assets": [ - "assets", - "favicon.ico" - ], - "index": "index.html", - "main": "main.ts", - "polyfills": "polyfills.ts", - "test": "test.ts", - "tsconfig": "tsconfig.app.json", - "testTsconfig": "tsconfig.spec.json", - "prefix": "<%= prefix %>", - "styles": [ - "styles.<%= styleExt %>" - ], - "scripts": [], - "environmentSource": "environments/environment.ts", - "environments": { - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "lint": [ - { - "project": "<%= sourceDir %>/tsconfig.app.json", - "exclude": "**/node_modules/**" - }, - { - "project": "<%= sourceDir %>/tsconfig.spec.json", - "exclude": "**/node_modules/**" - }, - { - "project": "e2e/tsconfig.e2e.json", - "exclude": "**/node_modules/**" - } - ], - "test": { - "karma": { - "config": "./karma.conf.js" - } - }, - "defaults": { - "styleExt": "<%= styleExt %>",<% if (!minimal) { %> - "component": {}<% } else { %> - "component": { - "spec": false, - "inlineStyle": true, - "inlineTemplate": true - }, - "directive": { - "spec": false - }, - "class": { - "spec": false - }, - "guard": { - "spec": false - }, - "module": { - "spec": false - }, - "pipe": { - "spec": false - }, - "service": { - "spec": false - } <% } %> - } -} diff --git a/packages/@angular/cli/blueprints/ng/files/e2e/app.e2e-spec.ts b/packages/@angular/cli/blueprints/ng/files/e2e/app.e2e-spec.ts deleted file mode 100644 index 88c5fc9a1adf..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/e2e/app.e2e-spec.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { AppPage } from './app.po'; - -describe('<%= htmlComponentName %> App', () => { - let page: AppPage; - - beforeEach(() => { - page = new AppPage(); - }); - - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to <%= prefix %>!'); - }); -}); diff --git a/packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts b/packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts deleted file mode 100644 index 344e57db7958..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { browser, by, element } from 'protractor'; - -export class AppPage { - navigateTo() { - return browser.get('/'); - } - - getParagraphText() { - return element(by.css('<%= prefix %>-root h1')).getText(); - } -} diff --git a/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json b/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json deleted file mode 100644 index 1d9e5edf0965..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/e2e", - "baseUrl": "./", - "module": "commonjs", - "target": "es5", - "types": [ - "jasmine", - "jasminewd2", - "node" - ] - } -} diff --git a/packages/@angular/cli/blueprints/ng/files/gitignore b/packages/@angular/cli/blueprints/ng/files/gitignore deleted file mode 100755 index 6b66814308dc..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/gitignore +++ /dev/null @@ -1,43 +0,0 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. - -# compiled output -/dist -/tmp -/out-tsc - -# dependencies -/node_modules - -# IDEs and editors -/.idea -.project -.classpath -.c9/ -*.launch -.settings/ -*.sublime-workspace - -# IDE - VSCode -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -# misc -/.sass-cache -/connect.lock -/coverage -/libpeerconnection.log -npm-debug.log -testem.log -/typings -yarn-error.log - -# e2e -/e2e/*.js -/e2e/*.map - -# System Files -.DS_Store -Thumbs.db diff --git a/packages/@angular/cli/blueprints/ng/files/karma.conf.js b/packages/@angular/cli/blueprints/ng/files/karma.conf.js deleted file mode 100644 index af139fada363..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/karma.conf.js +++ /dev/null @@ -1,33 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular/cli'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular/cli/plugins/karma') - ], - client:{ - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - reports: [ 'html', 'lcovonly' ], - fixWebpackSourcePaths: true - }, - angularCli: { - environment: 'dev' - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false - }); -}; diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json deleted file mode 100644 index 1808271d071e..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "<%= htmlComponentName %>", - "version": "0.0.0", - "license": "MIT", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build",<% if (!minimal){ %> - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e"<% } else { %> - "test": "echo \"Error: no test... minimal project\" && exit 1", - "lint": "echo \"Error: no lint... minimal project\" && exit 1", - "e2e": "echo \"Error: no e2e... minimal project\" && exit 1"<% } %> - }, - "private": true, - "dependencies": { - "@angular/animations": "^4.2.4", - "@angular/common": "^4.2.4", - "@angular/compiler": "^4.2.4", - "@angular/core": "^4.2.4", - "@angular/forms": "^4.2.4", - "@angular/http": "^4.2.4", - "@angular/platform-browser": "^4.2.4", - "@angular/platform-browser-dynamic": "^4.2.4", - "@angular/router": "^4.2.4", - "core-js": "^2.4.1", - "rxjs": "^5.4.2", - "zone.js": "^0.8.14" - }, - "devDependencies": { - "@angular/cli": "<%= version %>", - "@angular/compiler-cli": "^4.2.4", - "@angular/language-service": "^4.2.4",<% if (!minimal) { %> - "@types/jasmine": "~2.5.53", - "@types/jasminewd2": "~2.0.2", - "@types/node": "~6.0.60", - "codelyzer": "~3.1.1", - "jasmine-core": "~2.6.2", - "jasmine-spec-reporter": "~4.1.0", - "karma": "~1.7.0", - "karma-chrome-launcher": "~2.1.1", - "karma-cli": "~1.0.1", - "karma-coverage-istanbul-reporter": "^1.2.1", - "karma-jasmine": "~1.1.0", - "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "~5.1.2", - "ts-node": "~3.2.0", - "tslint": "~5.3.2",<% } %> - "typescript": "~2.3.3" - } -} diff --git a/packages/@angular/cli/blueprints/ng/files/protractor.conf.js b/packages/@angular/cli/blueprints/ng/files/protractor.conf.js deleted file mode 100644 index 7ee3b5ee863a..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/protractor.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 11000, - specs: [ - './e2e/**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome' - }, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function() {} - }, - onPrepare() { - require('ts-node').register({ - project: 'e2e/tsconfig.e2e.json' - }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - } -}; diff --git a/packages/@angular/cli/blueprints/ng/files/tsconfig.json b/packages/@angular/cli/blueprints/ng/files/tsconfig.json deleted file mode 100644 index a6c016bf38ad..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "target": "es5", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2017", - "dom" - ] - } -} diff --git a/packages/@angular/cli/blueprints/ng/files/tslint.json b/packages/@angular/cli/blueprints/ng/files/tslint.json deleted file mode 100644 index 34f59facc5e5..000000000000 --- a/packages/@angular/cli/blueprints/ng/files/tslint.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "rulesDirectory": [ - "node_modules/codelyzer" - ], - "rules": { - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, - "eofline": true, - "forin": true, - "import-blacklist": [ - true, - "rxjs" - ], - "import-spacing": true, - "indent": [ - true, - "spaces" - ], - "interface-over-type-literal": true, - "label-position": true, - "max-line-length": [ - true, - 140 - ], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-arg": true, - "no-bitwise": true, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, - "no-empty": false, - "no-empty-interface": true, - "no-eval": true, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-misused-new": true, - "no-non-null-assertion": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, - "no-use-before-declare": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "prefer-const": true, - "quotemark": [ - true, - "single" - ], - "radix": true, - "semicolon": [ - true, - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "typeof-compare": true, - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "directive-selector": [ - true, - "attribute", - "<%= prefix %>", - "camelCase" - ], - "component-selector": [ - true, - "element", - "<%= prefix %>", - "kebab-case" - ], - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, - "no-input-rename": true, - "no-output-rename": true, - "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "component-class-suffix": true, - "directive-class-suffix": true, - "no-access-missing-member": true, - "templates-use-public": true, - "invoke-injectable": true - } -} diff --git a/packages/@angular/cli/blueprints/ng/index.ts b/packages/@angular/cli/blueprints/ng/index.ts deleted file mode 100644 index 01ca7c0120da..000000000000 --- a/packages/@angular/cli/blueprints/ng/index.ts +++ /dev/null @@ -1,121 +0,0 @@ -import {CliConfig} from '../../models/config'; - -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const path = require('path'); -const stringUtils = require('ember-cli-string-utils'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - description: '', - - availableOptions: [ - { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] }, - { name: 'prefix', type: String, default: 'app', aliases: ['p'] }, - { name: 'style', type: String }, - { name: 'routing', type: Boolean, default: false }, - { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] }, - { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] }, - { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] }, - { name: 'minimal', - type: Boolean, - default: false, - description: 'Should create a minimal app.' - } - ], - - beforeInstall: function(options: any) { - if (options.ignoredUpdateFiles && options.ignoredUpdateFiles.length > 0) { - return Blueprint.ignoredUpdateFiles = - Blueprint.ignoredUpdateFiles.concat(options.ignoredUpdateFiles); - } - }, - - locals: function(options: any) { - if (options.minimal) { - options.inlineStyle = true; - options.inlineTemplate = true; - options.skipTests = true; - } - - this.styleExt = options.style === 'stylus' ? 'styl' : options.style; - if (!options.style) { - this.styleExt = CliConfig.getValue('defaults.styleExt') || 'css'; - } - - this.version = require(path.resolve(__dirname, '../../package.json')).version; - // set this.tests to opposite of skipTest options, - // meaning if tests are being skipped then the default.spec.BLUEPRINT will be false - this.tests = options.skipTests ? false : true; - - // Split/join with / not path.sep as reference to typings require forward slashes. - const relativeRootPath = options.sourceDir.split('/').map(() => '..').join('/'); - const fullAppName = (stringUtils.dasherize(options.entity.name) as string) - .replace(/-(.)/g, (_, l) => ' ' + l.toUpperCase()) - .replace(/^./, (l) => l.toUpperCase()); - - return { - htmlComponentName: stringUtils.dasherize(options.entity.name), - jsComponentName: stringUtils.classify(options.entity.name), - fullAppName: fullAppName, - version: this.version, - sourceDir: options.sourceDir, - prefix: options.prefix, - styleExt: this.styleExt, - relativeRootPath: relativeRootPath, - routing: options.routing, - inlineStyle: options.inlineStyle, - inlineTemplate: options.inlineTemplate, - tests: this.tests, - minimal: options.minimal - }; - }, - - files: function() { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.routing) { - fileList = fileList.filter(p => p.indexOf('app-routing.module.ts') < 0); - } - if (this.options && this.options.inlineTemplate) { - fileList = fileList.filter(p => p.indexOf('app.component.html') < 0); - } - if (this.options && this.options.inlineStyle) { - fileList = fileList.filter(p => p.indexOf('app.component.__styleext__') < 0); - } - if (this.options && this.options.skipGit) { - fileList = fileList.filter(p => p.indexOf('gitignore') < 0); - } - - if (this.options && this.options.skipTests) { - fileList = fileList.filter(p => p.indexOf('app.component.spec.ts') < 0); - } - - if (this.options && this.options.minimal) { - const toRemoveList: RegExp[] = [/e2e\//, /editorconfig/, /README/, /karma.conf.js/, - /protractor.conf.js/, /test.ts/, /tsconfig.spec.json/, /tslint.json/, /favicon.ico/]; - fileList = fileList.filter(p => { - return !toRemoveList.some(re => re.test(p)); - }); - } - - const cliConfig = CliConfig.fromProject(); - const ngConfig = cliConfig && cliConfig.config; - if (!ngConfig || ngConfig.packageManager != 'yarn') { - fileList = fileList.filter(p => p.indexOf('yarn.lock') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - return { - __path__: () => { - return options.locals.sourceDir; - }, - __styleext__: () => { - return this.styleExt; - } - }; - } -}); diff --git a/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts deleted file mode 100644 index 2eb22fcd2503..000000000000 --- a/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { <%= classifiedModuleName %>Pipe } from './<%= dasherizedModuleName %>.pipe'; - -describe('<%= classifiedModuleName %>Pipe', () => { - it('create an instance', () => { - const pipe = new <%= classifiedModuleName %>Pipe(); - expect(pipe).toBeTruthy(); - }); -}); diff --git a/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.ts b/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.ts deleted file mode 100644 index 2813a99446ed..000000000000 --- a/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; - -@Pipe({ - name: '<%= camelizedModuleName %>' -}) -export class <%= classifiedModuleName %>Pipe implements PipeTransform { - - transform(value: any, args?: any): any { - return null; - } - -} diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts deleted file mode 100644 index b8e7242bbd79..000000000000 --- a/packages/@angular/cli/blueprints/pipe/index.ts +++ /dev/null @@ -1,159 +0,0 @@ -import * as chalk from 'chalk'; -import * as path from 'path'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; - -const stringUtils = require('ember-cli-string-utils'); -const astUtils = require('../../utilities/ast-utils'); -const findParentModule = require('../../utilities/find-parent-module').default; -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'pipe', - description: '', - aliases: ['p'], - - availableOptions: [ - { - name: 'flat', - type: Boolean, - description: 'Flag to indicate if a dir is created.' - }, - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'skip-import', - type: Boolean, - default: false, - description: 'Allows for skipping the module import.' - }, - { - name: 'module', - type: String, - aliases: ['m'], - description: 'Allows specification of the declaring module.' - }, - { - name: 'export', - type: Boolean, - default: false, - description: 'Specifies if declaring module exports the pipe.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - beforeInstall: function(options: any) { - const appConfig = getAppFromConfig(this.options.app); - if (options.module) { - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } else { - try { - this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath); - } catch (e) { - if (!options.skipImport) { - throw `Error locating module for declaration\n\t${e}`; - } - } - } - }, - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.pipe.flat'); - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.pipe.spec'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat - }; - }, - - files: function() { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.pipe.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - return { - __path__: () => { - let dir = this.dynamicPath.dir; - if (!options.locals.flat) { - dir += path.sep + options.dasherizedModuleName; - } - this.generatePath = dir; - return dir; - } - }; - }, - - afterInstall: function(options: any) { - const returns: Array<any> = []; - const className = stringUtils.classify(`${options.entity.name}Pipe`); - const fileName = stringUtils.dasherize(`${options.entity.name}.pipe`); - const fullGeneratePath = path.join(this.project.root, this.generatePath); - const moduleDir = path.parse(this.pathToModule).dir; - const relativeDir = path.relative(moduleDir, fullGeneratePath); - const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`; - const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`; - - if (!options.skipImport) { - if (options.dryRun) { - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - return; - } - returns.push( - astUtils.addDeclarationToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)) - .then((result: any) => { - if (options.export) { - return astUtils.addExportToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost)); - } - return result; - })); - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - this.addModifiedFile(this.pathToModule); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.spec.ts b/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.spec.ts deleted file mode 100644 index f0eb357b06ac..000000000000 --- a/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service'; - -describe('<%= classifiedModuleName %>Service', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [<%= classifiedModuleName %>Service] - }); - }); - - it('should be created', inject([<%= classifiedModuleName %>Service], (service: <%= classifiedModuleName %>Service) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.ts b/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.ts deleted file mode 100644 index 95fc61a65e59..000000000000 --- a/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable() -export class <%= classifiedModuleName %>Service { - - constructor() { } - -} diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts deleted file mode 100644 index 6829767faf01..000000000000 --- a/packages/@angular/cli/blueprints/service/index.ts +++ /dev/null @@ -1,138 +0,0 @@ -import * as chalk from 'chalk'; -import * as path from 'path'; -import { oneLine } from 'common-tags'; -import { NodeHost } from '../../lib/ast-tools'; -import { CliConfig } from '../../models/config'; -import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser'; -import { getAppFromConfig } from '../../utilities/app-utils'; -import { resolveModulePath } from '../../utilities/resolve-module-file'; - -const Blueprint = require('../../ember-cli/lib/models/blueprint'); -const stringUtils = require('ember-cli-string-utils'); -const astUtils = require('../../utilities/ast-utils'); -const getFiles = Blueprint.prototype.files; - -export default Blueprint.extend({ - name: 'service', - description: '', - aliases: ['s'], - - availableOptions: [ - { - name: 'flat', - type: Boolean, - description: 'Flag to indicate if a dir is created.' - }, - { - name: 'spec', - type: Boolean, - description: 'Specifies if a spec file is generated.' - }, - { - name: 'module', - type: String, aliases: ['m'], - description: 'Specifies where the service should be provided.' - }, - { - name: 'app', - type: String, - aliases: ['a'], - description: 'Specifies app name to use.' - } - ], - - beforeInstall: function (options: any) { - if (options.module) { - const appConfig = getAppFromConfig(this.options.app); - this.pathToModule = - resolveModulePath(options.module, this.project, this.project.root, appConfig); - } - }, - - normalizeEntityName: function (entityName: string) { - const appConfig = getAppFromConfig(this.options.app); - const dynamicPathOptions: DynamicPathOptions = { - project: this.project, - entityName, - appConfig, - dryRun: this.options.dryRun - }; - const parsedPath = dynamicPathParser(dynamicPathOptions); - - this.dynamicPath = parsedPath; - return parsedPath.name; - }, - - locals: function (options: any) { - options.flat = options.flat !== undefined ? - options.flat : CliConfig.getValue('defaults.service.flat'); - - options.spec = options.spec !== undefined ? - options.spec : CliConfig.getValue('defaults.service.spec'); - - return { - dynamicPath: this.dynamicPath.dir, - flat: options.flat - }; - }, - - files: function () { - let fileList = getFiles.call(this) as Array<string>; - - if (this.options && !this.options.spec) { - fileList = fileList.filter(p => p.indexOf('__name__.service.spec.ts') < 0); - } - - return fileList; - }, - - fileMapTokens: function (options: any) { - // Return custom template variables here. - return { - __path__: () => { - let dir = this.dynamicPath.dir; - if (!options.locals.flat) { - dir += path.sep + options.dasherizedModuleName; - } - this.generatePath = dir; - return dir; - } - }; - }, - - afterInstall(options: any) { - const returns: Array<any> = []; - - if (!this.pathToModule) { - const warningMessage = oneLine` - Service is generated but not provided, - it must be provided to be used - `; - this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage); - } else { - if (options.dryRun) { - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - return; - } - - const className = stringUtils.classify(`${options.entity.name}Service`); - const fileName = stringUtils.dasherize(`${options.entity.name}.service`); - const fullGeneratePath = path.join(this.project.root, this.generatePath); - const moduleDir = path.parse(this.pathToModule).dir; - const relativeDir = path.relative(moduleDir, fullGeneratePath); - const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`; - const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`; - returns.push( - astUtils.addProviderToModule(this.pathToModule, className, importPath) - .then((change: any) => change.apply(NodeHost))); - this._writeStatusToUI(chalk.yellow, - 'update', - path.relative(this.project.root, this.pathToModule)); - this.addModifiedFile(this.pathToModule); - } - - return Promise.all(returns); - } -}); diff --git a/packages/@angular/cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js deleted file mode 100644 index 3845857c7cb6..000000000000 --- a/packages/@angular/cli/ember-cli/lib/models/blueprint.js +++ /dev/null @@ -1,1474 +0,0 @@ -'use strict'; - -/** -@module ember-cli -*/ -var FileInfo = require('./file-info'); -var RSVP = require('rsvp'); -var Promise = RSVP.Promise; -var chalk = require('chalk'); -var printableProperties = require('../utilities/printable-properties').blueprint; -var sequence = require('../utilities/sequence'); -var printCommand = require('../utilities/print-command'); -var fs = require('fs-extra'); -var inflector = require('inflection'); -var minimatch = require('minimatch'); -var path = require('path'); -var stat = RSVP.denodeify(fs.stat); -var stringUtils = require('ember-cli-string-utils'); -var compact = require('lodash/compact'); -var intersect = require('lodash/intersection'); -var uniq = require('lodash/uniq'); -var zipObject = require('lodash/zipObject'); -var includes = require('lodash/includes'); -var any = require('lodash/some'); -var cloneDeep = require('lodash/cloneDeep'); -var keys = require('lodash/keys'); -var merge = require('lodash/merge'); -var values = require('lodash/values'); -var walkSync = require('walk-sync'); -var writeFile = RSVP.denodeify(fs.outputFile); -var removeFile = RSVP.denodeify(fs.remove); -var SilentError = require('silent-error'); -var CoreObject = require('core-object'); -var EOL = require('os').EOL; -var normalizeEntityName = require('ember-cli-normalize-entity-name'); - -function existsSync(path) { - try { - fs.accessSync(path); - return true; - } - catch (e) { - return false; - } -} - -module.exports = Blueprint; - -/** - A blueprint is a bundle of template files with optional install - logic. - - Blueprints follow a simple structure. Let's take the built-in - `controller` blueprint as an example: - - ``` - blueprints/controller - ├── files - │ ├── app - │ │ └── __path__ - │ │ └── __name__.js - └── index.js - - blueprints/controller-test - ├── files - │ └── tests - │ └── unit - │ └── controllers - │ └── __test__.js - └── index.js - ``` - - ## Files - - `files` contains templates for the all the files to be - installed into the target directory. - - The `__name__` token is subtituted with the dasherized - entity name at install time. For example, when the user - invokes `ember generate controller foo` then `__name__` becomes - `foo`. When the `--pod` flag is used, for example `ember - generate controller foo --pod` then `__name__` becomes - `controller`. - - The `__path__` token is substituted with the blueprint - name at install time. For example, when the user invokes - `ember generate controller foo` then `__path__` becomes - `controller`. When the `--pod` flag is used, for example - `ember generate controller foo --pod` then `__path__` - becomes `foo` (or `<podModulePrefix>/foo` if the - podModulePrefix is defined). This token is primarily for - pod support, and is only necessary if the blueprint can be - used in pod structure. If the blueprint does not require pod - support, simply use the blueprint name instead of the - `__path__` token. - - The `__test__` token is substituted with the dasherized - entity name and appended with `-test` at install time. - This token is primarily for pod support and only necessary - if the blueprint requires support for a pod structure. If - the blueprint does not require pod support, simply use the - `__name__` token instead. - - ## Template Variables (AKA Locals) - - Variables can be inserted into templates with - `<%= someVariableName %>`. - - For example, the built-in `util` blueprint - `files/app/utils/__name__.js` looks like this: - - ```js - export default function <%= camelizedModuleName %>() { - return true; - } - ``` - - `<%= camelizedModuleName %>` is replaced with the real - value at install time. - - The following template variables are provided by default: - - - `dasherizedPackageName` - - `classifiedPackageName` - - `dasherizedModuleName` - - `classifiedModuleName` - - `camelizedModuleName` - - `packageName` is the project name as found in the project's - `package.json`. - - `moduleName` is the name of the entity being generated. - - The mechanism for providing custom template variables is - described below. - - ## Index.js - - Custom installation and uninstallation behaviour can be added - by overriding the hooks documented below. `index.js` should - export a plain object, which will extend the prototype of the - `Blueprint` class. If needed, the original `Blueprint` prototype - can be accessed through the `_super` property. - - ```js - module.exports = { - locals: function(options) { - // Return custom template variables here. - return {}; - }, - - normalizeEntityName: function(entityName) { - // Normalize and validate entity name here. - return entityName; - }, - - fileMapTokens: function(options) ( - // Return custom tokens to be replaced in your files - return { - __token__: function(options){ - // logic to determine value goes here - return 'value'; - } - } - }, - - filesPath: function(options) { - return path.join(this.path, 'files'); - }, - - beforeInstall: function(options) {}, - afterInstall: function(options) {}, - beforeUninstall: function(options) {}, - afterUninstall: function(options) {} - - }; - ``` - - ## Blueprint Hooks - - As shown above, the following hooks are available to - blueprint authors: - - - `locals` - - `normalizeEntityName` - - `fileMapTokens` - - `filesPath` - - `beforeInstall` - - `afterInstall` - - `beforeUninstall` - - `afterUninstall` - - ### locals - - Use `locals` to add custom tempate variables. The method - receives one argument: `options`. Options is an object - containing general and entity-specific options. - - When the following is called on the command line: - - ```sh - ember generate controller foo --type=array --dry-run - ``` - - The object passed to `locals` looks like this: - - ```js - { - entity: { - name: 'foo', - options: { - type: 'array' - } - }, - dryRun: true - } - ``` - - This hook must return an object or a Promise which resolves to an object. - The resolved object will be merged with the aforementioned default locals. - - ### normalizeEntityName - - Use the `normalizeEntityName` hook to add custom normalization and - validation of the provided entity name. The default hook does not - make any changes to the entity name, but makes sure an entity name - is present and that it doesn't have a trailing slash. - - This hook receives the entity name as its first argument. The string - returned by this hook will be used as the new entity name. - - ### fileMapTokens - - Use `fileMapTokens` to add custom fileMap tokens for use - in the `mapFile` method. The hook must return an object in the - following pattern: - - ```js - { - __token__: function(options){ - // logic to determine value goes here - return 'value'; - } - } - ``` - - It will be merged with the default `fileMapTokens`, and can be used - to override any of the default tokens. - - Tokens are used in the files folder (see `files`), and get replaced with - values when the `mapFile` method is called. - - ### filesPath - - Use `filesPath` to define where the blueprint files to install are located. - This can be used to customize which set of files to install based on options - or environmental variables. It defaults to the `files` directory within the - blueprint's folder. - - ### beforeInstall & beforeUninstall - - Called before any of the template files are processed and receives - the the `options` and `locals` hashes as parameters. Typically used for - validating any additional command line options or for any asynchronous - setup that is needed. As an example, the `controller` blueprint validates - its `--type` option in this hook. If you need to run any asynchronous code, - wrap it in a promise and return that promise from these hooks. This will - ensure that your code is executed correctly. - - ### afterInstall & afterUninstall - - The `afterInstall` and `afterUninstall` hooks receives the same - arguments as `locals`. Use it to perform any custom work after the - files are processed. For example, the built-in `route` blueprint - uses these hooks to add and remove relevant route declarations in - `app/router.js`. - - ### Overriding Install - - If you don't want your blueprint to install the contents of - `files` you can override the `install` method. It receives the - same `options` object described above and must return a promise. - See the built-in `resource` blueprint for an example of this. - - @class Blueprint - @constructor - @extends CoreObject - @param {String} [blueprintPath] -*/ -function Blueprint(blueprintPath) { - this.path = blueprintPath; - this.name = path.basename(blueprintPath); -} - -Blueprint.__proto__ = CoreObject; -Blueprint.prototype.constructor = Blueprint; - -Blueprint.prototype.availableOptions = []; -Blueprint.prototype.anonymousOptions = ['name']; - -/** - Hook to specify the path to the blueprint's files. By default this is - `path.join(this.path, 'files)`. - - @method filesPath - @param {Object} options - @return {String} Path to the blueprints files directory. -*/ - -Blueprint.prototype.filesPath = function() { - return path.join(this.path, 'files'); -}; - -/** - Used to retrieve files for blueprint. The `file` param is an - optional string that is turned into a glob. - - @method files - @return {Array} Contents of the blueprint's files directory -*/ -Blueprint.prototype.files = function() { - if (this._files) { return this._files; } - - var filesPath = this.filesPath(this.options); - if (existsSync(filesPath)) { - this._files = walkSync(filesPath); - } else { - this._files = []; - } - - return this._files; -}; - -/** - @method srcPath - @param {String} file - @return {String} Resolved path to the file -*/ -Blueprint.prototype.srcPath = function(file) { - return path.resolve(this.filesPath(this.options), file); -}; - -/** - Hook for normalizing entity name - @method normalizeEntityName - @param {String} entityName - @return {null} -*/ -Blueprint.prototype.normalizeEntityName = function(entityName) { - return normalizeEntityName(entityName); -}; - -/** - Write a status and message to the UI - @private - @method _writeStatusToUI - @param {Function} chalkColor - @param {String} keyword - @param {String} message -*/ -Blueprint.prototype._writeStatusToUI = function(chalkColor, keyword, message) { - if (this.ui) { - this.ui.writeLine(' ' + chalkColor(keyword) + ' ' + message); - } -}; - -Blueprint.prototype.addModifiedFile = function(file) { - if (!this.modifiedFiles) { - this.modifiedFiles = []; - } - this.modifiedFiles.push(file); -} - -/** - @private - @method _writeFile - @param {Object} info - @return {Promise} -*/ -Blueprint.prototype._writeFile = function(info) { - if (!this.dryRun) { - this.addModifiedFile(info.outputPath); - return writeFile(info.outputPath, info.render()); - } -}; - -/** - Actions lookup - @private -*/ - -Blueprint.prototype._actions = { - write: function(info) { - this._writeStatusToUI(chalk.green, 'create', info.displayPath); - return this._writeFile(info); - }, - skip: function(info) { - var label = 'skip'; - - if (info.resolution === 'identical') { - label = 'identical'; - } - - this._writeStatusToUI(chalk.yellow, label, info.displayPath); - }, - - overwrite: function(info) { - this._writeStatusToUI(chalk.yellow, 'overwrite', info.displayPath); - return this._writeFile(info); - }, - - edit: function(info) { - this._writeStatusToUI(chalk.green, 'edited', info.displayPath); - }, - - remove: function(info) { - this._writeStatusToUI(chalk.red, 'remove', info.displayPath); - if (!this.dryRun) { - return removeFile(info.outputPath); - } - } -}; - -/** - Calls an action. - @private - @method _commit - @param {Object} result - @return {Promise} - @throws {Error} Action doesn't exist. -*/ -Blueprint.prototype._commit = function(result) { - var action = this._actions[result.action]; - - if (action) { - return action.call(this, result); - } else { - throw new Error('Tried to call action \"' + result.action + '\" but it does not exist'); - } -}; - -/** - Prints warning for pod unsupported. - @private - @method _checkForPod -*/ -Blueprint.prototype._checkForPod = function(verbose) { - if (!this.hasPathToken && this.pod && verbose) { - this.ui.writeLine(chalk.yellow('You specified the pod flag, but this' + - ' blueprint does not support pod structure. It will be generated with' + - ' the default structure.')); - } -}; - -/** - @private - @method _normalizeEntityName - @param {Object} entity -*/ -Blueprint.prototype._normalizeEntityName = function(entity) { - if (entity) { - entity.name = this.normalizeEntityName(entity.name); - } -}; - -/** - @private - @method _checkInRepoAddonExists - @param {String} inRepoAddon -*/ -Blueprint.prototype._checkInRepoAddonExists = function(inRepoAddon) { - if (inRepoAddon) { - if (!inRepoAddonExists(inRepoAddon, this.project.root)) { - throw new SilentError('You specified the in-repo-addon flag, but the' + - ' in-repo-addon \'' + inRepoAddon + '\' does not exist. Please' + - ' check the name and try again.'); - } - } -}; - -/** - @private - @method _process - @param {Object} options - @param {Function} beforeHook - @param {Function} process - @param {Function} afterHook -*/ -Blueprint.prototype._process = function(options, beforeHook, process, afterHook) { - var self = this; - var intoDir = options.target; - - return this._locals(options).then(function (locals) { - return Promise.resolve() - .then(beforeHook.bind(self, options, locals)) - .then(process.bind(self, intoDir, locals)) - .then(promises => RSVP.map(promises, self._commit.bind(self))) - .then(afterHook.bind(self, options)); - }); -}; - -/** - @method install - @param {Object} options - @return {Promise} -*/ -Blueprint.prototype.install = function(options) { - var ui = this.ui = options.ui; - var dryRun = this.dryRun = options.dryRun; - this.project = options.project; - this.pod = false; - this.options = options; - this.hasPathToken = hasPathToken(this.files()); - - ui.writeLine('installing ' + this.name); - - if (dryRun) { - ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' + - ' changes will be written.')); - } - - this._normalizeEntityName(options.entity); - this._checkForPod(options.verbose); - this._checkInRepoAddonExists(options.inRepoAddon); - - var start = new Date(); - return this._process( - options, - this.beforeInstall, - this.processFiles, - this.afterInstall).finally(function() { - }.bind(this)); -}; - -/** - @method uninstall - @param {Object} options - @return {Promise} -*/ -Blueprint.prototype.uninstall = function(options) { - var ui = this.ui = options.ui; - var dryRun = this.dryRun = options.dryRun; - this.project = options.project; - this.pod = false; - this.options = options; - this.hasPathToken = hasPathToken(this.files()); - - ui.writeLine('uninstalling ' + this.name); - - if (dryRun) { - ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' + - ' files will be deleted.')); - } - - this._normalizeEntityName(options.entity); - this._checkForPod(options.verbose); - - return this._process( - options, - this.beforeUninstall, - this.processFilesForUninstall, - this.afterUninstall); -}; - -/** - Hook for running operations before install. - @method beforeInstall - @return {Promise|null} -*/ -Blueprint.prototype.beforeInstall = function() {}; - -/** - Hook for running operations after install. - @method afterInstall - @return {Promise|null} -*/ -Blueprint.prototype.afterInstall = function() {}; - -/** - Hook for running operations before uninstall. - @method beforeUninstall - @return {Promise|null} -*/ -Blueprint.prototype.beforeUninstall = function() {}; - -/** - Hook for running operations after uninstall. - @method afterUninstall - @return {Promise|null} -*/ -Blueprint.prototype.afterUninstall = function() {}; - -/** - Hook for adding additional locals - @method locals - @return {Object|null} -*/ -Blueprint.prototype.locals = function() {}; - -/** - Hook to add additional or override existing fileMapTokens. - @method fileMapTokens - @return {Object|null} -*/ -Blueprint.prototype.fileMapTokens = function() { -}; - -/** - @private - @method _fileMapTokens - @param {Object} options - @return {Object} -*/ -Blueprint.prototype._fileMapTokens = function(options) { - var standardTokens = { - __name__: function(options) { - if (options.pod && options.hasPathToken) { - return options.blueprintName; - } - return options.dasherizedModuleName; - }, - __path__: function(options) { - var blueprintName = options.blueprintName; - - if (blueprintName.match(/-test/)) { - blueprintName = options.blueprintName.slice(0, options.blueprintName.indexOf('-test')); - } - if (options.pod && options.hasPathToken) { - return path.join(options.podPath, options.dasherizedModuleName); - } - return inflector.pluralize(blueprintName); - }, - __root__: function(options) { - if (options.inRepoAddon) { - return path.join('lib',options.inRepoAddon, 'addon'); - } - if (options.inDummy) { - return path.join('tests','dummy','app'); - } - if (options.inAddon) { - return 'addon'; - } - return 'app'; - }, - __test__: function(options) { - if (options.pod && options.hasPathToken) { - return options.blueprintName; - } - return options.dasherizedModuleName + '-test'; - } - }; - - var customTokens = this.fileMapTokens(options) || options.fileMapTokens || {}; - return merge(standardTokens, customTokens); -}; - -/** - Used to generate fileMap tokens for mapFile. - - @method generateFileMap - @param {Object} fileMapVariables - @return {Object} -*/ -Blueprint.prototype.generateFileMap = function(fileMapVariables) { - var tokens = this._fileMapTokens(fileMapVariables); - var fileMapValues = values(tokens); - var tokenValues = fileMapValues.map(function(token) { return token(fileMapVariables); }); - var tokenKeys = keys(tokens); - return zipObject(tokenKeys,tokenValues); -}; - -/** - @method buildFileInfo - @param {Function} destPath - @param {Object} templateVariables - @param {String} file - @return {FileInfo} -*/ -Blueprint.prototype.buildFileInfo = function(destPath, templateVariables, file) { - var mappedPath = this.mapFile(file, templateVariables); - - return new FileInfo({ - action: 'write', - outputPath: destPath(mappedPath), - displayPath: path.normalize(mappedPath), - inputPath: this.srcPath(file), - templateVariables: templateVariables, - ui: this.ui - }); -}; - -/** - @method isUpdate - @return {Boolean} -*/ -Blueprint.prototype.isUpdate = function() { - if (this.project && this.project.isEmberCLIProject) { - return this.project.isEmberCLIProject(); - } -}; - -/** - @private - @method _getFileInfos - @param {Array} files - @param {String} intoDir - @param {Object} templateVariables - @return {Array} file infos -*/ -Blueprint.prototype._getFileInfos = function(files, intoDir, templateVariables) { - return files.map(this.buildFileInfo.bind(this, destPath.bind(null, intoDir), templateVariables)); -}; - -/** - Add update files to ignored files - @private - @method _ignoreUpdateFiles -*/ -Blueprint.prototype._ignoreUpdateFiles = function() { - if (this.isUpdate()) { - Blueprint.ignoredFiles = Blueprint.ignoredFiles.concat(Blueprint.ignoredUpdateFiles); - } -}; - -/** - @private - @method _getFilesForInstall - @param {Array} targetFiles - @return {Array} files -*/ -Blueprint.prototype._getFilesForInstall = function(targetFiles) { - var files = this.files(); - - // if we've defined targetFiles, get file info on ones that match - return targetFiles && targetFiles.length > 0 && intersect(files, targetFiles) || files; -}; - -/** - @private - @method _checkForNoMatch - @param {Array} fileInfos - @param {String} rawArgs -*/ -Blueprint.prototype._checkForNoMatch = function(fileInfos, rawArgs) { - if (fileInfos.filter(isFilePath).length < 1 && rawArgs) { - this.ui.writeLine(chalk.yellow('The globPattern \"' + rawArgs + - '\" did not match any files, so no file updates will be made.')); - } -}; - -function finishProcessingForInstall(infos) { - infos.forEach(markIdenticalToBeSkipped); - - var infosNeedingConfirmation = infos.reduce(gatherConfirmationMessages, []); - - return sequence(infosNeedingConfirmation).then(() => infos); -} - -function finishProcessingForUninstall(infos) { - infos.forEach(markToBeRemoved); - return infos; -} - -/** - @method processFiles - @param {String} intoDir - @param {Object} templateVariables -*/ -Blueprint.prototype.processFiles = function(intoDir, templateVariables) { - var files = this._getFilesForInstall(templateVariables.targetFiles); - var fileInfos = this._getFileInfos(files, intoDir, templateVariables); - this._checkForNoMatch(fileInfos, templateVariables.rawArgs); - - this._ignoreUpdateFiles(); - - return RSVP.filter(fileInfos, isValidFile) - .then(promises => RSVP.map(promises, prepareConfirm)) - .then(finishProcessingForInstall); -}; - -/** - @method processFilesForUninstall - @param {String} intoDir - @param {Object} templateVariables -*/ -Blueprint.prototype.processFilesForUninstall = function(intoDir, templateVariables) { - var fileInfos = this._getFileInfos(this.files(), intoDir, templateVariables); - - this._ignoreUpdateFiles(); - - return RSVP.filter(fileInfos, isValidFile). - then(finishProcessingForUninstall); -}; - - -/** - @method mapFile - @param {String} file - @return {String} -*/ -Blueprint.prototype.mapFile = function(file, locals) { - var pattern, i; - var fileMap = locals.fileMap || { __name__: locals.dasherizedModuleName }; - file = Blueprint.renamedFiles[file] || file; - for (i in fileMap) { - pattern = new RegExp(i, 'g'); - file = file.replace(pattern, fileMap[i]); - } - return file; -}; - -/** - Looks for a __root__ token in the files folder. Must be present for - the blueprint to support addon tokens. The `server`, `blueprints`, and `test` - - @private - @method supportsAddon - @return {Boolean} -*/ -Blueprint.prototype.supportsAddon = function() { - return this.files().join().match(/__root__/); -}; - -/** - @private - @method _generateFileMapVariables - @param {Object} options - @return {Object} -*/ -Blueprint.prototype._generateFileMapVariables = function(moduleName, locals, options) { - var originBlueprintName = options.originBlueprintName || this.name; - var podModulePrefix = this.project.config().podModulePrefix || ''; - var podPath = podModulePrefix.substr(podModulePrefix.lastIndexOf('/') + 1); - var inAddon = this.project.isEmberCLIAddon() || !!options.inRepoAddon; - var inDummy = this.project.isEmberCLIAddon() ? options.dummy : false; - - return { - pod: this.pod, - podPath: podPath, - hasPathToken: this.hasPathToken, - inAddon: inAddon, - inRepoAddon: options.inRepoAddon, - inDummy: inDummy, - blueprintName: this.name, - originBlueprintName: originBlueprintName, - dasherizedModuleName: stringUtils.dasherize(moduleName), - locals: locals - }; -}; - -/** - @private - @method _locals - @param {Object} options - @return {Object} -*/ -Blueprint.prototype._locals = function(options) { - var packageName = options.project.name() || options.projectName; - var moduleName = options.entity && options.entity.name || packageName; - var sanitizedModuleName = moduleName.replace(/\//g, '-'); - - return new Promise(function(resolve) { - resolve(this.locals(options)); - }.bind(this)).then(function (customLocals) { - var fileMapVariables = this._generateFileMapVariables(moduleName, customLocals, options); - var fileMap = this.generateFileMap(fileMapVariables); - var standardLocals = { - dasherizedPackageName: stringUtils.dasherize(packageName), - classifiedPackageName: stringUtils.classify(packageName), - dasherizedModuleName: stringUtils.dasherize(moduleName), - classifiedModuleName: stringUtils.classify(sanitizedModuleName), - camelizedModuleName: stringUtils.camelize(sanitizedModuleName), - decamelizedModuleName: stringUtils.decamelize(sanitizedModuleName), - fileMap: fileMap, - hasPathToken: this.hasPathToken, - targetFiles: options.targetFiles, - rawArgs: options.rawArgs - }; - - return merge({}, standardLocals, customLocals); - }.bind(this)); -}; - -/** - Used to add a package to the project's `package.json`. - - Generally, this would be done from the `afterInstall` hook, to - ensure that a package that is required by a given blueprint is - available. - - @method addPackageToProject - @param {String} packageName - @param {String} target - @return {Promise} -*/ -Blueprint.prototype.addPackageToProject = function(packageName, target) { - var packageObject = {name: packageName}; - - if (target) { - packageObject.target = target; - } - - return this.addPackagesToProject([packageObject]); -}; - -/** - Used to add multiple packages to the project's `package.json`. - - Generally, this would be done from the `afterInstall` hook, to - ensure that a package that is required by a given blueprint is - available. - - Expects each array item to be an object with a `name`. Each object - may optionally have a `target` to specify a specific version. - - @method addPackagesToProject - @param {Array} packages - @return {Promise} -*/ -Blueprint.prototype.addPackagesToProject = function(packages) { - var task = this.taskFor('npm-install'); - var installText = (packages.length > 1) ? 'install packages' : 'install package'; - var packageNames = []; - var packageArray = []; - - for (var i = 0; i < packages.length; i++) { - packageNames.push(packages[i].name); - - var packageNameAndVersion = packages[i].name; - - if (packages[i].target) { - packageNameAndVersion += '@' + packages[i].target; - } - - packageArray.push(packageNameAndVersion); - } - - this._writeStatusToUI(chalk.green, installText, packageNames.join(', ')); - - return task.run({ - 'save-dev': true, - verbose: false, - packages: packageArray - }); -}; - -/** - Used to remove a package from the project's `package.json`. - - Generally, this would be done from the `afterInstall` hook, to - ensure that any package conflicts can be resolved before the - addon is used. - - @method removePackageFromProject - @param {String} packageName - @return {Promise} -*/ -Blueprint.prototype.removePackageFromProject = function(packageName) { - var packageObject = {name: packageName}; - - return this.removePackagesFromProject([packageObject]); -}; - -/** - Used to remove multiple packages from the project's `package.json`. - - Generally, this would be done from the `afterInstall` hook, to - ensure that any package conflicts can be resolved before the - addon is used. - - Expects each array item to be an object with a `name` property. - - @method removePackagesFromProject - @param {Array} packages - @return {Promise} -*/ -Blueprint.prototype.removePackagesFromProject = function(packages) { - var task = this.taskFor('npm-uninstall'); - var installText = (packages.length > 1) ? 'uninstall packages' : 'uninstall package'; - var packageNames = []; - var packageArray = []; - - for (var i = 0; i < packages.length; i++) { - packageNames.push(packages[i].name); - - var packageNameAndVersion = packages[i].name; - - packageArray.push(packageNameAndVersion); - } - - this._writeStatusToUI(chalk.green, installText, packageNames.join(', ')); - - return task.run({ - 'save-dev': true, - verbose: false, - packages: packageArray - }); -}; - - -/** - Used to retrieve a task with the given name. Passes the new task - the standard information available (like `ui`, `analytics`, `project`, etc). - - @method taskFor - @param dasherizedName - @public -*/ -Blueprint.prototype.taskFor = function(dasherizedName) { - var Task = require('../tasks/' + dasherizedName); - - return new Task({ - ui: this.ui, - project: this.project - }); -}; - -/* - - Inserts the given content into a file. If the `contentsToInsert` string is already - present in the current contents, the file will not be changed unless `force` option - is passed. - - If `options.before` is specified, `contentsToInsert` will be inserted before - the first instance of that string. If `options.after` is specified, the - contents will be inserted after the first instance of that string. - If the string specified by options.before or options.after is not in the file, - no change will be made. - - If neither `options.before` nor `options.after` are present, `contentsToInsert` - will be inserted at the end of the file. - - Example: - ``` - // app/router.js - Router.map(function() { - }); - - insertIntoFile('app/router.js', - ' this.route("admin");', - {after:'Router.map(function() {'+EOL}); - - // new app/router.js - Router.map(function() { - this.route("admin"); - }); - ``` - - @method insertIntoFile - @param {String} pathRelativeToProjectRoot - @param {String} contentsToInsert - @param {Object} options - @return {Promise} -*/ -Blueprint.prototype.insertIntoFile = function(pathRelativeToProjectRoot, contentsToInsert, providedOptions) { - var fullPath = path.join(this.project.root, pathRelativeToProjectRoot); - var originalContents = ''; - - if (existsSync(fullPath)) { - originalContents = fs.readFileSync(fullPath, { encoding: 'utf8' }); - } - - var contentsToWrite = originalContents; - - var options = providedOptions || {}; - var alreadyPresent = originalContents.indexOf(contentsToInsert) > -1; - var insert = !alreadyPresent; - var insertBehavior = 'end'; - - if (options.before) { insertBehavior = 'before'; } - if (options.after) { insertBehavior = 'after'; } - - if (options.force) { insert = true; } - - if (insert) { - if (insertBehavior === 'end') { - contentsToWrite += contentsToInsert; - } else { - var contentMarker = options[insertBehavior]; - var contentMarkerIndex = contentsToWrite.indexOf(contentMarker); - - if (contentMarkerIndex !== -1) { - var insertIndex = contentMarkerIndex; - if (insertBehavior === 'after') { insertIndex += contentMarker.length; } - - contentsToWrite = contentsToWrite.slice(0, insertIndex) + - contentsToInsert + EOL + - contentsToWrite.slice(insertIndex); - } - } - } - - var returnValue = { - path: fullPath, - originalContents: originalContents, - contents: contentsToWrite, - inserted: false - }; - - if (contentsToWrite !== originalContents) { - returnValue.inserted = true; - - return writeFile(fullPath, contentsToWrite) - .then(function() { - return returnValue; - }); - } else { - return Promise.resolve(returnValue); - } -}; - -Blueprint.prototype._printCommand = printCommand; - -Blueprint.prototype.printBasicHelp = function(verbose) { - var initialMargin = ' '; - var output = initialMargin; - if (this.overridden) { - output += chalk.grey('(overridden) ' + this.name); - } else { - output += this.name; - - output += this._printCommand(initialMargin, true); - - if (verbose) { - output += EOL + this.printDetailedHelp(this.availableOptions); - } - } - - return output; -}; - -Blueprint.prototype.printDetailedHelp = function() { - return ''; -}; - -Blueprint.prototype.getJson = function(verbose) { - var json = {}; - - printableProperties.forEachWithProperty(function(key) { - var value = this[key]; - if (key === 'availableOptions') { - value = cloneDeep(value); - value.forEach(function(option) { - if (typeof option.type === 'function') { - option.type = option.type.name; - } - }); - } - json[key] = value; - }, this); - - if (verbose) { - var detailedHelp = this.printDetailedHelp(this.availableOptions); - if (detailedHelp) { - json.detailedHelp = detailedHelp; - } - } - - return json; -}; - -/** - Used to retrieve a blueprint with the given name. - - @method lookupBlueprint - @param dasherizedName - @public -*/ -Blueprint.prototype.lookupBlueprint = function(dasherizedName) { - var projectPaths = this.project ? this.project.blueprintLookupPaths() : []; - - return Blueprint.lookup(dasherizedName, { - paths: projectPaths - }); -}; - -/** - @static - @method lookup - @namespace Blueprint - @param {String} [name] - @param {Object} [options] - @param {Array} [options.paths] Extra paths to search for blueprints - @param {Object} [options.properties] Properties - @return {Blueprint} -*/ -Blueprint.lookup = function(name, options) { - options = options || {}; - - var lookupPaths = generateLookupPaths(options.paths); - - var lookupPath; - var blueprintPath; - - for (var i = 0; (lookupPath = lookupPaths[i]); i++) { - blueprintPath = path.resolve(lookupPath, name); - - if (existsSync(blueprintPath)) { - return Blueprint.load(blueprintPath); - } - } - - if (!options.ignoreMissing) { - throw new SilentError('Unknown blueprint: ' + name); - } -}; - -/** - Loads a blueprint from given path. - @static - @method load - @namespace Blueprint - @param {String} blueprintPath - @return {Blueprint} blueprint instance -*/ -Blueprint.load = function(blueprintPath) { - var constructorPath = path.join(path.resolve(blueprintPath), 'index'); - var blueprintModule; - var Constructor = Blueprint; - - if (fs.lstatSync(blueprintPath).isDirectory()) { - blueprintModule = require(constructorPath); - if (blueprintModule) { - if (typeof blueprintModule === 'function') { - Constructor = blueprintModule; - } else if (typeof blueprintModule.default === 'function') { - Constructor = blueprintModule.default - } else { - Constructor = Blueprint.extend(blueprintModule); - } - } - - return new Constructor(blueprintPath); - } - - return; -}; - -/** - @static - @method list - @namespace Blueprint - @param {Object} [options] - @param {Array} [options.paths] Extra paths to search for blueprints - @return {Blueprint} -*/ -Blueprint.list = function(options) { - options = options || {}; - - var lookupPaths = generateLookupPaths(options.paths); - var seen = []; - - return lookupPaths.map(function(lookupPath) { - var blueprints = dir(lookupPath); - var packagePath = path.join(lookupPath, '../package.json'); - var source; - - if (existsSync(packagePath)) { - source = require(packagePath).name; - } else { - source = path.basename(path.join(lookupPath, '..')); - } - - blueprints = blueprints.map(function(blueprintPath) { - var blueprint = Blueprint.load(blueprintPath); - var name; - - if (blueprint) { - name = blueprint.name; - blueprint.overridden = includes(seen, name); - seen.push(name); - - return blueprint; - } - - return; - }); - - return { - source: source, - blueprints: compact(blueprints) - }; - }); -}; - -/** - @static - @property renameFiles -*/ -Blueprint.renamedFiles = { - 'gitignore': '.gitignore', - 'angular-cli.json': '.angular-cli.json' -}; - -/** - @static - @property ignoredFiles -*/ -Blueprint.ignoredFiles = [ - '.DS_Store' -]; - -/** - @static - @property ignoredUpdateFiles -*/ -Blueprint.ignoredUpdateFiles = [ - '.gitkeep', - 'app.css' -]; - -/** - @static - @property defaultLookupPaths -*/ -Blueprint.defaultLookupPaths = function() { - return [ - path.resolve(__dirname, '..', '..', 'blueprints') - ]; -}; - -/** - @private - @method prepareConfirm - @param {FileInfo} info - @return {Promise} -*/ -function prepareConfirm(info) { - return info.checkForConflict().then(function(resolution) { - info.resolution = resolution; - return info; - }); -} - -/** - @private - @method markIdenticalToBeSkipped - @param {FileInfo} info -*/ -function markIdenticalToBeSkipped(info) { - if (info.resolution === 'identical') { - info.action = 'skip'; - } -} - -/** - @private - @method markToBeRemoved - @param {FileInfo} info -*/ -function markToBeRemoved(info) { - info.action = 'remove'; -} - -/** - @private - @method gatherConfirmationMessages - @param {Array} collection - @param {FileInfo} info - @return {Array} -*/ -function gatherConfirmationMessages(collection, info) { - if (info.resolution === 'confirm') { - collection.push(info.confirmOverwriteTask()); - } - return collection; -} - -/** - @private - @method isFile - @param {FileInfo} info - @return {Boolean} -*/ -function isFile(info) { - return stat(info.inputPath).then(it => it.isFile()); -} - -/** - @private - @method isIgnored - @param {FileInfo} info - @return {Boolean} -*/ -function isIgnored(info) { - var fn = info.inputPath; - - return any(Blueprint.ignoredFiles, function(ignoredFile) { - return minimatch(fn, ignoredFile, { matchBase: true }); - }); -} - -/** - Combines provided lookup paths with defaults and removes - duplicates. - - @private - @method generateLookupPaths - @param {Array} lookupPaths - @return {Array} -*/ -function generateLookupPaths(lookupPaths) { - lookupPaths = lookupPaths || []; - lookupPaths = lookupPaths.concat(Blueprint.defaultLookupPaths()); - return uniq(lookupPaths); -} - -/** - Looks for a __path__ token in the files folder. Must be present for - the blueprint to support pod tokens. - - @private - @method hasPathToken - @param {files} files - @return {Boolean} -*/ -function hasPathToken(files) { - return files.join().match(/__path__/); -} - -function inRepoAddonExists(name, root) { - var addonPath = path.join(root, 'lib', name); - return existsSync(addonPath); -} - -/** - @private - @method destPath - @param {String} intoDir - @param {String} file - @return {String} new path -*/ -function destPath(intoDir, file) { - return path.join(intoDir, file); -} - -/** - @private - @method isValidFile - @param {Object} fileInfo - @return {Promise} -*/ -function isValidFile(fileInfo) { - if (isIgnored(fileInfo)) { - return Promise.resolve(false); - } else { - return isFile(fileInfo); - } -} - -/** - @private - @method isFilePath - @param {Object} fileInfo - @return {Promise} -*/ -function isFilePath(fileInfo) { - return fs.statSync(fileInfo.inputPath).isFile(); -} - -/** - @private - @method dir - @returns {Array} list of files in the given directory or and empty array if no directory exists -*/ -function dir(fullPath) { - if (existsSync(fullPath)) { - return fs.readdirSync(fullPath).map(function(fileName) { - return path.join(fullPath, fileName); - }); - } else { - return []; - } -} diff --git a/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js b/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js deleted file mode 100644 index a7e181dcd663..000000000000 --- a/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js +++ /dev/null @@ -1,58 +0,0 @@ -'use strict'; - -const fs = require('fs-extra'); -const RSVP = require('rsvp'); -const jsdiff = require('diff'); -const temp = require('temp').track(); -const path = require('path'); -const SilentError = require('silent-error'); -const openEditor = require('../utilities/open-editor'); - -class EditFileDiff { - constructor(options) { - this.info = options.info; - } - - edit() { - return RSVP.hash({ - input: this.info.render(), - output: fs.readFile(this.info.outputPath), - }) - .then(this.invokeEditor.bind(this)) - .then(this.applyPatch.bind(this)) - .finally(this.cleanUp.bind(this)); - } - - cleanUp() { - temp.cleanupSync(); - } - - applyPatch(resultHash) { - return RSVP.hash({ - diffString: fs.readFile(resultHash.diffPath), - currentString: fs.readFile(resultHash.outputPath), - }).then(result => { - let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString()); - - if (!appliedDiff) { - let message = 'Patch was not cleanly applied.'; - this.info.ui.writeLine(`${message} Please choose another action.`); - throw new SilentError(message); - } - - return fs.writeFile(resultHash.outputPath, appliedDiff); - }); - } - - invokeEditor(result) { - let info = this.info; - let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input); - let diffPath = path.join(temp.mkdirSync(), 'currentDiff.diff'); - - return fs.writeFile(diffPath, diff) - .then(() => openEditor(diffPath)) - .then(() => ({ outputPath: info.outputPath, diffPath })); - } -} - -module.exports = EditFileDiff; diff --git a/packages/@angular/cli/ember-cli/lib/models/file-info.js b/packages/@angular/cli/ember-cli/lib/models/file-info.js deleted file mode 100644 index d487f1e26348..000000000000 --- a/packages/@angular/cli/ember-cli/lib/models/file-info.js +++ /dev/null @@ -1,183 +0,0 @@ -'use strict'; - -const fs = require('fs-extra'); -const RSVP = require('rsvp'); -const chalk = require('chalk'); -const EditFileDiff = require('./edit-file-diff'); -const EOL = require('os').EOL; -const rxEOL = new RegExp(EOL, 'g'); -const isBinaryFile = require('isbinaryfile').sync; -const canEdit = require('../utilities/open-editor').canEdit; - -function processTemplate(content, context) { - let options = { - evaluate: /<%([\s\S]+?)%>/g, - interpolate: /<%=([\s\S]+?)%>/g, - escape: /<%-([\s\S]+?)%>/g, - }; - return require('lodash/template')(content, options)(context); -} - -function diffHighlight(line) { - if (line[0] === '+') { - return chalk.green(line); - } else if (line[0] === '-') { - return chalk.red(line); - } else if (line.match(/^@@/)) { - return chalk.cyan(line); - } else { - return line; - } -} - -class FileInfo { - constructor(options) { - this.action = options.action; - this.outputBasePath = options.outputBasePath; - this.outputPath = options.outputPath; - this.displayPath = options.displayPath; - this.inputPath = options.inputPath; - this.templateVariables = options.templateVariables; - this.ui = options.ui; - } - - confirmOverwrite(path) { - let promptOptions = { - type: 'expand', - name: 'answer', - default: false, - message: `${chalk.red('Overwrite')} ${path}?`, - choices: [ - { key: 'y', name: 'Yes, overwrite', value: 'overwrite' }, - { key: 'n', name: 'No, skip', value: 'skip' }, - ], - }; - - let outputPathIsFile = false; - try { outputPathIsFile = fs.statSync(this.outputPath).isFile(); } catch (err) { /* ignore */ } - - let canDiff = ( - !isBinaryFile(this.inputPath) && ( - !outputPathIsFile || - !isBinaryFile(this.outputPath) - ) - ); - - if (canDiff) { - promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' }); - - if (canEdit()) { - promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' }); - } - } - - return this.ui.prompt(promptOptions) - .then(response => response.answer); - } - - displayDiff() { - let info = this, - jsdiff = require('diff'); - return RSVP.hash({ - input: this.render(), - output: fs.readFile(info.outputPath), - }).then(result => { - let diff = jsdiff.createPatch( - info.outputPath, result.output.toString().replace(rxEOL, '\n'), result.input.replace(rxEOL, '\n') - ); - let lines = diff.split('\n'); - - for (let i = 0; i < lines.length; i++) { - info.ui.write( - diffHighlight(lines[i] + EOL) - ); - } - }); - } - - render() { - let path = this.inputPath, - context = this.templateVariables; - if (!this.rendered) { - this.rendered = fs.readFile(path) - .then(content => fs.stat(path) - .then(fileStat => { - if (isBinaryFile(content, fileStat.size)) { - return content; - } else { - try { - return processTemplate(content.toString(), context); - } catch (err) { - err.message += ` (Error in blueprint template: ${path})`; - throw err; - } - } - })); - } - return this.rendered; - } - - checkForConflict() { - return new Promise((resolve, reject) => { - fs.exists(this.outputPath, (doesExist, error) => { - if (error) { - reject(error); - return; - } - let result; - - if (doesExist) { - result = RSVP.hash({ - input: this.render(), - output: fs.readFile(this.outputPath), - }).then(result => { - let type; - if (result.input.toString().replace(rxEOL, '\n') === result.output.toString().replace(rxEOL, '\n')) { - type = 'identical'; - } else { - type = 'confirm'; - } - return type; - }); - } else { - result = 'none'; - } - - resolve(result); - }); - }); - } - - confirmOverwriteTask() { - let info = this; - - return function() { - return new Promise((resolve, reject) => { - function doConfirm() { - info.confirmOverwrite(info.displayPath).then(action => { - if (action === 'diff') { - info.displayDiff().then(doConfirm, reject); - } else if (action === 'edit') { - let editFileDiff = new EditFileDiff({ info }); - editFileDiff.edit().then(() => { - info.action = action; - resolve(info); - }).catch(() => { - doConfirm().finally(() => { - resolve(info); - }); - }); - } else { - info.action = action; - resolve(info); - } - }, reject); - } - - doConfirm(); - }); - }.bind(this); - } -} - -module.exports = FileInfo; diff --git a/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js b/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js deleted file mode 100644 index 76c0c430d575..000000000000 --- a/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js +++ /dev/null @@ -1,36 +0,0 @@ -'use strict'; - -var Blueprint = require('../models/blueprint'); -var Task = require('../models/task'); -var path = require('path'); -var merge = require('lodash/merge'); - -module.exports = Task.extend({ - run: function(options) { - var cwd = process.cwd(); - var name = options.rawName; - var blueprintOption = options.blueprint; - // If we're in a dry run, pretend we changed directories. - // Pretending we cd'd avoids prompts in the actual current directory. - var fakeCwd = path.join(cwd, name); - var target = options.dryRun ? fakeCwd : cwd; - - var installOptions = { - target: target, - entity: { name: name }, - ui: this.ui, - project: this.project, - dryRun: options.dryRun, - targetFiles: options.targetFiles, - rawArgs: options.rawArgs - }; - - installOptions = merge(installOptions, options || {}); - - var blueprintName = blueprintOption || 'app'; - var blueprint = Blueprint.lookup(blueprintName, { - paths: this.project.blueprintLookupPaths() - }); - return blueprint.install(installOptions); - } -}); diff --git a/packages/@angular/cli/ember-cli/lib/tasks/npm-install.js b/packages/@angular/cli/ember-cli/lib/tasks/npm-install.js deleted file mode 100644 index 40fa58af9cbe..000000000000 --- a/packages/@angular/cli/ember-cli/lib/tasks/npm-install.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -// Runs `npm install` in cwd - -var NpmTask = require('./npm-task'); - -module.exports = NpmTask.extend({ - command: 'install', - startProgressMessage: 'Installing packages for tooling via npm', - completionMessage: 'Installed packages for tooling via npm.' -}); diff --git a/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js b/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js deleted file mode 100644 index 41e41db6091d..000000000000 --- a/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js +++ /dev/null @@ -1,64 +0,0 @@ -'use strict'; - -// Runs `npm install` in cwd - -var chalk = require('chalk'); -var Task = require('../models/task'); -var RSVP = require('rsvp'); - -var spawn = RSVP.denodeify(require('child_process').spawn); - - -module.exports = Task.extend({ - // The command to run: can be 'install' or 'uninstall' - command: '', - // Message to send to ui.startProgress - startProgressMessage: '', - // Message to send to ui.writeLine on completion - completionMessage: '', - - init: function() { - }, - // Options: Boolean verbose - run: function(options) { - this.ui.startProgress(chalk.green(this.startProgressMessage), chalk.green('.')); - - var npmOptions = { - loglevel: options.verbose ? 'verbose' : 'error', - logstream: this.ui.outputStream, - color: 'always', - // by default, do install peoples optional deps - 'optional': 'optional' in options ? options.optional : true, - 'save-dev': !!options['save-dev'], - 'save-exact': !!options['save-exact'] - }; - - var packages = options.packages || []; - - // npm otherwise is otherwise noisy, already submitted PR for npm to fix - // misplaced console.log - this.disableLogger(); - return spawn('npm', [this.command].concat(packages, npmOptions)). - // return npm(this.command, packages, npmOptions, this.npm). - finally(this.finally.bind(this)). - then(this.announceCompletion.bind(this)); - }, - - announceCompletion: function() { - this.ui.writeLine(chalk.green(this.completionMessage)); - }, - - finally: function() { - this.ui.stopProgress(); - this.restoreLogger(); - }, - - disableLogger: function() { - this.oldLog = console.log; - console.log = function() {}; - }, - - restoreLogger: function() { - console.log = this.oldLog; // Hack, see above - } -}); diff --git a/packages/@angular/cli/ember-cli/lib/utilities/insert-into-file.js b/packages/@angular/cli/ember-cli/lib/utilities/insert-into-file.js deleted file mode 100644 index b3fce725bd0f..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/insert-into-file.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict'; - -const fs = require('fs-extra'); -const EOL = require('os').EOL; - -/** - Inserts the given content into a file. If the `contentsToInsert` string is already - present in the current contents, the file will not be changed unless `force` option - is passed. - If `options.before` is specified, `contentsToInsert` will be inserted before - the first instance of that string. If `options.after` is specified, the - contents will be inserted after the first instance of that string. - If the string specified by options.before or options.after is not in the file, - no change will be made. - If neither `options.before` nor `options.after` are present, `contentsToInsert` - will be inserted at the end of the file. - Example: - ``` - // app/router.js - Router.map(function() { - }); - ``` - ``` - insertIntoFile('app/router.js', ' this.route("admin");', { - after: 'Router.map(function() {' + EOL - }); - ``` - ``` - // app/router.js - Router.map(function() { - this.route("admin"); - }); - ``` - @method insertIntoFile - @param {String} pathRelativeToProjectRoot - @param {String} contentsToInsert - @param {Object} providedOptions - @return {Promise} -*/ -function insertIntoFile(fullPath, contentsToInsert, providedOptions) { - let originalContents = ''; - - if (fs.existsSync(fullPath)) { - originalContents = fs.readFileSync(fullPath, { encoding: 'utf8' }); - } - - let contentsToWrite = originalContents; - - let options = providedOptions || {}; - let alreadyPresent = originalContents.indexOf(contentsToInsert) > -1; - let insert = !alreadyPresent; - let insertBehavior = 'end'; - - if (options.before) { insertBehavior = 'before'; } - if (options.after) { insertBehavior = 'after'; } - - if (options.force) { insert = true; } - - if (insert) { - if (insertBehavior === 'end') { - contentsToWrite += contentsToInsert; - } else { - let contentMarker = options[insertBehavior]; - let contentMarkerIndex = contentsToWrite.indexOf(contentMarker); - - if (contentMarkerIndex !== -1) { - let insertIndex = contentMarkerIndex; - if (insertBehavior === 'after') { insertIndex += contentMarker.length; } - - contentsToWrite = contentsToWrite.slice(0, insertIndex) + - contentsToInsert + EOL + - contentsToWrite.slice(insertIndex); - } - } - } - - let returnValue = { - path: fullPath, - originalContents, - contents: contentsToWrite, - inserted: false, - }; - - if (contentsToWrite !== originalContents) { - returnValue.inserted = true; - - return fs.writeFile(fullPath, contentsToWrite) - .then(() => returnValue); - - } else { - return Promise.resolve(returnValue); - } -} - -module.exports = insertIntoFile; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/merge-blueprint-options.js b/packages/@angular/cli/ember-cli/lib/utilities/merge-blueprint-options.js deleted file mode 100644 index 1420638b0b60..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/merge-blueprint-options.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; - -const SilentError = require('silent-error'); -const Blueprint = require('../models/blueprint'); - -/* - * Helper for commands that use a blueprint to merge the blueprint's options - * into the command's options so they can be passed in. Needs to be invoked - * with `this` pointing to the command object, e.g. - * - * var mergeBlueprintOptions = require('../utilities/merge-blueprint-options'); - * - * Command.extend({ - * beforeRun: mergeBlueprintOptions - * }) - */ -module.exports = function(rawArgs) { - if (rawArgs.length === 0) { - return; - } - // merge in blueprint availableOptions - let blueprint; - try { - blueprint = Blueprint.lookup(rawArgs[0], { - paths: this.project.blueprintLookupPaths(), - }); - this.registerOptions(blueprint); - } catch (e) { - SilentError.debugOrThrow(`ember-cli/commands/${this.name}`, e); - } -}; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js b/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js deleted file mode 100644 index 2ca7076ab55c..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -const fs = require('fs-extra'); -const temp = require('temp'); -const denodeify = require('denodeify'); - -const mkdirTemp = denodeify(temp.mkdir); - -function mkTmpDirIn(dir) { - return fs.pathExists(dir).then(doesExist => { - if (!doesExist) { - return fs.mkdir(dir); - } - }).then(() => mkdirTemp({ dir })); -} - -module.exports = mkTmpDirIn; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/normalize-blueprint-option.js b/packages/@angular/cli/ember-cli/lib/utilities/normalize-blueprint-option.js deleted file mode 100644 index 64db5258c586..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/normalize-blueprint-option.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const path = require('path'); - -module.exports = function normalizeBlueprintOption(blueprint) { - return blueprint[0] === '.' ? path.resolve(process.cwd(), blueprint) : blueprint; -}; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js b/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js deleted file mode 100644 index a7a7a5f7d791..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -const spawn = require('child_process').spawn; - -function openEditor(file) { - if (!openEditor.canEdit()) { - throw new Error('EDITOR environment variable is not set'); - } - - if (!file) { - throw new Error('No `file` option provided'); - } - - let editorArgs = openEditor._env().EDITOR.split(' '); - let editor = editorArgs.shift(); - let editProcess = openEditor._spawn(editor, [file].concat(editorArgs), { stdio: 'inherit' }); - - return new Promise((resolve, reject) => { - editProcess.on('close', code => { - if (code === 0) { - resolve(); - } else { - reject(); - } - }); - }); -} - -openEditor.canEdit = function() { - return openEditor._env().EDITOR !== undefined; -}; - -openEditor._env = function() { - return process.env; -}; - -openEditor._spawn = function() { - return spawn.apply(this, arguments); -}; - -module.exports = openEditor; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/parse-options.js b/packages/@angular/cli/ember-cli/lib/utilities/parse-options.js deleted file mode 100644 index bed78bf0360e..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/parse-options.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -module.exports = function parseOptions(args) { - return args.reduce((result, arg) => { - let parts = arg.split(':'); - result[parts[0]] = parts.slice(1).join(':'); - return result; - }, {}); -}; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/printable-properties.js b/packages/@angular/cli/ember-cli/lib/utilities/printable-properties.js deleted file mode 100644 index 2fe13f045493..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/printable-properties.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; - -var commandProperties = [ - 'name', - 'description', - 'aliases', - 'works', - 'availableOptions', - 'anonymousOptions' -]; -var blueprintProperties = [ - 'name', - 'aliases', - 'description', - 'availableOptions', - 'anonymousOptions', - 'overridden' -]; - -function forEachWithProperty(properties, forEach, context) { - return properties.filter(function(key) { - return this[key] !== undefined; - }, context).forEach(forEach, context); -} - -module.exports = { - command: { - forEachWithProperty: function(forEach, context) { - return forEachWithProperty(commandProperties, forEach, context); - } - }, - blueprint: { - forEachWithProperty: function(forEach, context) { - return forEachWithProperty(blueprintProperties, forEach, context); - } - } -}; diff --git a/packages/@angular/cli/ember-cli/lib/utilities/sequence.js b/packages/@angular/cli/ember-cli/lib/utilities/sequence.js deleted file mode 100644 index 23f472877b86..000000000000 --- a/packages/@angular/cli/ember-cli/lib/utilities/sequence.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -/* - * - * given an array of functions, that may or may not return promises sequence - * will invoke them sequentially. If a promise is encountered sequence will - * wait until it fulfills before moving to the next entry. - * - * ```js - * var tasks = [ - * function() { return Promise.resolve(1); }, - * 2, - * function() { return timeout(1000).then(function() { return 3; } }, - * ]; - * - * sequence(tasks).then(function(results) { - * results === [ - * 1, - * 2, - * 3 - * ] - * }); - * ``` - * - * @method sequence - * @param tasks - * @return Promise<Array> - * - */ -module.exports = function sequence(tasks) { - let length = tasks.length; - let current = Promise.resolve(); - let results = new Array(length); - - for (let i = 0; i < length; ++i) { - current = results[i] = current.then(tasks[i]); - } - - return Promise.all(results); -}; diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json index 90a4e859e32e..1bd4f816e197 100644 --- a/packages/@angular/cli/package.json +++ b/packages/@angular/cli/package.json @@ -40,8 +40,6 @@ "css-loader": "^0.28.1", "cssnano": "^3.10.0", "denodeify": "^1.2.1", - "diff": "^3.1.0", - "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.0.0", "exports-loader": "^0.6.3", "extract-text-webpack-plugin": "3.0.0", @@ -52,16 +50,13 @@ "heimdalljs": "^0.2.4", "heimdalljs-logger": "^0.1.9", "html-webpack-plugin": "^2.29.0", - "inflection": "^1.7.0", "inquirer": "^3.0.0", - "isbinaryfile": "^3.0.0", "karma-source-map-support": "^1.2.0", "less": "^2.7.2", "less-loader": "^4.0.5", "license-webpack-plugin": "^0.5.1", "lodash": "^4.11.1", "memory-fs": "^0.4.1", - "minimatch": "^3.0.3", "node-modules-path": "^1.0.0", "nopt": "^4.0.1", "opn": "~5.1.0", @@ -82,10 +77,8 @@ "style-loader": "^0.13.1", "stylus": "^0.54.5", "stylus-loader": "^3.0.1", - "temp": "0.8.3", "typescript": ">=2.0.0 <2.5.0", "url-loader": "^0.5.7", - "walk-sync": "^0.3.1", "webpack": "~3.4.1", "webpack-dev-middleware": "^1.11.0", "webpack-dev-server": "~2.5.1", diff --git a/packages/@angular/cli/utilities/ast-utils.ts b/packages/@angular/cli/utilities/ast-utils.ts deleted file mode 100644 index 0d0a07fca32f..000000000000 --- a/packages/@angular/cli/utilities/ast-utils.ts +++ /dev/null @@ -1,14 +0,0 @@ -// In order to keep refactoring low, simply export from ast-tools. -// TODO: move all dependencies of this file to ast-tools directly. -export { - getSource, - getSourceNodes, - findNodes, - insertAfterLastOccurrence, - getContentOfKeyLiteral, - getDecoratorMetadata, - addDeclarationToModule, - addProviderToModule, - addImportToModule, - addExportToModule -} from '../lib/ast-tools'; diff --git a/packages/@angular/cli/utilities/find-parent-module.ts b/packages/@angular/cli/utilities/find-parent-module.ts deleted file mode 100644 index 027ed87ed5c3..000000000000 --- a/packages/@angular/cli/utilities/find-parent-module.ts +++ /dev/null @@ -1,37 +0,0 @@ -import * as fs from 'fs'; -import * as path from 'path'; -const SilentError = require('silent-error'); - -export default function findParentModule( - projectRoot: string, appRoot: string, currentDir: string): string { - - const sourceRoot = path.join(projectRoot, appRoot, 'app'); - - // trim currentDir - currentDir = currentDir.replace(path.join(appRoot, 'app'), ''); - - let pathToCheck = path.join(sourceRoot, currentDir); - - while (pathToCheck.length >= sourceRoot.length) { - if (!fs.existsSync(pathToCheck)) { - pathToCheck = path.dirname(pathToCheck); - continue; - } - // TODO: refactor to not be based upon file name - const files = fs.readdirSync(pathToCheck) - .filter(fileName => !fileName.endsWith('routing.module.ts')) - .filter(fileName => fileName.endsWith('.module.ts')) - .filter(fileName => fs.statSync(path.join(pathToCheck, fileName)).isFile()); - - if (files.length === 1) { - return path.join(pathToCheck, files[0]); - } else if (files.length > 1) { - throw new SilentError(`Multiple module files found: ${JSON.stringify(files)}`); - } - - // move to parent directory - pathToCheck = path.dirname(pathToCheck); - } - - throw new SilentError('No module files found'); -} diff --git a/packages/@angular/cli/utilities/route-utils.ts b/packages/@angular/cli/utilities/route-utils.ts deleted file mode 100644 index 267789c32224..000000000000 --- a/packages/@angular/cli/utilities/route-utils.ts +++ /dev/null @@ -1,11 +0,0 @@ -// In order to keep refactoring low, simply export from ast-tools. -// TODO: move all dependencies of this file to ast-tools directly. -export { - bootstrapItem, - insertImport, - addPathToRoutes, - addItemsToRouteProperties, - confirmComponentExport, - resolveComponentPath, - applyChanges -} from '../lib/ast-tools'; diff --git a/tests/acceptance/new.spec.ts b/tests/acceptance/new.spec.ts index 705eb4b978e3..7840f238309b 100644 --- a/tests/acceptance/new.spec.ts +++ b/tests/acceptance/new.spec.ts @@ -1,16 +1,9 @@ // tslint:disable:max-line-length import * as fs from 'fs-extra'; import * as path from 'path'; -import * as util from 'util'; -import { EOL } from 'os'; -import { forEach } from 'lodash'; import { ng } from '../helpers'; const tmp = require('../helpers/tmp'); -const walkSync = require('walk-sync'); -const Blueprint = require('@angular/cli/ember-cli/lib/models/blueprint'); - -const root = process.cwd(); describe('Acceptance: ng new', function () { @@ -33,35 +26,6 @@ describe('Acceptance: ng new', function () { tmp.teardown('./tmp').then(() => done()); }); - function confirmBlueprintedForDir(dir: string) { - return function () { - let blueprintPath = path.join(root, dir, 'files'); - let expected: string[] = walkSync(blueprintPath); - let actual = walkSync('.').sort(); - let directory = path.basename(process.cwd()); - - forEach(Blueprint.renamedFiles, function (destFile, srcFile) { - expected[expected.indexOf(srcFile)] = destFile; - }); - - expected.forEach(function (file, index) { - expected[index] = file.replace(/__name__/g, '@angular/cli'); - }); - - expected.sort(); - - expect(directory).toBe('foo'); - expect(expected).toEqual( - actual, - EOL + ' expected: ' + util.inspect(expected) + EOL + ' but got: ' + util.inspect(actual)); - - }; - } - - function confirmBlueprinted() { - return confirmBlueprintedForDir('blueprints/ng'); - } - it('requires a valid name (!)', (done) => { return ng(['new', '!', '--skip-install', '--skip-git', '--inline-template']) .then(() => done.fail(), () => done()); @@ -93,7 +57,10 @@ describe('Acceptance: ng new', function () { it('ng new foo, where foo does not yet exist, works', (done) => { return ng(['new', 'foo', '--skip-install']) - .then(confirmBlueprinted) + .then(() => { + expect(fs.pathExistsSync('../foo')); + expect(fs.pathExistsSync('package.json')); + }) .then(done, done.fail); }); @@ -136,7 +103,6 @@ describe('Acceptance: ng new', function () { expect(!fs.pathExistsSync('foo')); }); }) - .then(confirmBlueprinted) .then(done, done.fail); }); diff --git a/yarn.lock b/yarn.lock index c248f212faa4..30a1ac0257ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,23 @@ # yarn lockfile v1 -"@angular-devkit/[email protected]": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.5.tgz#321b141126ce462843e4d13e9d5603877e044860" +"@angular-devkit/[email protected]": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz#cf397af76abe899aa909d4a735106694ca1f08cf" dependencies: loader-utils "^1.1.0" - magic-string "^0.19.1" source-map "^0.5.6" typescript "^2.3.3" -"@angular-devkit/[email protected]", "@angular-devkit/core@^0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.0.6.tgz#caf25c0c7928196e244b5fe5124256fcef6bce7c" +"@angular-devkit/[email protected]": + version "0.0.10" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.0.10.tgz#fb4d2d691d737978042cb3885813f6212c20dc2b" -"@angular-devkit/[email protected]": - version "0.0.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.9.tgz#84668c0196648de7e88e1727b2e7defbd7962dfd" +"@angular-devkit/[email protected]": + version "0.0.17" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.17.tgz#61d086a266adafd8790972c87dd8f7a44f004de6" dependencies: - "@angular-devkit/core" "0.0.6" + "@angular-devkit/core" "0.0.10" "@ngtools/json-schema" "^1.1.0" minimist "^1.2.0" rxjs "^5.4.2" @@ -54,11 +53,9 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" -"@schematics/[email protected]": - version "0.0.9" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.9.tgz#c9ff31078af3079990e448ddd07b735ed3c1b4bd" - dependencies: - "@angular-devkit/schematics" "0.0.9" +"@schematics/[email protected]": + version "0.0.27" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.0.27.tgz#5067451954b59545f9e96a1b84588a6757fbc563" "@types/chalk@^0.4.28": version "0.4.31" @@ -1580,12 +1577,6 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -ember-cli-normalize-entity-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7" - dependencies: - silent-error "^1.0.0" - ember-cli-string-utils@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" @@ -2562,10 +2553,6 @@ [email protected]: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" -inflection@^1.7.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2859,10 +2846,6 @@ [email protected], isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -isbinaryfile@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3091,9 +3074,9 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -license-webpack-plugin@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-0.4.3.tgz#f9d88d4ebc04407a0061e8ccac26571f88e51a16" +license-webpack-plugin@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-0.5.1.tgz#68d8af103486a9c4ebceddb7ed5d3bd61f383be4" dependencies: object-assign "^4.1.0" @@ -3225,12 +3208,6 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" -magic-string@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201" - dependencies: - vlq "^0.2.1" - magic-string@^0.22.3: version "0.22.3" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.3.tgz#047989d99bfc7cbdefba1604adc8912551cd7ef1" @@ -3354,7 +3331,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies:
27b22b02dccef2e2d4f2f1f03910f4b70c676f84
2022-12-09 04:19:55
Alan Agius
fix(@angular-devkit/build-angular): include sources in generated
false
include sources in generated
fix
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts index b1ec2fcec2d0..eac8f9ab8d54 100644 --- a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts +++ b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts @@ -360,6 +360,7 @@ function getSassLoaderOptions( quietDeps: !verbose, verbose, syntax: indentedSyntax ? 'indented' : 'scss', + sourceMapIncludeSources: true, }), } : {
eaccc04852b3eec3a0fb62218b46fb248bf91386
2018-08-02 22:42:22
Hans Larsen
docs: change the changelog commits format
false
change the changelog commits format
docs
diff --git a/scripts/changelog.ts b/scripts/changelog.ts index eeb618e584da..88e8c8030bf2 100644 --- a/scripts/changelog.ts +++ b/scripts/changelog.ts @@ -10,6 +10,7 @@ import { JsonObject, logging } from '@angular-devkit/core'; import * as fs from 'fs'; import * as path from 'path'; import * as semver from 'semver'; +import { packages } from '../lib/packages'; const changelogTemplate = require('./templates/changelog').default; @@ -86,6 +87,7 @@ export default function(args: ChangelogOptions, logger: logging.Logger) { ...args, include: (x: string, v: {}) => require('./' + path.join('templates', x)).default(v), commits, + packages, }); if (args.stdout || !githubToken) { diff --git a/scripts/templates/changelog-feat.ejs b/scripts/templates/changelog-feat.ejs index 041254099408..17ccb75d33cc 100644 --- a/scripts/templates/changelog-feat.ejs +++ b/scripts/templates/changelog-feat.ejs @@ -4,20 +4,36 @@ } const shortSha = hash && hash.slice(0, 7); -%>| <%# Commit: %><% +%> +<tr> + <%# Commit: %> + <td><% if (shortSha) { - %>[![Bug Fix](https://img.shields.io/badge/<%= shortSha %>-feat-yellow.svg)](https://github.com/angular/angular-cli/commit/<%= hash %>)<% - } %><% -%>| <%# Desc: %><%= subject -%>| <%# Notes: %><% - for (const reference of references) { - if (!reference.action || !reference.issue) { - continue; - } + %> +<a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img + align="top" + title="Bug Fix" src="https://img.shields.io/badge/<%= shortSha %>-feat-blue.svg" /> +</a><% + } %> + </td> - const issue = reference.issue; - const owner = reference.owner || 'angular'; - const repository = reference.repository || 'angular-cli'; - %>[Closes #<%= issue %>](https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>)<% - } -%> + <%# Desc: %> + <td><%= subject %></td> + + <%# Notes: %> + <td><% + for (const reference of references) { + if (!reference.action || !reference.issue) { + continue; + } + + const issue = reference.issue; + const owner = reference.owner || 'angular'; + const repository = reference.repository || 'angular-cli'; + %> +<a href="https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>"> + [Closes #<%= issue %>]<br /> +</a> + <% } %> + </td> +</tr> \ No newline at end of file diff --git a/scripts/templates/changelog-fix.ejs b/scripts/templates/changelog-fix.ejs index 9ea8af7f98d0..8ccfbe25f919 100644 --- a/scripts/templates/changelog-fix.ejs +++ b/scripts/templates/changelog-fix.ejs @@ -4,20 +4,37 @@ } const shortSha = hash && hash.slice(0, 7); -%>| <%# Commit: %><% +%> +<tr> + <%# Commit: %> + <td><% if (shortSha) { - %>[![Bug Fix](https://img.shields.io/badge/<%= shortSha %>-fix-green.svg)](https://github.com/angular/angular-cli/commit/<%= hash %>)<% - } %><% -%>| <%# Desc: %><%= subject -%>| <%# Notes: %><% - for (const reference of references) { - if (!reference.action || !reference.issue) { - continue; - } + %> +<a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img + align="top" + title="Feature" src="https://img.shields.io/badge/<%= shortSha %>-fix-green.svg" /> +</a><% + } %> + </td> - const issue = reference.issue; - const owner = reference.owner || 'angular'; - const repository = reference.repository || 'angular-cli'; - %>[Closes #<%= issue %>](https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>)<% - } -%> + <%# Desc: %> + <td><%= subject %></td> + + <%# Notes: %> + <td><% + for (const reference of references) { + if (!reference.action || !reference.issue) { + continue; + } + + const issue = reference.issue; + const owner = reference.owner || 'angular'; + const repository = reference.repository || 'angular-cli'; + %> + +<a href="https://github.com/<%= owner %>/<%= repository %>/issues/<%= issue %>"> + [Closes #<%= issue %>]<br /> +</a> + <% } %> + </td> +</tr> \ No newline at end of file diff --git a/scripts/templates/changelog.ejs b/scripts/templates/changelog.ejs index 25337d7adc45..6dab1fd6906e 100644 --- a/scripts/templates/changelog.ejs +++ b/scripts/templates/changelog.ejs @@ -3,6 +3,7 @@ { from: 'v1.2.3', to: 'v1.2.4', + packages: { /* The PackageInfoMap from "lib/packages.ts" */ // For a commit with description: // ------------------------------------------------------ // feat(@angular/pwa): add something to this @@ -29,12 +30,30 @@ ], } ] } -%># Commits +%><% + // Sort those packages to the top, in those orders. Others will be sorted alphabetically. + const CUSTOM_SORT_ORDER = [ + '@angular/cli', + '@schematics/angular', + '@angular-devkit/architect-cli', + '@angular-devkit/schematics-cli', + ]; +%> +# Commits + +<table> +<tbody> <% // Get unique scopes. const scopes = commits.map(x => x.scope) .sort() - .filter((v, i, a) => v !== a[i - 1]); + .filter((v, i, a) => v !== a[i - 1]) + .sort((a, b) => { + // Sort using the sorting order above, or against each others if undefined. + const aOrder = CUSTOM_SORT_ORDER.indexOf(a); + const bOrder = CUSTOM_SORT_ORDER.indexOf(b); + return aOrder == -1 ? bOrder == -1 ? (a || '').localeCompare(b || '') : 1 : aOrder - bOrder; + }); for (const scope of scopes) { const scopeCommits = commits @@ -45,19 +64,35 @@ continue; } %> -## `<%= scope || 'Misc' %>` - -| Commit | Description | Notes | -|:------:| ----------- | -----:| +<tr><td colspan=3><h3><% + if (scope) { + %><%= scope %> (<%= packages[scope].version %>)<% + } else { + %>Misc<% + } +%></h3></td></tr> + <tr> + <td><b>Commit</b> + <td><b>Description</b> + <td><b>Notes</b> + </tr> <% + let nbRows = 0; for (const commit of scopeCommits) { + nbRows++; switch (commit.type) { case 'fix': %><%= include('./changelog-fix', commit) %><% break; case 'feat': %><%= include('./changelog-feat', commit) %><% break; } } -%> + + // Add an empty row to get the alternating colors in sync. + if (scope != scopes[scopes.length - 1] && nbRows % 2) { %> +<tr></tr> + <% } %> <% } %> +</tbody> +</table> ----
79c55deb1da76ffd59f6a5c0e1ea922de38d9822
2021-11-29 23:18:06
Alan Agius
build: update Chrome driver to `97.0.4692.20`
false
update Chrome driver to `97.0.4692.20`
build
diff --git a/package.json b/package.json index 80419871771b..276bae9f7d0d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "validate": "node ./bin/devkit-admin validate", "postinstall": "yarn webdriver-update && yarn husky install", "//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads", - "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 92.0.4515.107", + "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 97.0.4692.20", "public-api:check": "node goldens/public-api/manage.js test", "public-api:update": "node goldens/public-api/manage.js accept", "ts-circular-deps:check": "ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js",
978e7731822fa6f2d31eebfd9dc19402ee6bc2c6
2016-07-29 01:16:32
Filipe Silva
chore(travis): cleanup travis.yml (#1479)
false
cleanup travis.yml (#1479)
chore
diff --git a/.travis.yml b/.travis.yml index f4f5e0bd6d67..dc16f03e5a5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,30 @@ dist: trusty sudo: required +language: node_js +node_js: + - "5" + - "6" +os: + - linux + - osx env: global: - DBUS_SESSION_BUS_ADDRESS=/dev/null matrix: - - NODE_VERSION=5 SCRIPT=lint - - NODE_VERSION=5 SCRIPT=test - - NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test - - NODE_VERSION=6 SCRIPT=test - - NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test -os: - - linux - - osx + - SCRIPT=lint + - SCRIPT=test + - TARGET=mobile SCRIPT=mobile_test matrix: exclude: + - node_js: "6" + env: SCRIPT=lint - os: osx - env: NODE_VERSION=5 SCRIPT=lint + node_js: "5" + env: SCRIPT=lint - os: osx - env: NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test - - os: osx - env: NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test - -script: - - npm run-script $SCRIPT + env: TARGET=mobile SCRIPT=mobile_test before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.1/install.sh | bash; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ~/.nvm/nvm-exec; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi @@ -34,11 +32,11 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi - if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi - - nvm install $NODE_VERSION - npm config set spin false - npm config set progress false + install: - - node --version - - npm --version - - git --version - npm install --no-optional + +script: + - npm run-script $SCRIPT \ No newline at end of file
1690a828d73ebb090cd44b3176c734082e7a21e0
2016-06-16 22:03:50
Filipe Silva
fix(lint): add missing rulesDirectory (#1108)
false
add missing rulesDirectory (#1108)
fix
diff --git a/addon/ng2/blueprints/ng2/files/tslint.json b/addon/ng2/blueprints/ng2/files/tslint.json index 490c4bd51da5..7b13bd1790a4 100644 --- a/addon/ng2/blueprints/ng2/files/tslint.json +++ b/addon/ng2/blueprints/ng2/files/tslint.json @@ -1,4 +1,7 @@ { + "rulesDirectory": [ + "node_modules/codelyzer" + ], "rules": { "class-name": true, "comment-format": [
f728f2f5267efeb72eefe60d281f0751457b9bfc
2024-12-17 22:17:09
Paul Gschwendtner
build: migrate `angular-devkit/architect-cli` to `ts_project`
false
migrate `angular-devkit/architect-cli` to `ts_project`
build
diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel index 45261fd6b374..f5894c1c9ef9 100644 --- a/packages/angular_devkit/architect_cli/BUILD.bazel +++ b/packages/angular_devkit/architect_cli/BUILD.bazel @@ -1,4 +1,5 @@ -load("//tools:defaults.bzl", "pkg_npm", "ts_library") +load("//tools:defaults.bzl", "pkg_npm") +load("//tools:interop.bzl", "ts_project") # Copyright Google Inc. All Rights Reserved. # @@ -8,22 +9,23 @@ licenses(["notice"]) package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "architect_cli", - package_name = "@angular-devkit/architect-cli", srcs = [ "bin/architect.ts", ] + glob(["src/**/*.ts"]), - module_name = "@angular-devkit/architect-cli", - deps = [ - "//packages/angular_devkit/architect", - "//packages/angular_devkit/architect/node", + interop_deps = [ "//packages/angular_devkit/core", "//packages/angular_devkit/core/node", - "@npm//@types/node", - "@npm//@types/progress", - "@npm//@types/yargs-parser", - "@npm//ansi-colors", + ], + module_name = "@angular-devkit/architect-cli", + deps = [ + "//:root_modules/@types/node", + "//:root_modules/@types/progress", + "//:root_modules/@types/yargs-parser", + "//:root_modules/ansi-colors", + "//packages/angular_devkit/architect:architect_rjs", + "//packages/angular_devkit/architect/node:node_rjs", ], ) diff --git a/tsconfig.json b/tsconfig.json index 73c91f774209..c11293fd8e48 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,7 +24,7 @@ ], "@angular-devkit/schematics/tools": ["./packages/angular_devkit/schematics/tools/index"], "@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"], - "@angular-devkit/architect/testing": ["./packages/angular_devkit/architect/testing/index"], + "@angular-devkit/architect/*": ["./packages/angular_devkit/architect/*/index"], "@angular-devkit/build-webpack": ["./packages/angular_devkit/build_webpack"], "@angular-devkit/*": ["./packages/angular_devkit/*/src"], "@angular/*": ["./packages/angular/*/src"],
50ca94ac6506709dd0f777ca2c21e0f4a0f90e08
2020-07-13 21:49:58
Alan Agius
style: format ngsw-config
false
format ngsw-config
style
diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json.template b/packages/schematics/angular/service-worker/files/ngsw-config.json.template index 0adc9fb8690f..38931a42d7cd 100644 --- a/packages/schematics/angular/service-worker/files/ngsw-config.json.template +++ b/packages/schematics/angular/service-worker/files/ngsw-config.json.template @@ -14,7 +14,8 @@ "/*.js" ] } - }, { + }, + { "name": "assets", "installMode": "lazy", "updateMode": "prefetch",
f7c7619556e6eecef8c81dcceb82d33bf19044e2
2019-07-31 02:55:21
Alan Agius
fix(@angular-devkit/build-angular): escape dot in js extensions to match literally
false
escape dot in js extensions to match literally
fix
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts index c393254f507a..9afad63c7cc3 100644 --- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts +++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts @@ -403,11 +403,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration { parser: { system: true }, }, { - test: /[\/\\]hot[\/\\]emitter.js$/, + test: /[\/\\]hot[\/\\]emitter\.js$/, parser: { node: { events: true } }, }, { - test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl.js$/, + test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl\.js$/, parser: { node: { querystring: true } }, }, { @@ -416,7 +416,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration { }, { test: /\.js$/, - exclude: /(ngfactory|ngstyle).js$/, + exclude: /(ngfactory|ngstyle)\.js$/, enforce: 'pre', ...sourceMapUseRule, },
f9135d6f36c0c1445bbf6fc1bd883585dcab2655
2021-10-14 06:29:17
Joey Perrott
docs: release notes for the v13.0.0-rc.0 release
false
release notes for the v13.0.0-rc.0 release
docs
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c7d86c22969..d5c850e372d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,47 @@ +<a name="13.0.0-rc.0"></a> + +# 13.0.0-rc.0 (2021-10-13) + +### @angular/cli + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------- | +| [ded510594](https://github.com/angular/angular-cli/commit/ded51059423f3e2710baee344d337563fdbe396b) | fix | accept `UA-00000-0` format in analytics `tracking` id | +| [d2a992274](https://github.com/angular/angular-cli/commit/d2a99227427c9a9a9384740f1676019aed179630) | fix | add engine field support for npm 8 and higher | +| [cf03daf9e](https://github.com/angular/angular-cli/commit/cf03daf9ef89e982550f0822004f664af4872e01) | fix | generate new random user ID when passing empty string to `uuid` | + +### @schematics/angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------ | +| [e58226ee9](https://github.com/angular/angular-cli/commit/e58226ee948ea88f27a81d50d71945b5c9c39ee3) | fix | don't export `renderModuleFactory` from server file | +| [0ec0ad8a4](https://github.com/angular/angular-cli/commit/0ec0ad8a4dba4a778b368c5cd76ef13fb370b310) | fix | remove `target` and `lib` options for library tsconfig | +| [16e58a58c](https://github.com/angular/angular-cli/commit/16e58a58c05f5d661d46bfd53d5074e5775c48c6) | fix | wrap bootstrapping code in an HMR compatible manner | + +### @angular-devkit/build-angular + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------ | +| [427a9ee97](https://github.com/angular/angular-cli/commit/427a9ee9738c0911caeaba5fb4b59d183ffe6244) | fix | update workspace tsconfig lib es2020 | + +### @angular-devkit/core + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------ | +| [9874aff71](https://github.com/angular/angular-cli/commit/9874aff71ecb5f3baf6c1dcc489581d1dcb58491) | fix | add missing option peer dependency on `chokidar` | + +### @angular-devkit/schematics + +| Commit | Type | Description | +| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------- | +| [bdd89ae84](https://github.com/angular/angular-cli/commit/bdd89ae84ad6919b670dde862de72f562c86d0c5) | fix | handle zero or negative length removals in update buffer | + +## Special Thanks + +Alan Agius, Charles Lyding, Joey Perrott and Kristiyan Kostadinov + +<!-- CHANGELOG SPLIT MARKER --> + <a name="12.2.10"></a> # 12.2.10 (2021-10-13)
0152ab93a91cb24ba5e791dd349ffe7f3b2933a9
2024-03-14 15:55:13
Angular Robot
build: update angular
false
update angular
build
diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index 9dd335ec2791..633eabd317f8 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@0160e8961d844eb2063575623582802820b60890 + - uses: angular/dev-infra/github-actions/branch-manager@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1eeec6d981c9..376dd236b8a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup ESLint Caching uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 with: @@ -75,11 +75,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Build release targets @@ -96,11 +96,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Run tests @@ -128,13 +128,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -151,13 +151,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -169,13 +169,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/configure-remote@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -203,11 +203,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - name: Install node modules run: yarn install --frozen-lockfile - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@0160e8961d844eb2063575623582802820b60890 + uses: angular/dev-infra/github-actions/bazel/setup@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index cff6cb6004b4..b7d9a807f66d 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@0160e8961d844eb2063575623582802820b60890 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: angular/dev-infra/github-actions/post-approval-changes@0160e8961d844eb2063575623582802820b60890 + - uses: angular/dev-infra/github-actions/post-approval-changes@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 5e630582fac2..6fc0902e731c 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@0160e8961d844eb2063575623582802820b60890 + - uses: angular/dev-infra/github-actions/feature-request@169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9 with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/package.json b/package.json index b15addcf6208..941f09619200 100644 --- a/package.json +++ b/package.json @@ -60,23 +60,23 @@ }, "devDependencies": { "@ampproject/remapping": "2.3.0", - "@angular/animations": "17.3.0-rc.0", - "@angular/bazel": "https://github.com/angular/bazel-builds.git#a6032f35e2c047fa7a2aa82677f6c2bc7e9f558d", - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#7879726ace6e66a3f8abbd1c0a9071a4d39d3fed", + "@angular/animations": "17.3.0", + "@angular/bazel": "https://github.com/angular/bazel-builds.git#29907b8e69dee270e2ec15eaa378c80d507af77b", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2884ef38d4259cca64c70d38a75f4de1e881531", "@angular/cdk": "17.3.0-rc.0", - "@angular/common": "17.3.0-rc.0", - "@angular/compiler": "17.3.0-rc.0", - "@angular/compiler-cli": "17.3.0-rc.0", - "@angular/core": "17.3.0-rc.0", - "@angular/forms": "17.3.0-rc.0", - "@angular/localize": "17.3.0-rc.0", + "@angular/common": "17.3.0", + "@angular/compiler": "17.3.0", + "@angular/compiler-cli": "17.3.0", + "@angular/core": "17.3.0", + "@angular/forms": "17.3.0", + "@angular/localize": "17.3.0", "@angular/material": "17.3.0-rc.0", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#79af3851796170f37990ebad7368b374d53ee42c", - "@angular/platform-browser": "17.3.0-rc.0", - "@angular/platform-browser-dynamic": "17.3.0-rc.0", - "@angular/platform-server": "17.3.0-rc.0", - "@angular/router": "17.3.0-rc.0", - "@angular/service-worker": "17.3.0-rc.0", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#56510c47d45c616826d46d0e259db8b0295334bd", + "@angular/platform-browser": "17.3.0", + "@angular/platform-browser-dynamic": "17.3.0", + "@angular/platform-server": "17.3.0", + "@angular/router": "17.3.0", + "@angular/service-worker": "17.3.0", "@babel/core": "7.24.0", "@babel/generator": "7.23.6", "@babel/helper-annotate-as-pure": "7.22.5", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index a9d95bd14eba..b1db854d54bb 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "@angular-devkit/core": "0.0.0-PLACEHOLDER", - "@angular/compiler": "17.2.4", - "@angular/compiler-cli": "17.2.4", + "@angular/compiler": "17.3.0", + "@angular/compiler-cli": "17.3.0", "typescript": "5.4.2", "webpack": "5.90.3" } diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 5a1dad5fc39d..5cd95b35b4e9 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#fef1cd29a3e18c900f6be4081f676bb81a640268", - "@angular/cdk": "github:angular/cdk-builds#4631f559809b6b1667c41df8f81745996367ec15", - "@angular/common": "github:angular/common-builds#684da70ec27790ec31fe7a89b86cc62c986fb15f", - "@angular/compiler": "github:angular/compiler-builds#57411c13ce34f713f678e2365d515674f07b5a40", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#6e9a4113184b8ecdaca9a8bc439e41c54e23e74d", - "@angular/core": "github:angular/core-builds#9b29ac689d7ea5d4a2ddb2cf4fadb6ddb373e04d", - "@angular/forms": "github:angular/forms-builds#1b0cca0af37f51f82ae7ec531d3fce3771362c77", - "@angular/language-service": "github:angular/language-service-builds#8106beedd02d86310c4688997d7c41a4ccff270e", - "@angular/localize": "github:angular/localize-builds#7217dba76e3f3593a6f5248e0780eeda20a7ea39", - "@angular/material": "github:angular/material-builds#6ad40e8d80cf58f89ecf93dea44bc112480f8a6a", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#77afda068c6b5eb048a00b67b922b4222aac442f", - "@angular/platform-browser": "github:angular/platform-browser-builds#1d2196b6f4f08493a7182e8c0a18fa3eb53505ea", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#763cc45a8b2bcaba858f6ede0f777c2ee10108cc", - "@angular/platform-server": "github:angular/platform-server-builds#605474dfc4f56018678cdd8011f5a79ad6e0bb10", - "@angular/router": "github:angular/router-builds#48627724abbec642f023ae73807240420af85268", - "@angular/service-worker": "github:angular/service-worker-builds#55582825df9d0d92e1e8bdb46ada4b3ed4fb6744" + "@angular/animations": "github:angular/animations-builds#1b70d8a729378986c0ab1661ce91091fa48d3645", + "@angular/cdk": "github:angular/cdk-builds#40b0bfc75cf92f5a0fbaa3f8d7dbe5db7a12adc7", + "@angular/common": "github:angular/common-builds#6995d45b17f3deb98b295e7b10bc42e1efa8043e", + "@angular/compiler": "github:angular/compiler-builds#1a9b64ff60adcfdf4819174873eb31b6b53b77e7", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#a0c384d7bfd4954274abab97270379cf7d16aca4", + "@angular/core": "github:angular/core-builds#36cde3315447c3e24cecc14a9c2ff277fabe10cb", + "@angular/forms": "github:angular/forms-builds#9433700a72845c5624eb59fee20a41b28a4f34c1", + "@angular/language-service": "github:angular/language-service-builds#37b48a8c2efd3537eb05e80fc7f60659e2bffa42", + "@angular/localize": "github:angular/localize-builds#caaeaf9d59307fc912a70da6f3e216f830dd5530", + "@angular/material": "github:angular/material-builds#35523365d6c09e8bcd5cfc26f1f9a04354bad1c1", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#8648b60a3dd0248df6513eda56e449442aadc5f4", + "@angular/platform-browser": "github:angular/platform-browser-builds#1389a45151bbc6a3b02941d914ef8b26148ea628", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#7e18db8016d06f3dc39a4b55aa7eb2277144dc75", + "@angular/platform-server": "github:angular/platform-server-builds#e12499947685b18411e84965f14db3cd2b48d340", + "@angular/router": "github:angular/router-builds#093348eac5d7d3fe788543aa43ac2d43da87047c", + "@angular/service-worker": "github:angular/service-worker-builds#9974f6076d6f0d8ccabdd7269bb6f4eb33d05f2a" } } diff --git a/yarn.lock b/yarn.lock index e218eb96710a..f193af4aa896 100644 --- a/yarn.lock +++ b/yarn.lock @@ -122,17 +122,17 @@ rxjs "7.8.1" source-map "0.7.4" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.0-rc.0.tgz#9a52291e277048bd1f009e6821e2d0b48b9fed44" - integrity sha512-R7C1l5BYk0nXl5F5uOtUKAmuYqsQprKBB4BNVlTfb7oZH+UsoNMYryQ7XAWs/FjMpIHjuDChNv8nt/J+AbS2FA== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.0.tgz#8dd498aff5bc75b60409d5ea5442d0200e538d01" + integrity sha512-H7R3c2E479CPpaX6bU84F8u4JV+IFEfM8BUOgrbcI9tF16m6C2eJbl8IqNuW0yADuTarRSlOT7TW0qyrmcxhRw== dependencies: tslib "^2.3.0" -"@angular/bazel@https://github.com/angular/bazel-builds.git#a6032f35e2c047fa7a2aa82677f6c2bc7e9f558d": - version "18.0.0-next.0+sha-47f79e7" - uid a6032f35e2c047fa7a2aa82677f6c2bc7e9f558d - resolved "https://github.com/angular/bazel-builds.git#a6032f35e2c047fa7a2aa82677f6c2bc7e9f558d" +"@angular/bazel@https://github.com/angular/bazel-builds.git#29907b8e69dee270e2ec15eaa378c80d507af77b": + version "18.0.0-next.0+sha-700c052" + uid "29907b8e69dee270e2ec15eaa378c80d507af77b" + resolved "https://github.com/angular/bazel-builds.git#29907b8e69dee270e2ec15eaa378c80d507af77b" dependencies: "@microsoft/api-extractor" "^7.24.2" magic-string "^0.30.0" @@ -146,10 +146,10 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#7879726ace6e66a3f8abbd1c0a9071a4d39d3fed": - version "0.0.0-0160e8961d844eb2063575623582802820b60890" - uid "7879726ace6e66a3f8abbd1c0a9071a4d39d3fed" - resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#7879726ace6e66a3f8abbd1c0a9071a4d39d3fed" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2884ef38d4259cca64c70d38a75f4de1e881531": + version "0.0.0-169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9" + uid b2884ef38d4259cca64c70d38a75f4de1e881531 + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b2884ef38d4259cca64c70d38a75f4de1e881531" dependencies: "@angular-devkit/build-angular" "17.3.0-rc.0" "@angular/benchpress" "0.3.0" @@ -201,31 +201,17 @@ optionalDependencies: parse5 "^7.1.2" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.0-rc.0.tgz#e105d33a25f2707f278fac22f54c85e015120006" - integrity sha512-+7GeQoPrlPw/mhKuwOInZp+QTOnYuYR0Ytr9ulx0KWwHtViImx/g8HVWgmYNqG7dDS+gsODnwl+CAwzk0FWNUQ== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.0.tgz#d7151a1ffeb52a10e00496f850f477f1e121d66f" + integrity sha512-JnS6jbLl2RxsvGFUOBGeoyviNLEjZKRhn3uK4Ein3DENPv0BeSFMjif9Dp4ReUCnqoD4QQVG0X/r1GFaqHn2pw== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.2.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.2.4.tgz#2aa9366974723a428530fdfd29ecfa5cdfad1839" - integrity sha512-VGQx1YoYuifQZNj2/nGMEyYVYvXSWrt1ZXK43dgxPDH3jCWNncOBUYtmyCmYvxKvDz0aDO3KL8cro8c4+N0pPw== - dependencies: - "@babel/core" "7.23.9" - "@jridgewell/sourcemap-codec" "^1.4.14" - chokidar "^3.0.0" - convert-source-map "^1.5.1" - reflect-metadata "^0.2.0" - semver "^7.0.0" - tslib "^2.3.0" - yargs "^17.2.1" - -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.0-rc.0.tgz#a8a4f8e2d25d58d629c92f643c0aa68d17b351cd" - integrity sha512-GBiomXzNhtlqSPFVJ+FWBNM1jk5pRRGb/rEC94hlZFxPYtz99EODxOi9vfOaixB0ErXsoxr8ErHsuRvEuehotA== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.0.tgz#39e7dcc70793a6b246187d1def0d844b3a543047" + integrity sha512-ewo+pb0QUC69Ey15z4vPteoBeO81HitqplysOoeXbyVBjMnKmZl3343wx7ukgcI97lmj4d38d1r4AnIoO5n/Vw== dependencies: "@babel/core" "7.23.9" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -236,24 +222,17 @@ tslib "^2.3.0" yargs "^17.2.1" -"@angular/[email protected]": - version "17.2.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.2.4.tgz#82fb29e80096b1fb3f6fd4d4f2c22fdbc0bb9a9b" - integrity sha512-McSsBcoHhMkaQpHM5/wTosAKTzJY5uE6ji3z+ec5GrIJhV7jrVfa67+RUoUzHe+rlD/7oQbX1L/OaHKDP8+/mA== - dependencies: - tslib "^2.3.0" - -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.0-rc.0.tgz#1425e2111f98b07f11ab519006c91b7acbdf59b2" - integrity sha512-XCySm172Oor+4x5X8iymrI8pZRUviB7Rhmh203EPwE/CPjiW6s+LFJ64dagt/Zfbkbt6lt7di0LRSHpn3sVIAg== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.0.tgz#204d930c372ef556a18ea62cc93de2fc13d6aac8" + integrity sha512-lZBD5mFq7SzFJydZwW2jvnQGmtcU1s3e548hl4MSZpRgt13m5UmBQKbyMOvVN2WxKvWKlmDlywsAJlMSXepYig== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.0-rc.0.tgz#275b2d6f7c1b256057939d6dd66254ad761016e7" - integrity sha512-CuJtz7ou7vcj+nF8CZWO2BXmoTWiBVIHM9+4se7oZSNGGxloyi+ga8PhmNbfzSJ5x/6RacvIBObwtn4v5O8N0w== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.0.tgz#24eca359f4d530ac96d5e93679d39d910ae1a5b9" + integrity sha512-umwsNFl/wEMTCUVvNl5iieEgHA+ESxSMcjedZGFWNGnpUxKTgYFYNG41/1wNZfPrS0+uRPHuYU9IHD+NR2s/Rw== dependencies: tslib "^2.3.0" @@ -264,17 +243,17 @@ dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.0-rc.0.tgz#bcbf6cf1fb58409aa0e655a49d41e2cde50a4e27" - integrity sha512-h310J4eKnj+4TgYB5lRgL75BwP917weF+imblKFLe4oJm1YVlMaZ2zi+Gfoef7Ey+YEsagt+zuKo2dR3uHdSCg== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.0.tgz#7c6a0ea38184629722a57c6df233ea4c34dfbdc3" + integrity sha512-TnLOake1fQCmmGEOZbTjP2gbKerZ/bfEMuiFfoe7R2rUvKl4xHGAHp99bqf7bUyAbB8ZgmPZc9/VHrrts8UNyA== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.0-rc.0.tgz#deaf905967837498da8a025167691df710e0e179" - integrity sha512-XLmqHZOP0QVhqFuRx/c25mP1ycTa+DcitMLGVuC8u/0MxXFHQK3RbVB66vPnu+GkUkql5zk4ERDzpwN1dx6hXQ== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.0.tgz#ee466d8bd4d010a3184271f317dc9e001267b76f" + integrity sha512-f1Ilf7TtG1WoxDxazC8Wn9BP8Nx9z/sD9JWyO1ov8f7zyvtfuqVa8MVuQcggpRcgEi/4wRMGzOOANgs+CovYxw== dependencies: "@babel/core" "7.23.9" "@types/babel__core" "7.20.5" @@ -335,47 +314,47 @@ "@material/typography" "15.0.0-canary.7f224ddd4.0" tslib "^2.3.0" -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#79af3851796170f37990ebad7368b374d53ee42c": - version "0.0.0-0160e8961d844eb2063575623582802820b60890" - uid "79af3851796170f37990ebad7368b374d53ee42c" - resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#79af3851796170f37990ebad7368b374d53ee42c" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#56510c47d45c616826d46d0e259db8b0295334bd": + version "0.0.0-169e04c9aa7e1c5b1bb1b41dbfd38f05d84310b9" + uid "56510c47d45c616826d46d0e259db8b0295334bd" + resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#56510c47d45c616826d46d0e259db8b0295334bd" dependencies: "@yarnpkg/lockfile" "^1.1.0" typescript "~4.9.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.0-rc.0.tgz#437360a4a1a4d55883ffec576629e5c726ac132e" - integrity sha512-6Xan575JTD5Wf80afAW+Uo7paI39zKcNUCE8wVqSvmexQP8Ersa6O0caXfPltgXIekOMTl1F8zeVY7WbOxlpmQ== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.0.tgz#c19a89433cd20daf2a97c84838aebcb8769440db" + integrity sha512-oX5AG0aSjmB89SyJZGyabr6uwfWd7yJM+krcrzHxFbVhvDCwdi9G+B0ADmaUn1shaXDseOFiLpo3R/oagd2fTA== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.0-rc.0.tgz#6404417f8252f8ced429aa78bd66cf5cd219cbd7" - integrity sha512-nFpUwbVtJ/2494IAgtzEp+9EpytHdRGfi1kmxbBUhc7X7ZLj1OiLMGKM/LmFZBpb/TXhEgNgSs4t7ezp5ZShOQ== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.0.tgz#5b6e14d5db76a9a96dd0a1ec9360d4a4c7a6091e" + integrity sha512-sIquvbq04KMOdpk1VdVFt7kVhOk/Rk+hI3M4raarMK5EbZ16nLYzpqjc2OZetUpKy6LB/FemClgNUShj9NlrqA== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.0-rc.0.tgz#cbf7ba4f5df0bd4e642eff6f91be4587dbb8b882" - integrity sha512-cIpphd7OmtgBV2Fcd9r6xligk3xd7kSUIBfUSqt75wUJKZOYuUN9XYDkU20H2EF43dyrb0llGck0Xo/cLrjOHQ== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.0.tgz#29e0ad05ada9280f5897fb7e693d47a984476499" + integrity sha512-kCtAZskxn5iKSF9yw+IALA6Otv8eqGp19R0RX/Btj7hLPEUPz1/n9pUIBLOtyE5P4xWT6JCty+vaPOdloSO9RA== dependencies: tslib "^2.3.0" xhr2 "^0.2.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.0-rc.0.tgz#811b9a0ea17dfe6bc8654f7162ba78bac36b2e87" - integrity sha512-ItFdLuqe11EiE3MVoqf5ZMjHAAp42F65QsKMlltxx11U5oVKSrusKDe421yeZnq427FKHJkynLtqSjpj06Vtdw== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.0.tgz#b6d0ea13b5330f4114555a59596c15a2ee166e28" + integrity sha512-OBMAfjaSfEdEYqfYsAemDvknYZV69ABFf06hhduNLhB5QgbPrZCbNptnlrCPx4YDrzcANj2hrcyAmAVNTk8Giw== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "17.3.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-17.3.0-rc.0.tgz#0df38f9173e9ef22c59986d8e68e1d6849f736cc" - integrity sha512-uZU3PRUUGkMGyNTesS29+IBbB7p+BoeZInfMf/mb/+2tlHgoJ4Xz0BUDAUoBKU/+5JmtQPAihSCOprVHJAzdDg== +"@angular/[email protected]": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-17.3.0.tgz#6926d00f119dcd845647158e2ba9e883f859cf61" + integrity sha512-kpwuK3aaUrVm1T2YS4Vq7IFBAEW3H83Xyl9KVSpRbdUOEAJjG9hgiPBVz/iu0W1j0T9JkS2GJt/3vP3OW5Tkhg== dependencies: tslib "^2.3.0"
b1d0615709e77694362db626e2751ece6bbde008
2017-05-09 19:47:22
Mattia
docs: add font-awesome SASS integration
false
add font-awesome SASS integration
docs
diff --git a/docs/documentation/stories/include-font-awesome.md b/docs/documentation/stories/include-font-awesome.md index ed0d8b34d2af..a9973d3f5214 100644 --- a/docs/documentation/stories/include-font-awesome.md +++ b/docs/documentation/stories/include-font-awesome.md @@ -3,6 +3,7 @@ # Include [Font Awesome](http://fontawesome.io/) [Font Awesome](http://fontawesome.io/) gives you scalable vector icons that can instantly be customized — size, color, drop shadow, and anything that can be done with the power of CSS. + Create a new project and navigate into the project... ``` ng new my-app @@ -14,6 +15,8 @@ Install the `font-awesome` library and add the dependency to package.json... npm install --save font-awesome ``` +### Using CSS + To add Font Awesome CSS icons to your app... ```json // in .angular-cli.json @@ -23,6 +26,22 @@ To add Font Awesome CSS icons to your app... "../node_modules/font-awesome/css/font-awesome.css" ] ``` +### Using SASS + +Create an empty file _variables.scss in src/. + +Add the following to _variables.scss: + +``` +$fa-font-path : '../node_modules/font-awesome/fonts'; +``` +In styles.scss add the following: + +``` +@import 'variables'; +@import '../node_modules/font-awesome/scss/font-awesome'; +``` +### Test Run `ng serve` to run your application in develop mode, and navigate to `http://localhost:4200`.
c242d2933a3f8d4fcf2e37fe04480f998086822b
2024-10-31 03:49:10
Alan Agius
fix(@angular/build): set `ngServerMode` during vite prebundling
false
set `ngServerMode` during vite prebundling
fix
diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index 03b9d27340f0..f909d7ea4c32 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -801,6 +801,9 @@ function getDepOptimizationConfig({ supported: getFeatureSupport(target, zoneless), plugins, loader, + define: { + 'ngServerMode': `${ssr}`, + }, resolveExtensions: ['.mjs', '.js', '.cjs'], }, };
29615c5ec4fc5a895672ce6e27259bb73474cb64
2021-04-27 17:22:48
Alan Agius
build: update lock file to force same Webpack version
false
update lock file to force same Webpack version
build
diff --git a/yarn.lock b/yarn.lock index 03e81607e15a..a2fd585507c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -86,7 +86,6 @@ "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#97eabea116da45d2a745c18e946a9c57c6c65800": version "0.0.0" - uid "97eabea116da45d2a745c18e946a9c57c6c65800" resolved "https://github.com/angular/dev-infra-private-builds.git#97eabea116da45d2a745c18e946a9c57c6c65800" dependencies: "@angular/benchpress" "0.2.1" @@ -2111,7 +2110,7 @@ acorn@^7.1.0, acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.1: +acorn@^8.2.1: version "8.2.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb" integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg== @@ -9684,7 +9683,6 @@ [email protected], sass@^1.32.8: "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz": version "0.0.0" - uid "992e2cb0d91e54b27a4f5bbd2049f3b774718115" resolved "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz#992e2cb0d91e54b27a4f5bbd2049f3b774718115" saucelabs@^1.5.0: @@ -11490,7 +11488,7 @@ [email protected]: dependencies: webpack-sources "^1.3.0" [email protected]: [email protected], webpack@^5.1.0: version "5.36.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.0.tgz#d008da31b721f8fecce88ef2adaf1b16dc2161d1" integrity sha512-HdOhLXClUEwTnzQnzpSG9iL00ej23ojvfnGpF49ba0MkuAT2q+WhQilHFFJHOIVRBqbzakQ1vCWQV2K+QLX0Qw== @@ -11519,35 +11517,6 @@ [email protected]: watchpack "^2.0.0" webpack-sources "^2.1.1" -webpack@^5.1.0: - version "5.35.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.35.1.tgz#857670799465c8a5cbb94c4c175d60ac42d18ba3" - integrity sha512-uWKYStqJ23+N6/EnMEwUjPSSKUG1tFmcuKhALEh/QXoUxwN8eb3ATNIZB38A+fO6QZ0xfc7Cu7KNV9LXNhDCsw== - dependencies: - "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.47" - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/wasm-edit" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.0" - es-module-lexer "^0.4.0" - eslint-scope "^5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.4" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.0.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.1" - watchpack "^2.0.0" - webpack-sources "^2.1.1" - websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
5f248204ec9a33773ca226b2bb7eaf4b6c6bf270
2019-04-26 22:56:47
Charles Lyding
fix(@angular-devkit/architect): propagate option validation errors
false
propagate option validation errors
fix
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts index 09f797cde570..fb92acc2e0e8 100644 --- a/packages/angular_devkit/architect/src/architect.ts +++ b/packages/angular_devkit/architect/src/architect.ts @@ -55,7 +55,7 @@ function _createJobHandlerFromBuilderInfo( if (result.success) { return { ...v, options: result.data } as BuilderInput; } else if (result.errors) { - throw new Error('Options did not validate.' + result.errors.join()); + throw new json.schema.SchemaValidationException(result.errors); } else { return v; } @@ -282,9 +282,7 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche if (success) { return of(data as json.JsonObject); } else { - throw new Error( - 'Data did not validate: ' + (errors ? errors.join() : 'Unknown error.'), - ); + throw new json.schema.SchemaValidationException(errors); } }), ).toPromise(); diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts index 597835e23075..495738a4f043 100644 --- a/packages/angular_devkit/architect/src/index_spec.ts +++ b/packages/angular_devkit/architect/src/index_spec.ts @@ -300,10 +300,9 @@ describe('architect', () => { // Should also error. const run2 = await architect.scheduleBuilder('package:do-it', {}); - try { - await run2.output.toPromise(); - expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false'); - } catch {} + await expectAsync(run2.output.toPromise()) + .toBeRejectedWith(jasmine.objectContaining({ message: jasmine.stringMatching('p1')})); + await run2.stop(); }); });
f324e0b27eff2adbc56c7825cd85bc38a0ce133b
2025-02-27 00:47:09
Angular Robot
build: update angular
false
update angular
build
diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index 814b16bc5a85..1fc1e479b092 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -3,7 +3,7 @@ # This file should be checked into version control along with the pnpm-lock.yaml file. .npmrc=-1406867100 modules/testing/builder/package.json=973445093 -package.json=2015726282 +package.json=-880241118 packages/angular/build/package.json=-1114621695 packages/angular/cli/package.json=-1917515334 packages/angular/pwa/package.json=1108903917 @@ -17,7 +17,7 @@ packages/angular_devkit/schematics/package.json=-1133510866 packages/angular_devkit/schematics_cli/package.json=-2026655035 packages/ngtools/webpack/package.json=605871936 packages/schematics/angular/package.json=251715148 -pnpm-lock.yaml=-592767080 +pnpm-lock.yaml=508734225 pnpm-workspace.yaml=-1264044456 tests/package.json=700948366 -yarn.lock=-1726238563 +yarn.lock=-509171918 diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index a0bddfeca362..130951093cfc 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@b3240b00315baa96f1b2deea2f71315f870dbb43 + - uses: angular/dev-infra/github-actions/branch-manager@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52deb7af8359..232e379a7754 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Generate JSON schema types @@ -42,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -57,11 +57,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -89,13 +89,13 @@ jobs: - run: choco install gzip if: ${{matrix.os == 'windows-latest'}} - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -111,13 +111,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -133,13 +133,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -151,13 +151,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -185,11 +185,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index f412ef9c45e4..d61dee5ee424 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@b3240b00315baa96f1b2deea2f71315f870dbb43 + - uses: angular/dev-infra/github-actions/commit-message-based-labels@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: angular/dev-infra/github-actions/post-approval-changes@b3240b00315baa96f1b2deea2f71315f870dbb43 + - uses: angular/dev-infra/github-actions/post-approval-changes@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 885e0db2e73a..9e183df5be6f 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@b3240b00315baa96f1b2deea2f71315f870dbb43 + - uses: angular/dev-infra/github-actions/feature-request@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index b9d355ecc761..949091427241 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -23,7 +23,7 @@ jobs: workflows: ${{ steps.workflows.outputs.workflows }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - id: workflows @@ -38,9 +38,9 @@ jobs: workflow: ${{ fromJSON(needs.list.outputs.workflows) }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable # We utilize the google-github-actions/auth action to allow us to get an active credential using workflow diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4b601204a06d..07a1d1df48c3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup ESLint Caching uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1 with: @@ -54,7 +54,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/linting/licenses@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Check tooling setup run: yarn check-tooling-setup - name: Check commit message @@ -70,11 +70,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -91,11 +91,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Run module and package tests @@ -115,13 +115,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -133,13 +133,13 @@ jobs: # TODO(devversion): Remove when Aspect lib issue is fixed. - run: choco install gzip - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild" @@ -155,13 +155,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -178,12 +178,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/setup@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43 + uses: angular/dev-infra/github-actions/bazel/configure-remote@744a2caa9074eaf2e0ca26d6f7cba79bdfec185d - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} diff --git a/package.json b/package.json index 9836e9c3e7c5..9717dd674709 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@ampproject/remapping": "2.3.0", "@angular/animations": "19.2.0-rc.0", - "@angular/bazel": "https://github.com/angular/bazel-builds.git#17b980a15a1adbff7f09dfad04236abadaa6cbe5", + "@angular/bazel": "https://github.com/angular/bazel-builds.git#fbd7a0b4d0c3697fb316e7da2ba326452ce243f6", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592", "@angular/cdk": "19.2.0-rc.0", "@angular/common": "19.2.0-rc.0", @@ -54,7 +54,7 @@ "@angular/forms": "19.2.0-rc.0", "@angular/localize": "19.2.0-rc.0", "@angular/material": "19.2.0-rc.0", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2f7b8501071eededd62627fb94d378423965a62a", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f", "@angular/platform-browser": "19.2.0-rc.0", "@angular/platform-browser-dynamic": "19.2.0-rc.0", "@angular/platform-server": "19.2.0-rc.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f9d18f90ea4..40c84eed73c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,8 +23,8 @@ importers: specifier: 19.2.0-rc.0 version: 19.2.0-rc.0(@angular/[email protected]) '@angular/bazel': - specifier: https://github.com/angular/bazel-builds.git#17b980a15a1adbff7f09dfad04236abadaa6cbe5 - version: github.com/angular/bazel-builds/17b980a15a1adbff7f09dfad04236abadaa6cbe5(@angular/[email protected])(@rollup/[email protected])(@rollup/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected]) + specifier: https://github.com/angular/bazel-builds.git#fbd7a0b4d0c3697fb316e7da2ba326452ce243f6 + version: github.com/angular/bazel-builds/fbd7a0b4d0c3697fb316e7da2ba326452ce243f6(@angular/[email protected])(@rollup/[email protected])(@rollup/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected]) '@angular/build-tooling': specifier: https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592 version: github.com/angular/dev-infra-private-build-tooling-builds/a6a996a69cfc03b3fbe538f11dd24b7bc4b30592([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]) @@ -53,8 +53,8 @@ importers: specifier: 19.2.0-rc.0 version: 19.2.0-rc.0(@angular/[email protected])(@angular/[email protected])(@angular/[email protected])(@angular/[email protected])(@angular/[email protected])([email protected]) '@angular/ng-dev': - specifier: https://github.com/angular/dev-infra-private-ng-dev-builds.git#2f7b8501071eededd62627fb94d378423965a62a - version: github.com/angular/dev-infra-private-ng-dev-builds/2f7b8501071eededd62627fb94d378423965a62a + specifier: https://github.com/angular/dev-infra-private-ng-dev-builds.git#ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f + version: github.com/angular/dev-infra-private-ng-dev-builds/ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f '@angular/platform-browser': specifier: 19.2.0-rc.0 version: 19.2.0-rc.0(@angular/[email protected])(@angular/[email protected])(@angular/[email protected]) @@ -14312,15 +14312,15 @@ packages: resolution: {integrity: sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==} dev: true - github.com/angular/bazel-builds/17b980a15a1adbff7f09dfad04236abadaa6cbe5(@angular/[email protected])(@rollup/[email protected])(@rollup/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected]): - resolution: {tarball: https://codeload.github.com/angular/bazel-builds/tar.gz/17b980a15a1adbff7f09dfad04236abadaa6cbe5} - id: github.com/angular/bazel-builds/17b980a15a1adbff7f09dfad04236abadaa6cbe5 + github.com/angular/bazel-builds/fbd7a0b4d0c3697fb316e7da2ba326452ce243f6(@angular/[email protected])(@rollup/[email protected])(@rollup/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected]): + resolution: {tarball: https://codeload.github.com/angular/bazel-builds/tar.gz/fbd7a0b4d0c3697fb316e7da2ba326452ce243f6} + id: github.com/angular/bazel-builds/fbd7a0b4d0c3697fb316e7da2ba326452ce243f6 name: '@angular/bazel' version: 20.0.0-next.0 engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0} hasBin: true peerDependencies: - '@angular/compiler-cli': 20.0.0-next.0+sha-74cceba + '@angular/compiler-cli': 20.0.0-next.0+sha-b070100 '@bazel/concatjs': ^5.3.0 '@bazel/worker': ^5.3.0 '@rollup/plugin-commonjs': ^28.0.0 @@ -14402,10 +14402,10 @@ packages: - zone.js dev: true - github.com/angular/dev-infra-private-ng-dev-builds/2f7b8501071eededd62627fb94d378423965a62a: - resolution: {tarball: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/2f7b8501071eededd62627fb94d378423965a62a} + github.com/angular/dev-infra-private-ng-dev-builds/ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f: + resolution: {tarball: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f} name: '@angular/ng-dev' - version: 0.0.0-b3240b00315baa96f1b2deea2f71315f870dbb43 + version: 0.0.0-744a2caa9074eaf2e0ca26d6f7cba79bdfec185d hasBin: true dependencies: '@google-cloud/spanner': 7.18.1([email protected]) diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 87c361517a89..55f2a88a9235 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#66476652f15cb300fc1f5501d90696b5340c4285", - "@angular/cdk": "github:angular/cdk-builds#3e394555144ab6e70201ad535cf7db3975135ceb", - "@angular/common": "github:angular/common-builds#e0a9f7655906304f5558f06bdb5a8ba994f4900c", - "@angular/compiler": "github:angular/compiler-builds#2cea3a22ffae23848d9075b625c0438e72338723", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#a84687116a7162d30d5439105f7d8de76262aa0f", - "@angular/core": "github:angular/core-builds#be3d4bc90d81768a780a66be96c36fdff9768964", - "@angular/forms": "github:angular/forms-builds#e47c1e4f0f801bca81a34bf3dc00a57ab6a8971b", - "@angular/language-service": "github:angular/language-service-builds#7bec355e224fe0d08b678af492a26e90230cf4f1", - "@angular/localize": "github:angular/localize-builds#e67bbd19bcd79dc27bfb2bfc06fd5188f5fa47a0", - "@angular/material": "github:angular/material-builds#bab1a61d9f572985d773c3870a592fc27c785bea", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#3007e6dec8755a652b05ccf84c0d93c724e40b1c", - "@angular/platform-browser": "github:angular/platform-browser-builds#46f5c6dd71a3ee5fb289d7e5da9f830e89a718af", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#5650f4bf7eb098ebbe006170410451a24362f8ba", - "@angular/platform-server": "github:angular/platform-server-builds#aac2912800ba38f3aa899a07beb893f51e654431", - "@angular/router": "github:angular/router-builds#1740bf4c161e67bb415a90f81f487bb653e35adc", - "@angular/service-worker": "github:angular/service-worker-builds#057d2b3d0c220a926d0aadca17573345c54512dc" + "@angular/animations": "github:angular/animations-builds#4149a99340401031ba7e25453e23310fa7153c00", + "@angular/cdk": "github:angular/cdk-builds#e0d1621906e491afd3209faa9b94fa15e58c3641", + "@angular/common": "github:angular/common-builds#89f20739ee2dfa94edf13d0b4f5ffd6d4697fa95", + "@angular/compiler": "github:angular/compiler-builds#3895d95edb4309bd8551688b2233bf2475e07dc7", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#fddd0882ad136c17be0f8f9ad487de9f054b30a9", + "@angular/core": "github:angular/core-builds#6b0395f430c09813af54e6c46fcabd9325e68df9", + "@angular/forms": "github:angular/forms-builds#c90e76cde788d3bd5ce09fe7e3e72780600b6735", + "@angular/language-service": "github:angular/language-service-builds#973cc69284524d2e93478cf727f9e025b47cae36", + "@angular/localize": "github:angular/localize-builds#436726e9d6f9e93030ac54727801a07c79ca31da", + "@angular/material": "github:angular/material-builds#6687b5e50177abbd75665a18e256ae1ccde03039", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#1ac4978b6d1a9f9a6b735fc8d4bab09d1e3724f1", + "@angular/platform-browser": "github:angular/platform-browser-builds#ecd6c25230c5f128b85f2ad48e1af096ea6d9022", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#6e2f40cbf0df89fdadff862a0d00e089936ceb36", + "@angular/platform-server": "github:angular/platform-server-builds#0803f348c24620adf2eb90831af7bf1c62bc8cae", + "@angular/router": "github:angular/router-builds#065fc9d5db53f66109e297266d486aced0821288", + "@angular/service-worker": "github:angular/service-worker-builds#dcb5058646a9198448c3636e4bafb2d8203bf70e" } } diff --git a/yarn.lock b/yarn.lock index c277ffb920ed..f221bcc6d976 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,15 +55,15 @@ __metadata: languageName: node linkType: hard -"@angular/bazel@https://github.com/angular/bazel-builds.git#17b980a15a1adbff7f09dfad04236abadaa6cbe5": - version: 20.0.0-next.0+sha-74cceba - resolution: "@angular/bazel@https://github.com/angular/bazel-builds.git#commit=17b980a15a1adbff7f09dfad04236abadaa6cbe5" +"@angular/bazel@https://github.com/angular/bazel-builds.git#fbd7a0b4d0c3697fb316e7da2ba326452ce243f6": + version: 20.0.0-next.0+sha-b070100 + resolution: "@angular/bazel@https://github.com/angular/bazel-builds.git#commit=fbd7a0b4d0c3697fb316e7da2ba326452ce243f6" dependencies: "@microsoft/api-extractor": "npm:^7.24.2" magic-string: "npm:^0.30.0" tslib: "npm:^2.3.0" peerDependencies: - "@angular/compiler-cli": 20.0.0-next.0+sha-74cceba + "@angular/compiler-cli": 20.0.0-next.0+sha-b070100 "@bazel/concatjs": ^5.3.0 "@bazel/worker": ^5.3.0 "@rollup/plugin-commonjs": ^28.0.0 @@ -80,7 +80,7 @@ __metadata: packager: ./src/ng_package/packager.mjs types_bundler: ./src/types_bundle/index.mjs xi18n: ./src/ngc-wrapped/extract_i18n.mjs - checksum: 10c0/bed689ca5d6ec642b4a37164127a57957bebea66acd313e860de301b8496eb26ec1d33b4e30d36a39295af45955601ff85c7aa3eaedb2bb550734693f2d7bd28 + checksum: 10c0/f51d4d4223b80df38461916f7ea7fcd428e733156390b9518e161560e99b20338e8c17f11005053f9975da467fef4551db4c92703275dc24055e61b2bd864e93 languageName: node linkType: hard @@ -299,7 +299,7 @@ __metadata: dependencies: "@ampproject/remapping": "npm:2.3.0" "@angular/animations": "npm:19.2.0-rc.0" - "@angular/bazel": "https://github.com/angular/bazel-builds.git#17b980a15a1adbff7f09dfad04236abadaa6cbe5" + "@angular/bazel": "https://github.com/angular/bazel-builds.git#fbd7a0b4d0c3697fb316e7da2ba326452ce243f6" "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592" "@angular/cdk": "npm:19.2.0-rc.0" "@angular/common": "npm:19.2.0-rc.0" @@ -309,7 +309,7 @@ __metadata: "@angular/forms": "npm:19.2.0-rc.0" "@angular/localize": "npm:19.2.0-rc.0" "@angular/material": "npm:19.2.0-rc.0" - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2f7b8501071eededd62627fb94d378423965a62a" + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f" "@angular/platform-browser": "npm:19.2.0-rc.0" "@angular/platform-browser-dynamic": "npm:19.2.0-rc.0" "@angular/platform-server": "npm:19.2.0-rc.0" @@ -524,9 +524,9 @@ __metadata: languageName: node linkType: hard -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#2f7b8501071eededd62627fb94d378423965a62a": - version: 0.0.0-b3240b00315baa96f1b2deea2f71315f870dbb43 - resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=2f7b8501071eededd62627fb94d378423965a62a" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f": + version: 0.0.0-744a2caa9074eaf2e0ca26d6f7cba79bdfec185d + resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=ef2a949c1ffddc70ac550b17d909ddf89ef8bd4f" dependencies: "@google-cloud/spanner": "npm:7.18.1" "@octokit/rest": "npm:21.1.1" @@ -542,7 +542,7 @@ __metadata: yaml: "npm:2.7.0" bin: ng-dev: ./bundles/cli.mjs - checksum: 10c0/862beeb538a43e39b426119b6c9084b332393c825df82eded57db7619ffcc9a745c23c708ced4cf60098aaf89865df36e73c5a2d5805bc27cd2c4292cbc2df32 + checksum: 10c0/db1b746bcb838cbd6f548c123eb593d15e99bf0d2eb472bab0f370fbb651691a61cc967a72b43a77e107cf859f7a58055495e000ff00bba32f4fbeea5968dc2a languageName: node linkType: hard
e9be90820cd51ce9e39ef46ccc973c4abc5aeea4
2019-07-04 02:39:52
Vikram Subramanian
chore(release): 8.1.0
false
8.1.0
chore
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3d94ecabb8..30d6e1f87a6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +<a name="8.1.0"></a> +# [8.1.0](https://github.com/angular/universal/compare/v8.0.0-rc.1...v8.1.0) (2019-07-03) + + +### Bug Fixes + +* **express-engine:** add bundleDependencies and lazy-loading fixes ([#1167](https://github.com/angular/universal/issues/1167)) ([d8be7af](https://github.com/angular/universal/commit/d8be7af)) +* **hapi-engine:** add bundleDependencies and lazy-loading fixes ([#1188](https://github.com/angular/universal/issues/1188)) ([e688092](https://github.com/angular/universal/commit/e688092)) +* **hapi-engine:** fix broken unit test ([6ef8e47](https://github.com/angular/universal/commit/6ef8e47)) + + +### Features + +* **hapi-engine:** add ModuleMapLoaderModule to the app server imports during ng-add ([#1143](https://github.com/angular/universal/issues/1143)) ([81af213](https://github.com/angular/universal/commit/81af213)) + + + <a name="7.1.1"></a> ## [7.1.1](https://github.com/angular/universal/compare/v7.1.0...v7.1.1) (2019-03-07) diff --git a/package.json b/package.json index 7a744735d7d4..9d832aba22ca 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nguniversal", "main": "index.js", - "version": "8.0.0-rc.1", + "version": "8.1.0", "description": "Universal (isomorphic) JavaScript support for Angular", "homepage": "https://github.com/angular/universal", "license": "MIT",
383bcaae4b7c33465dbebdfdf75a3e0f86619df5
2024-01-19 22:55:49
Angular Robot
build: update actions/upload-artifact action to v4.2.0
false
update actions/upload-artifact action to v4.2.0
build
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 9d76330c99cd..a7ddef95db46 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -38,7 +38,7 @@ jobs: # Upload the results as artifacts. - name: 'Upload artifact' - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0 + uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0 with: name: SARIF file path: results.sarif
330235230c680709b312d1b33ce16b0f482f0b84
2021-04-14 01:04:54
Charles Lyding
refactor(@angular-devkit/build-angular): remove redundant `webpack-sources` dependency
false
remove redundant `webpack-sources` dependency
refactor
diff --git a/package.json b/package.json index 647012fa8ba8..1d66d728da0d 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,6 @@ "@types/text-table": "^0.2.1", "@types/uuid": "^8.0.0", "@types/webpack-dev-server": "^3.1.7", - "@types/webpack-sources": "^2.0.0", "@yarnpkg/lockfile": "1.1.0", "ajv": "8.1.0", "ajv-formats": "2.0.2", @@ -228,7 +227,6 @@ "webpack-dev-middleware": "4.1.0", "webpack-dev-server": "3.11.2", "webpack-merge": "5.7.3", - "webpack-sources": "2.2.0", "webpack-subresource-integrity": "1.5.2", "zone.js": "^0.11.3" } diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 417d6f470163..2274d3635272 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -135,7 +135,6 @@ ts_library( "@npm//@types/semver", "@npm//@types/text-table", "@npm//@types/webpack-dev-server", - "@npm//@types/webpack-sources", "@npm//ajv", "@npm//ansi-colors", "@npm//babel-loader", @@ -193,7 +192,6 @@ ts_library( "@npm//webpack-dev-middleware", "@npm//webpack-dev-server", "@npm//webpack-merge", - "@npm//webpack-sources", "@npm//webpack-subresource-integrity", ], ) diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 9758091181a3..6a014b7dad8f 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -73,7 +73,6 @@ "webpack-dev-middleware": "4.1.0", "webpack-dev-server": "3.11.2", "webpack-merge": "5.7.3", - "webpack-sources": "2.2.0", "webpack-subresource-integrity": "1.5.2" }, "peerDependencies": { diff --git a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts index f03e0b80f7c1..88e0cc55ae56 100644 --- a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts +++ b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts @@ -23,15 +23,16 @@ import * as path from 'path'; import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map'; import { minify } from 'terser'; import * as v8 from 'v8'; -import { +import { sources } from 'webpack'; +import { allowMangle, allowMinify, shouldBeautify } from './environment-options'; +import { I18nOptions } from './i18n-options'; + +const { ConcatSource, OriginalSource, ReplaceSource, - Source, SourceMapSource, -} from 'webpack-sources'; -import { allowMangle, allowMinify, shouldBeautify } from './environment-options'; -import { I18nOptions } from './i18n-options'; +} = sources; type LocalizeUtilities = typeof import('@angular/localize/src/tools/src/source_file_utils'); @@ -233,7 +234,7 @@ async function mergeSourceMaps( true, ).map()!; - return finalSourceMap; + return finalSourceMap as RawSourceMap; } async function mergeSourceMapsFast(first: RawSourceMap, second: RawSourceMap) { @@ -773,12 +774,12 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) { content.replace(position.start, position.end - 1, code); } - let outputSource: Source = content; + let outputSource: sources.Source = content; if (options.setLocale) { const setLocaleText = `var $localize=Object.assign(void 0===$localize?{}:$localize,{locale:"${locale}"});\n`; // If locale data is provided, load it and prepend to file - let localeDataSource: Source | null = null; + let localeDataSource: sources.Source | null = null; const localeDataPath = i18n.locales[locale] && i18n.locales[locale].dataPath; if (localeDataPath) { const localeDataContent = await loadLocaleData(localeDataPath, true, options.es5); @@ -791,7 +792,10 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) { : new ConcatSource(setLocaleText, content); } - const { source: outputCode, map: outputMap } = outputSource.sourceAndMap(); + const { source: outputCode, map: outputMap } = outputSource.sourceAndMap() as { + source: string; + map: RawSourceMap; + }; const outputPath = path.join( options.outputPath, i18n.flatOutput ? '' : locale, diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts index 50359e3c643a..70867734c69b 100644 --- a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts +++ b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts @@ -11,13 +11,13 @@ import { Compiler, Module, Stats, + sources, } from 'webpack'; -import { OriginalSource } from 'webpack-sources'; const NormalModule = require('webpack/lib/NormalModule'); interface NormalModule extends Module { - _source?: OriginalSource | null; + _source?: sources.OriginalSource | null; resource?: string; } @@ -154,14 +154,14 @@ export class NgBuildAnalyticsPlugin { // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse // so we just consider them within the margin of error. We do break on word break though. - this._stats.numberOfNgOnInit += countOccurrences(module._source.source(), 'ngOnInit', true); + this._stats.numberOfNgOnInit += countOccurrences(module._source.source().toString(), 'ngOnInit', true); // Count the number of `Component({` strings (case sensitive), which happens in __decorate(). - this._stats.numberOfComponents += countOccurrences(module._source.source(), 'Component({'); + this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), 'Component({'); // For Ivy we just count ɵcmp. - this._stats.numberOfComponents += countOccurrences(module._source.source(), '.ɵcmp', true); + this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), '.ɵcmp', true); // for ascii_only true - this._stats.numberOfComponents += countOccurrences(module._source.source(), '.\u0275cmp', true); + this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), '.\u0275cmp', true); } } diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts index 7fa1279fb115..0bf19d407a1c 100644 --- a/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts +++ b/packages/angular_devkit/build_angular/src/webpack/plugins/index-html-webpack-plugin.ts @@ -6,8 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import { basename, dirname, extname } from 'path'; -import { Compilation, Compiler } from 'webpack'; -import { RawSource } from 'webpack-sources'; +import { Compilation, Compiler, sources } from 'webpack'; import { FileInfo } from '../../utils/index-file/augment-index-html'; import { IndexHtmlGenerator, IndexHtmlGeneratorOptions, IndexHtmlGeneratorProcessOptions } from '../../utils/index-file/index-html-generator'; import { addError, addWarning } from '../../utils/webpack-diagnostics'; @@ -80,7 +79,7 @@ export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator { lang: this.options.lang, }); - assets[this.options.outputPath] = new RawSource(content); + assets[this.options.outputPath] = new sources.RawSource(content); warnings.forEach(msg => addWarning(this.compilation, msg)); errors.forEach(msg => addError(this.compilation, msg)); diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts index 35ab2acb1cdb..294fbb7c168d 100644 --- a/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts +++ b/packages/angular_devkit/build_angular/src/webpack/plugins/scripts-webpack-plugin.ts @@ -8,8 +8,7 @@ import { interpolateName } from 'loader-utils'; import * as path from 'path'; -import { Chunk, Compilation, Compiler } from 'webpack'; -import { CachedSource, ConcatSource, OriginalSource, RawSource, Source } from 'webpack-sources'; +import { Chunk, Compilation, Compiler, sources as webpackSources } from 'webpack'; const Entrypoint = require('webpack/lib/Entrypoint'); export interface ScriptsWebpackPluginOptions { @@ -22,7 +21,7 @@ export interface ScriptsWebpackPluginOptions { interface ScriptOutput { filename: string; - source: CachedSource; + source: webpackSources.CachedSource; } function addDependencies(compilation: Compilation, scripts: string[]): void { @@ -107,7 +106,7 @@ export class ScriptsWebpackPlugin { } const sourceGetters = scripts.map(fullPath => { - return new Promise<Source>((resolve, reject) => { + return new Promise<webpackSources.Source>((resolve, reject) => { compilation.inputFileSystem.readFile(fullPath, (err?: Error, data?: string | Buffer) => { if (err) { reject(err); @@ -125,9 +124,9 @@ export class ScriptsWebpackPlugin { if (this.options.basePath) { adjustedPath = path.relative(this.options.basePath, fullPath); } - source = new OriginalSource(content, adjustedPath); + source = new webpackSources.OriginalSource(content, adjustedPath); } else { - source = new RawSource(content); + source = new webpackSources.RawSource(content); } resolve(source); @@ -136,13 +135,13 @@ export class ScriptsWebpackPlugin { }); const sources = await Promise.all(sourceGetters); - const concatSource = new ConcatSource(); + const concatSource = new webpackSources.ConcatSource(); sources.forEach(source => { concatSource.add(source); concatSource.add('\n;'); }); - const combinedSource = new CachedSource(concatSource); + const combinedSource = new webpackSources.CachedSource(concatSource); const filename = interpolateName( { resourcePath: 'scripts.js' }, this.options.filename as string, diff --git a/yarn.lock b/yarn.lock index e44b64e64ad5..f16238055b71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2138,15 +2138,6 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack-sources@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" - integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== - dependencies: - "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.7.3" - "@types/webpack@*": version "5.28.0" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03" @@ -12726,14 +12717,6 @@ [email protected]: clone-deep "^4.0.1" wildcard "^2.0.0" [email protected], webpack-sources@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" - integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" - webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -12742,6 +12725,14 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" +webpack-sources@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== + dependencies: + source-list-map "^2.0.1" + source-map "^0.6.1" + [email protected]: version "1.5.2" resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e"
432aade7ad6ee474ea423056b5baffdf03a080a3
2020-05-04 23:24:48
Charles Lyding
refactor(@angular-devkit/build-optimizer): remove errant deprecations
false
remove errant deprecations
refactor
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts index 8637c66baa71..77d01ab12491 100644 --- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts +++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts @@ -8,9 +8,6 @@ import * as ts from 'typescript'; import { addPureComment } from '../helpers/ast-utils'; -/** - * @deprecated From 0.9.0 - */ export function testPrefixClasses(content: string) { const exportVarSetter = /(?:export )?(?:var|const)\s+(?:\S+)\s*=\s*/; const multiLineComment = /\s*(?:\/\*[\s\S]*?\*\/)?\s*/; diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts index 4d7590e20cfb..a18ea32af734 100644 --- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts +++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts @@ -8,9 +8,6 @@ import * as ts from 'typescript'; import { collectDeepNodes } from '../helpers/ast-utils'; -/** - * @deprecated From 0.9.0 - */ export function testScrubFile(content: string) { const markers = [ 'decorators',
4c5ed59232a8fb16760239013fee1bf51fb81f07
2018-09-13 23:07:37
Filipe Silva
build: match engines with bazel and CI
false
match engines with bazel and CI
build
diff --git a/WORKSPACE b/WORKSPACE index 01a96e2ea061..14eab931653d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -58,8 +58,32 @@ check_bazel_version("0.15.0") node_repositories( package_json = ["//:package.json"], preserve_symlinks = True, - node_version = "10.3.0", - yarn_version = "1.6.0", + node_version = "10.9.0", + yarn_version = "1.9.2", + node_repositories = { + "10.9.0-darwin_amd64": ( + "node-v10.9.0-darwin-x64.tar.gz", + "node-v10.9.0-darwin-x64", + "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc" + ), + "10.9.0-linux_amd64": ( + "node-v10.9.0-linux-x64.tar.xz", + "node-v10.9.0-linux-x64", + "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff" + ), + "10.9.0-windows_amd64": ( + "node-v10.9.0-win-x64.zip", + "node-v10.9.0-win-x64", + "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e" + ), + }, + yarn_repositories = { + "1.9.2": ( + "yarn-v1.9.2.tar.gz", + "yarn-v1.9.2", + "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204" + ), + }, ) local_repository( diff --git a/package.json b/package.json index 8affd2f1af92..f63af6826edc 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "url": "https://github.com/angular/angular-cli.git" }, "engines": { - "node": ">=10.3.0 <11.0.0", - "yarn": ">=1.6.0 <2.0.0" + "node": ">=10.9.0 <11.0.0", + "yarn": ">=1.9.0 <2.0.0" }, "author": "Angular Authors", "license": "MIT",
2aa89a15302df68a0614c0ea74b3a8d35bad6c00
2018-01-31 20:50:19
Charles Lyding
build: update to use TS 2.6
false
update to use TS 2.6
build
diff --git a/package-lock.json b/package-lock.json index a096008d16f2..973126c79bb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,40 +55,63 @@ "rxjs": "5.5.6" } }, + "@angular/common": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.1.tgz", + "integrity": "sha512-O7FA4Qpcu6GYMzlsNTHtUsAl6W0SXepP7qEMx83fC1Xje2GEtulp/99Pg6bvpFKiZYdCjJDhjbUZhIO5x0UncQ==", + "dev": true, + "requires": { + "tslib": "1.7.1" + } + }, "@angular/compiler": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz", - "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.1.tgz", + "integrity": "sha512-c/HDfbDr8yDUCoVCbGHgoae3YCoWG3EuM/l7jfHflE8sbdppiFVxCRd3VkygkwfPGpUZbZaW2x/OK4Z1dQa34g==", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/compiler-cli": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz", - "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.1.tgz", + "integrity": "sha512-9Yud6euknHKPQhh/noho0/xNgYeCyly0Ugkgh0306/RNLW5ngcWE876wdUweU13LJgWQ9+SHqFI5rJbsseqkZw==", "dev": true, "requires": { "chokidar": "1.7.0", "minimist": "1.2.0", "reflect-metadata": "0.1.10", - "tsickle": "0.24.1" + "tsickle": "0.26.0" + }, + "dependencies": { + "tsickle": { + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.26.0.tgz", + "integrity": "sha512-eWJ2CUfttGK0LqF9iJ/Avnxbj4M+fCyJ50Zag3wm73Fut1hsasPRHKxKdrMWVj4BMHnQNx7TO+DdNmLmJTSuNw==", + "dev": true, + "requires": { + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map": "0.5.7", + "source-map-support": "0.4.18" + } + } } }, "@angular/core": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz", - "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.1.tgz", + "integrity": "sha512-2kyXVl+OK/LRUisSfILkRyWiD2BGXysQkN2dwxfwYZwDciH7o8wGSlDDZw0lXIBt0Ly0stYiorIIJGVs5TffaA==", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/service-worker": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-5.0.0.tgz", - "integrity": "sha1-maL103A1BivRBWEgzP9D1jI8OYc=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-5.2.1.tgz", + "integrity": "sha512-z4+7S5MQYbcp9d4xtZk6tGJY3TkliVTXj/2HdIOXm97wCyDUAdvNLa9sor3N8OtH8IiRgqeXnqq3ehyWvbMZ4g==", "dev": true, "requires": { "tslib": "1.7.1" @@ -286,6 +309,18 @@ "integrity": "sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==", "dev": true }, + "@types/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=", + "dev": true + }, + "@types/strip-json-comments": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", + "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", + "dev": true + }, "@types/tapable": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-0.2.4.tgz", @@ -4353,6 +4388,15 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" }, + "homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dev": true, + "requires": { + "parse-passwd": "1.0.0" + } + }, "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", @@ -5482,9 +5526,9 @@ } }, "make-error": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz", - "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz", + "integrity": "sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==", "dev": true }, "map-cache": { @@ -6680,6 +6724,12 @@ "error-ex": "1.3.1" } }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true + }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -8951,29 +9001,83 @@ "dev": true }, "ts-node": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz", - "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-4.1.0.tgz", + "integrity": "sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg==", "dev": true, "requires": { "arrify": "1.0.1", - "chalk": "2.2.0", + "chalk": "2.3.0", "diff": "3.3.1", - "make-error": "1.3.0", + "make-error": "1.3.2", "minimist": "1.2.0", "mkdirp": "0.5.1", - "source-map-support": "0.4.18", - "tsconfig": "6.0.0", - "v8flags": "3.0.0", + "source-map-support": "0.5.0", + "tsconfig": "7.0.0", + "v8flags": "3.0.1", "yn": "2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz", + "integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, "tsconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz", - "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", + "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", "dev": true, "requires": { + "@types/strip-bom": "3.0.0", + "@types/strip-json-comments": "0.0.30", "strip-bom": "3.0.0", "strip-json-comments": "2.0.1" }, @@ -8986,18 +9090,6 @@ } } }, - "tsickle": { - "version": "0.24.1", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.24.1.tgz", - "integrity": "sha512-XloFQZhVhgjpQsi3u2ORNRJvuID5sflOg6HfP093IqAbhE1+fIUXznULpdDwHgG4p+v8w78KdHruQtkWUKx5AQ==", - "dev": true, - "requires": { - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map": "0.5.7", - "source-map-support": "0.4.18" - } - }, "tslib": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz", @@ -9005,13 +9097,14 @@ "dev": true }, "tslint": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz", - "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.8.0.tgz", + "integrity": "sha1-H0mtWy53x2w69N3K5VKuTjYS6xM=", "dev": true, "requires": { "babel-code-frame": "6.26.0", - "colors": "1.1.2", + "builtin-modules": "1.1.1", + "chalk": "2.2.0", "commander": "2.11.0", "diff": "3.3.1", "glob": "7.1.2", @@ -9019,16 +9112,24 @@ "resolve": "1.4.0", "semver": "5.4.1", "tslib": "1.7.1", - "tsutils": "2.8.2" + "tsutils": "2.15.0" } }, "tsutils": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz", - "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.15.0.tgz", + "integrity": "sha512-kKb1mSqRMwF0GHKya5/hZsI2m7Flg4ONZDeYu4e6Gx+kYAu86zsLNCHcUmNWhCRaUcKshNI272hOzuaCQDzJ2g==", "dev": true, "requires": { - "tslib": "1.7.1" + "tslib": "1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz", + "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=", + "dev": true + } } }, "tty-browserify": { @@ -9074,9 +9175,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", - "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", + "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=" }, "uglify-js": { "version": "3.1.1", @@ -9405,20 +9506,12 @@ "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" }, "v8flags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz", - "integrity": "sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz", + "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=", "dev": true, "requires": { - "user-home": "1.1.1" - }, - "dependencies": { - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", - "dev": true - } + "homedir-polyfill": "1.0.1" } }, "validate-npm-package-license": { diff --git a/package.json b/package.json index a3cefe422e11..4f69d66fdc0d 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "stylus": "^0.54.5", "stylus-loader": "^3.0.1", "tree-kill": "^1.0.0", - "typescript": "~2.4.2", + "typescript": "^2.6.2", "uglifyjs-webpack-plugin": "^1.1.5", "url-loader": "^0.6.2", "webpack": "~3.10.0", @@ -103,10 +103,11 @@ "webpack-subresource-integrity": "^1.0.1" }, "devDependencies": { - "@angular/compiler": "^5.0.0", - "@angular/compiler-cli": "^5.0.0", - "@angular/core": "^5.0.0", - "@angular/service-worker": "^5.0.0", + "@angular/common": "^5.2.0", + "@angular/compiler": "^5.2.0", + "@angular/compiler-cli": "^5.2.0", + "@angular/core": "^5.2.0", + "@angular/service-worker": "^5.2.0", "@types/common-tags": "^1.2.4", "@types/copy-webpack-plugin": "^4.0.0", "@types/denodeify": "^1.2.30", @@ -141,8 +142,8 @@ "tar": "^4.1.1", "temp": "0.8.3", "through": "^2.3.6", - "ts-node": "^3.2.0", - "tslint": "^5.1.0", + "ts-node": "^4.1.0", + "tslint": "^5.8.0", "zone.js": "^0.8.20" }, "optionalDependencies": { diff --git a/packages/@ngtools/webpack/src/angular_compiler_plugin.ts b/packages/@ngtools/webpack/src/angular_compiler_plugin.ts index d899371c0fc9..52c01faa273c 100644 --- a/packages/@ngtools/webpack/src/angular_compiler_plugin.ts +++ b/packages/@ngtools/webpack/src/angular_compiler_plugin.ts @@ -40,7 +40,7 @@ import { Program, CompilerOptions, CompilerHost, - Diagnostics, + Diagnostic, EmitFlags, LazyRoute, createProgram, @@ -919,7 +919,7 @@ export class AngularCompilerPlugin implements Tapable { private _emit(sourceFiles: ts.SourceFile[]) { time('AngularCompilerPlugin._emit'); const program = this._program; - const allDiagnostics: Diagnostics = []; + const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = []; let emitResult: ts.EmitResult | undefined; try { diff --git a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts index 2131a0836133..e28e4bb639c6 100644 --- a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts +++ b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts @@ -19,13 +19,10 @@ export interface ExtractI18nPluginOptions { export class ExtractI18nPlugin implements Tapable { private _resourceLoader: WebpackResourceLoader; - private _donePromise: Promise<void> | null; - private _compiler: any = null; private _compilation: any = null; private _tsConfigPath: string; private _basePath: string; - private _genDir: string; private _rootFilePath: string[]; private _compilerOptions: any = null; private _angularCompilerOptions: any = null; @@ -112,7 +109,6 @@ export class ExtractI18nPlugin implements Tapable { ); this._basePath = basePath; - this._genDir = genDir; // this._compilerHost = new WebpackCompilerHost(this._compilerOptions, this._basePath); this._compilerHost = ts.createCompilerHost(this._compilerOptions, true); @@ -141,12 +137,9 @@ export class ExtractI18nPlugin implements Tapable { } apply(compiler: any) { - this._compiler = compiler; - compiler.plugin('make', (compilation: any, cb: any) => this._make(compilation, cb)); compiler.plugin('after-emit', (compilation: any, cb: any) => { - this._donePromise = null; this._compilation = null; compilation._ngToolsWebpackXi18nPluginInstance = null; cb(); @@ -168,7 +161,7 @@ export class ExtractI18nPlugin implements Tapable { this._resourceLoader.update(compilation); - this._donePromise = Promise.resolve() + Promise.resolve() .then(() => { return __NGTOOLS_PRIVATE_API_2.extractI18n({ basePath: this._basePath, diff --git a/packages/@ngtools/webpack/src/gather_diagnostics.ts b/packages/@ngtools/webpack/src/gather_diagnostics.ts index a5dfa131064f..34515af4f2e0 100644 --- a/packages/@ngtools/webpack/src/gather_diagnostics.ts +++ b/packages/@ngtools/webpack/src/gather_diagnostics.ts @@ -2,7 +2,7 @@ import * as ts from 'typescript'; import { time, timeEnd } from './benchmark'; -import { Program, Diagnostics } from './ngtools_api'; +import { Program, Diagnostic, Diagnostics } from './ngtools_api'; export class CancellationToken implements ts.CancellationToken { @@ -33,7 +33,7 @@ export function gatherDiagnostics( benchmarkLabel: string, cancellationToken?: CancellationToken, ): Diagnostics { - const allDiagnostics: Diagnostics = []; + const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = []; let checkOtherDiagnostics = true; function checkDiagnostics(diags: Diagnostics | undefined) { diff --git a/packages/@ngtools/webpack/src/ngtools_api.ts b/packages/@ngtools/webpack/src/ngtools_api.ts index 074ab5df2fc6..fe199aaa3910 100644 --- a/packages/@ngtools/webpack/src/ngtools_api.ts +++ b/packages/@ngtools/webpack/src/ngtools_api.ts @@ -92,7 +92,7 @@ export interface LazyRoute { referencedModule: { name: string, filePath: string }; } -export declare type Diagnostics = Array<ts.Diagnostic | Diagnostic>; +export declare type Diagnostics = ReadonlyArray<ts.Diagnostic | Diagnostic>; // Interfaces for the function declarations. export interface CreateProgramInterface { diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts index 8c256a366794..83e29209dba1 100644 --- a/packages/@ngtools/webpack/src/plugin.ts +++ b/packages/@ngtools/webpack/src/plugin.ts @@ -62,7 +62,6 @@ export class AotPlugin implements Tapable { private _entryModule: string; private _donePromise: Promise<void> | null; - private _compiler: any = null; private _compilation: any = null; private _typeCheck = true; @@ -356,8 +355,6 @@ export class AotPlugin implements Tapable { // registration hook for webpack plugin apply(compiler: any) { - this._compiler = compiler; - // Decorate inputFileSystem to serve contents of CompilerHost. // Use decorated inputFileSystem in watchFileSystem. compiler.plugin('environment', () => { diff --git a/packages/@ngtools/webpack/src/transformers/export_ngfactory.ts b/packages/@ngtools/webpack/src/transformers/export_ngfactory.ts index 1b31be26cb95..95aa544dd380 100644 --- a/packages/@ngtools/webpack/src/transformers/export_ngfactory.ts +++ b/packages/@ngtools/webpack/src/transformers/export_ngfactory.ts @@ -33,7 +33,6 @@ export function exportNgFactory( const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/'); // Get the module path from the import. - let modulePath: string; entryModuleIdentifiers.forEach((entryModuleIdentifier) => { if (entryModuleIdentifier.parent.kind !== ts.SyntaxKind.ExportSpecifier) { return; @@ -46,8 +45,6 @@ export function exportNgFactory( return; } - modulePath = (moduleSpecifier as ts.StringLiteral).text; - // Add the transform operations. const factoryClassName = entryModule.className + 'NgFactory'; const factoryModulePath = normalizedEntryModulePath + '.ngfactory';
cc907559800539fb30e3fd02493d0161d7949a9f
2018-02-22 01:04:51
Charles Lyding
fix(@angular/cli): resolve dev server entrypoint
false
resolve dev server entrypoint
fix
diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts index 1224a8528ad5..b8a05d2294e5 100644 --- a/packages/@angular/cli/tasks/serve.ts +++ b/packages/@angular/cli/tasks/serve.ts @@ -109,8 +109,14 @@ export default Task.extend({ if (serveTaskOptions.liveReload) { // This allows for live reload of page when changes are made to repo. // https://webpack.js.org/configuration/dev-server/#devserver-inline + let webpackDevServerPath; + try { + webpackDevServerPath = require.resolve('webpack-dev-server/client'); + } catch { + throw new SilentError('The "webpack-dev-server" package could not be found.'); + } let entryPoints = [ - `webpack-dev-server/client?${clientAddress}` + `${webpackDevServerPath}?${clientAddress}` ]; if (serveTaskOptions.hmr) { const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
203f9626dfec22d9185f6ec49d0b11918370b276
2021-04-28 13:28:15
Charles Lyding
refactor(@angular/cli): correct various uncaught code style issues
false
correct various uncaught code style issues
refactor
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts index 45f44bdef26a..dd309030f928 100644 --- a/packages/angular/cli/commands/add-impl.ts +++ b/packages/angular/cli/commands/add-impl.ts @@ -131,7 +131,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> { // 'latest' is invalid so search for most recent matching package const versionManifests = Object.values(packageMetadata.versions).filter( (value: PackageManifest) => !prerelease(value.version) && !value.deprecated, - ) as PackageManifest[]; + ); versionManifests.sort((a, b) => rcompare(a.version, b.version, true)); diff --git a/packages/angular/cli/commands/extract-i18n-impl.ts b/packages/angular/cli/commands/extract-i18n-impl.ts index e559f0cc4af4..47c25b0ca6c6 100644 --- a/packages/angular/cli/commands/extract-i18n-impl.ts +++ b/packages/angular/cli/commands/extract-i18n-impl.ts @@ -16,15 +16,19 @@ export class ExtractI18nCommand extends ArchitectCommand<ExtractI18nCommandSchem const version = process.version.substr(1).split('.'); if (Number(version[0]) === 12 && Number(version[1]) === 0) { this.logger.error( - 'Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. ' - + 'Please upgrade to Node.js 12.1 or later.'); + 'Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. ' + + 'Please upgrade to Node.js 12.1 or later.', + ); return 1; } const commandName = process.argv[2]; if (['xi18n', 'i18n-extract'].includes(commandName)) { - this.logger.warn(`Warning: "ng ${commandName}" has been deprecated and will be removed in a future major version. Please use "ng extract-i18n" instead.`); + this.logger.warn( + `Warning: "ng ${commandName}" has been deprecated and will be removed in a future major version. ` + + 'Please use "ng extract-i18n" instead.', + ); } return this.runArchitectTarget(options); diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts index 075bb20eda30..e4448a9178a0 100644 --- a/packages/angular/cli/commands/new-impl.ts +++ b/packages/angular/cli/commands/new-impl.ts @@ -8,7 +8,6 @@ import { Arguments } from '../models/interface'; import { SchematicCommand } from '../models/schematic-command'; -import { ensureCompatibleNpm } from '../utilities/package-manager'; import { Schema as NewCommandSchema } from './new'; diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts index 9b1a248c520c..4daaeb3d3c88 100644 --- a/packages/angular/cli/commands/serve-impl.ts +++ b/packages/angular/cli/commands/serve-impl.ts @@ -13,7 +13,7 @@ import { Schema as ServeCommandSchema } from './serve'; export class ServeCommand extends ArchitectCommand<ServeCommandSchema> { public readonly target = 'serve'; - public validate(_options: ArchitectCommandOptions & Arguments) { + public validate() { return true; } diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts index 86c06b3bf2c7..cb1764824c87 100644 --- a/packages/angular/cli/lib/init.ts +++ b/packages/angular/cli/lib/init.ts @@ -12,7 +12,6 @@ import 'symbol-observable'; import * as fs from 'fs'; import * as path from 'path'; import { SemVer } from 'semver'; -import { Duplex } from 'stream'; import { colors } from '../utilities/color'; import { isWarningEnabled } from '../utilities/config'; diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts index 6b13e3fc31ca..7f334aefe748 100644 --- a/packages/angular/cli/models/command.ts +++ b/packages/angular/cli/models/command.ts @@ -52,7 +52,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> return 0; } - async printJsonHelp(_options: T & Arguments): Promise<number> { + async printJsonHelp(): Promise<number> { const replacer = (key: string, value: string) => key === 'name' ? strings.dasherize(value) : value; @@ -176,7 +176,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> if (options.help === true) { return this.printHelp(); } else if (options.help === 'json' || options.help === 'JSON') { - return this.printJsonHelp(options); + return this.printJsonHelp(); } else { const startTime = +new Date(); if (this.useReportAnalytics) { diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts index 5f134236a031..99d2f13a95c1 100644 --- a/packages/angular/cli/models/schematic-command.ts +++ b/packages/angular/cli/models/schematic-command.ts @@ -243,7 +243,7 @@ export abstract class SchematicCommand< packageRegistry: options.packageRegistry, // A schema registry is required to allow customizing addUndefinedDefaults registry: new schema.CoreSchemaRegistry(formats.standardFormats), - resolvePaths: !!this.workspace + resolvePaths: this.workspace // Workspace ? this.collectionName === this.defaultCollectionName // Favor __dirname for @schematics/angular to use the build-in version diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json index 620bb25421dd..1453551cd593 100644 --- a/packages/angular/cli/package.json +++ b/packages/angular/cli/package.json @@ -46,6 +46,9 @@ "symbol-observable": "4.0.0", "uuid": "8.3.2" }, + "devDependencies": { + "rxjs": "6.6.7" + }, "ng-update": { "migrations": "@schematics/angular/migrations/migration-collection.json", "packageGroup": { diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts index 91d18fa42cfc..21005571bd9d 100644 --- a/packages/angular/cli/src/commands/update/schematic/index.ts +++ b/packages/angular/cli/src/commands/update/schematic/index.ts @@ -435,7 +435,7 @@ function _usageMessage( target, }; }) - .filter(({ name, info, version, target }) => { + .filter(({ info, version, target }) => { return (target && semver.compare(info.installed.version, version) < 0); }) .filter(({ target }) => {
d8fcb122e9a72c9b34007712b8493d2a148eb850
2017-10-20 03:29:12
Filipe Silva
fix(@angular/cli): support rxjs 5.5 path alias
false
support rxjs 5.5 path alias
fix
diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts index be41b0f12925..40c45598e927 100644 --- a/packages/@angular/cli/models/webpack-configs/common.ts +++ b/packages/@angular/cli/models/webpack-configs/common.ts @@ -5,6 +5,7 @@ import { NamedLazyChunksWebpackPlugin } from '../../plugins/named-lazy-chunks-we import { InsertConcatAssetsWebpackPlugin } from '../../plugins/insert-concat-assets-webpack-plugin'; import { extraEntryParser, getOutputHashFormat, AssetPattern } from './utils'; import { isDirectory } from '../../utilities/is-directory'; +import { requireProjectModule } from '../../utilities/require-project-module'; import { WebpackConfigOptions } from '../webpack-config'; const ConcatPlugin = require('webpack-concat-plugin'); @@ -12,7 +13,6 @@ const ProgressPlugin = require('webpack/lib/ProgressPlugin'); const CircularDependencyPlugin = require('circular-dependency-plugin'); const SilentError = require('silent-error'); - /** * Enumerate loaders and their dependencies from this file to let the dependency validator * know they are used. @@ -159,11 +159,21 @@ export function getCommonConfig(wco: WebpackConfigOptions) { // Read the tsconfig to determine if we should prefer ES2015 modules. + // Load rxjs path aliases. + // https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md#build-and-treeshaking + let alias = {}; + try { + const rxjsPathMappingImport = 'rxjs/_esm5/path-mapping'; + const rxPaths = requireProjectModule(projectRoot, rxjsPathMappingImport); + alias = rxPaths(nodeModules); + } catch (e) { } + return { resolve: { extensions: ['.ts', '.js'], modules: ['node_modules', nodeModules], - symlinks: !buildOptions.preserveSymlinks + symlinks: !buildOptions.preserveSymlinks, + alias }, resolveLoader: { modules: [nodeModules, 'node_modules']
806383604250fe71ffbc8f9143c455b231169ff8
2020-05-01 03:42:46
Filipe Silva
build: add rbe_ubuntu1604-angular docker permissions
false
add rbe_ubuntu1604-angular docker permissions
build
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index b33348214a91..88ced2244eaa 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -26,6 +26,14 @@ platform( name: "dockerAddCapabilities" value: "SYS_ADMIN" } + properties: { + name: "dockerNetwork" + value: "standard" + } + properties: { + name: "Pool" + value: "default" + } """, )
8e5717acb211625c53f32259f21cbaf1b8fff8a4
2020-07-30 15:18:12
Charles Lyding
test: ensure schematics CLI E2E tests use local package registry
false
ensure schematics CLI E2E tests use local package registry
test
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts b/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts index 7f54b7a582d6..34125b932455 100644 --- a/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts +++ b/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts @@ -11,7 +11,7 @@ export default async function () { return; } - fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8'); + process.env['NPM_CONFIG_REGISTRY'] = 'http://localhost:4873'; await silentNpm( 'install', diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts b/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts index 791ebbfa6bca..148f804cbeaa 100644 --- a/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts +++ b/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts @@ -11,7 +11,7 @@ export default async function () { return; } - fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8'); + process.env['NPM_CONFIG_REGISTRY'] = 'http://localhost:4873'; await silentNpm( 'install',
55e9161a9f537a4ef7bd0c3dafc52790752556b5
2022-04-06 20:11:36
Renovate Bot
build: update github/codeql-action action to v2.1.7
false
update github/codeql-action action to v2.1.7
build
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 709a80309280..cde0cf2603d7 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -45,6 +45,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: 'Upload to code-scanning' - uses: github/codeql-action/upload-sarif@28eead240834b314f7def40f6fcba65d100d99b1 # tag=v2.1.6 + uses: github/codeql-action/upload-sarif@0182a2c78c8a55b763909348834ed54d735ab3e2 # tag=v2.1.7 with: sarif_file: results.sarif
053897f3278a07728cf1425e100ec1b8d2a45cc6
2016-03-31 09:00:38
gdi2290
chore(express-engine): update beta.13
false
update beta.13
chore
diff --git a/modules/express-engine/package.json b/modules/express-engine/package.json index 14ef89470cd5..203d61587caf 100644 --- a/modules/express-engine/package.json +++ b/modules/express-engine/package.json @@ -26,7 +26,7 @@ "url": "https://github.com/angular/universal/issues" }, "devDependencies": { - "angular2": "2.0.0-beta.12", + "angular2": "2.0.0-beta.13", "rxjs": "5.0.0-beta.2", "typescript": "^1.8.7", "angular2-universal-preview": "file:../universal", @@ -35,6 +35,6 @@ "dependencies": { }, "peerDependencies": { - "angular2-universal-preview": ">= 0.70.3" + "angular2-universal-preview": ">=0.84.2" } }
668e790fdc312a8d1b458c846ebb16505037bcfa
2019-01-16 03:47:55
Charles Lyding
test: additional tests for conditional ES2015 polyfills
false
additional tests for conditional ES2015 polyfills
test
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts index d760f4634047..29b1930b199a 100644 --- a/tests/legacy-cli/e2e/tests/build/polyfills.ts +++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts @@ -15,6 +15,7 @@ export default async function () { await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js'); expectFileToMatch('dist/test-project/index.html', oneLineTrim` <script type="text/javascript" src="runtime.js"></script> + <script type="text/javascript" src="es2015-polyfills.js" nomodule></script> <script type="text/javascript" src="polyfills.js"></script> `); const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js'); @@ -27,7 +28,7 @@ export default async function () { await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js'); expectFileToMatch('dist/test-project/index.html', oneLineTrim` <script type="text/javascript" src="runtime.js"></script> - <script type="text/javascript" src="ie-support.js" nomodule></script> + <script type="text/javascript" src="es2015-polyfills.js" nomodule></script> <script type="text/javascript" src="polyfills.js"></script> `); } diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts new file mode 100644 index 000000000000..2bbe31b19337 --- /dev/null +++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts @@ -0,0 +1,32 @@ +import { oneLineTrim } from 'common-tags'; +import { expectFileNotToExist, expectFileToMatch } from '../../utils/fs'; +import { ng } from '../../utils/process'; +import { updateJsonFile } from '../../utils/project'; + +export default async function () { + await updateJsonFile('angular.json', workspaceJson => { + const appArchitect = workspaceJson.projects['test-project'].architect; + appArchitect.build.options.es5BrowserSupport = false; + }); + + await ng('build'); + await expectFileNotToExist('dist/test-project/es2015-polyfills.js'); + await expectFileToMatch('dist/test-project/index.html', oneLineTrim` + <script type="text/javascript" src="runtime.js"></script> + <script type="text/javascript" src="polyfills.js"></script> + <script type="text/javascript" src="styles.js"></script> + <script type="text/javascript" src="vendor.js"></script> + <script type="text/javascript" src="main.js"></script> + `); + + await ng('build', `--es5BrowserSupport`); + await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js'); + await expectFileToMatch('dist/test-project/index.html', oneLineTrim` + <script type="text/javascript" src="runtime.js"></script> + <script type="text/javascript" src="es2015-polyfills.js" nomodule></script> + <script type="text/javascript" src="polyfills.js"></script> + <script type="text/javascript" src="styles.js"></script> + <script type="text/javascript" src="vendor.js"></script> + <script type="text/javascript" src="main.js"></script> + `); +}
2d92defb54e7f1c6c528889377abd3d37e063f6b
2022-02-08 12:32:20
Renovate Bot
build: lock file maintenance
false
lock file maintenance
build
diff --git a/yarn.lock b/yarn.lock index 2d1eb48397ba..d429a625a598 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,6 +34,13 @@ "@jridgewell/resolve-uri" "^3.0.3" sourcemap-codec "1.4.8" +"@ampproject/remapping@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23" + integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g== + dependencies: + "@jridgewell/trace-mapping" "^0.3.0" + "@angular-devkit/[email protected]": version "0.1302.0-rc.1" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1302.0-rc.1.tgz#090e86312f6c57da83e46cda4833b37843f1ebf1" @@ -326,13 +333,20 @@ dependencies: tslib "^2.3.0" -"@angular/[email protected]", "@angular/core@^13.0.0 || ^14.0.0-0": +"@angular/[email protected]": version "13.2.0" resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.2.0.tgz#8db7b6f56eb2f211b72d943582061b247f39fe7f" integrity sha512-mWRWbbZ6k00AicA/GrxmWKaw8upo77sRQz4tSYKpwVKt2TtCeoW8OkdYUpnmuVjxpF0bD6PtVc0e1fD6es/ElA== dependencies: tslib "^2.3.0" +"@angular/core@^13.0.0 || ^14.0.0-0": + version "13.2.1" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.2.1.tgz#f5c1cd65bda3500e63fb32f8321788f7656c8bab" + integrity sha512-+V/ZUuMqXDXM5Moo9wWbkM9O55POqAyP0oECoYvVStCDLDXGfWGOSysJIbsp07dsoEx8/kmKWV7Q7ZdHMTVvJg== + dependencies: + tslib "^2.3.0" + "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#838437e8f6056f933f595890019824c9283e48c6": version "0.0.0-371b650cc4294b677bad453df3cb9e4a49a0941c" uid "838437e8f6056f933f595890019824c9283e48c6" @@ -447,11 +461,11 @@ "@babel/highlight" "^7.16.7" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60" - integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q== + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" + integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== -"@babel/[email protected]", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.8.6": +"@babel/[email protected]": version "7.16.12" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784" integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg== @@ -472,7 +486,28 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/[email protected]", "@babel/generator@^7.16.8": +"@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.8.6": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5" + integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA== + dependencies: + "@ampproject/remapping" "^2.0.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.0" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.17.0" + "@babel/parser" "^7.17.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.0" + "@babel/types" "^7.17.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + +"@babel/[email protected]": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe" integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw== @@ -481,6 +516,15 @@ jsesc "^2.5.1" source-map "^0.5.0" +"@babel/generator@^7.16.8", "@babel/generator@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e" + integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw== + dependencies: + "@babel/types" "^7.17.0" + jsesc "^2.5.1" + source-map "^0.5.0" + "@babel/[email protected]", "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" @@ -507,9 +551,9 @@ semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c" - integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg== + version "7.17.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21" + integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -520,12 +564,12 @@ "@babel/helper-split-export-declaration" "^7.16.7" "@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48" - integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g== + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" + integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^4.7.1" + regexpu-core "^5.0.1" "@babel/helper-define-polyfill-provider@^0.3.1": version "0.3.1" @@ -679,14 +723,14 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" - integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== +"@babel/helpers@^7.16.7", "@babel/helpers@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b" + integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/traverse" "^7.17.0" + "@babel/types" "^7.17.0" "@babel/highlight@^7.16.7": version "7.16.10" @@ -697,10 +741,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.14.7", "@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7": - version "7.16.12" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6" - integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A== +"@babel/parser@^7.14.7", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" + integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -1297,13 +1341,20 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/[email protected]", "@babel/runtime@^7.8.4": +"@babel/[email protected]": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.8.4": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz#b8d142fc0f7664fb3d9b5833fd40dcbab89276c0" + integrity sha512-etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/[email protected]", "@babel/template@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" @@ -1313,26 +1364,26 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f" - integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" + integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.16.8" + "@babel/generator" "^7.17.0" "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-function-name" "^7.16.7" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.16.10" - "@babel/types" "^7.16.8" + "@babel/parser" "^7.17.0" + "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1" - integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg== +"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" @@ -1859,9 +1910,22 @@ integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jridgewell/resolve-uri@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.3.tgz#b80093f4edbb5490c49746231513669c8f518acb" - integrity sha512-fuIOnc81C5iRNevb/XPiM8Khp9bVjreydRQ37rt0C/dY0PAW1DRvEM3WrKX/5rStS5lbgwS0FCgqSndh9tvK5w== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" + integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.10" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186" + integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg== + +"@jridgewell/trace-mapping@^0.3.0": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde" + integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" "@microsoft/[email protected]": version "7.15.3" @@ -2406,16 +2470,21 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.50": - version "0.0.50" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" - integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== +"@types/estree@*": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== "@types/[email protected]": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@^0.0.50": + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== + "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.28" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" @@ -2940,12 +3009,12 @@ abbrev@1: integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" + mime-types "~2.1.34" + negotiator "0.6.3" acorn-globals@^6.0.0: version "6.0.0" @@ -3053,7 +3122,7 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" [email protected], ajv@^8.0.0, ajv@^8.8.0: [email protected]: version "8.9.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== @@ -3073,6 +3142,16 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.0, ajv@^8.8.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" + integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + [email protected]: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -3345,12 +3424,12 @@ babel-plugin-polyfill-corejs2@^0.3.0: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060" - integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A== + version "0.5.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" + integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.1" - core-js-compat "^3.20.0" + core-js-compat "^3.21.0" babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.1" @@ -3700,9 +3779,9 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001299: - version "1.0.30001304" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz#38af55ed3fc8220cb13e35e6e7309c8c65a05559" - integrity sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ== + version "1.0.30001309" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz#e0ee78b9bec0704f67304b00ff3c5c0c768a9f62" + integrity sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA== [email protected]: version "1.0.0" @@ -4009,11 +4088,16 @@ [email protected]: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= [email protected], cookie@~0.4.1: [email protected]: version "0.4.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@~0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== + copy-anything@^2.0.1: version "2.0.6" resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" @@ -4033,10 +4117,10 @@ [email protected]: schema-utils "^4.0.0" serialize-javascript "^6.0.0" -core-js-compat@^3.20.0, core-js-compat@^3.20.2: - version "3.20.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6" - integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw== +core-js-compat@^3.20.2, core-js-compat@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885" + integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A== dependencies: browserslist "^4.19.1" semver "7.0.0" @@ -4094,18 +4178,18 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: which "^2.0.1" css-blank-pseudo@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.2.tgz#f8660f6a48b17888a9277e53f25cc5abec1f0169" - integrity sha512-hOb1LFjRR+8ocA071xUSmg5VslJ8NGo/I2qpUpdeAYyBVCgupS5O8SEVo4SxEMYyFBNodBkzG3T1iqW9HCXxew== + version "3.0.3" + resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561" + integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ== dependencies: - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" css-has-pseudo@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.3.tgz#4824a34cb92dae7e09ea1d3fd19691b653412098" - integrity sha512-0gDYWEKaGacwxCqvQ3Ypg6wGdD1AztbMm5h1JsactG2hP2eiflj808QITmuWBpE7sjSEVrAlZhPTVd/nNMj/hQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73" + integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw== dependencies: - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" [email protected]: version "6.5.1" @@ -4540,9 +4624,9 @@ ejs@^3.1.6: jake "^10.6.1" electron-to-chromium@^1.4.17: - version "1.4.57" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz#2b2766df76ac8dbc0a1d41249bc5684a31849892" - integrity sha512-FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw== + version "1.4.65" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz#c0820db06e268e0a2fd4dbce38fb5376d38ca449" + integrity sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw== emoji-regex@^8.0.0: version "8.0.0" @@ -4712,6 +4796,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.14.tgz#3705f32f209deeb11c275af47c298c8783dd5f0c" integrity sha512-be/Uw6DdpQiPfula1J4bdmA+wtZ6T3BRCZsDMFB5X+k0Gp8TIh9UvmAcqvKNnbRAafSaXG3jPCeXxDKqnc8hFQ== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.19.tgz#32b8a03366440018f40d5fee7608336a5e4ae718" + integrity sha512-5Mziv27+XaHXEizlDBkgzSbkYvAyPCwarmMHr5WYYjtM4oAz1DdIT+arZY1mW6M4/5pGPsmFCGyJ3UVXtgjtMw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.13.tgz#51ad2fbf8c9d73c1d40e5f9ab6122ffa95f5b494" @@ -4722,6 +4811,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.14.tgz#c07e4eae6d938300a2d330ea82494c55bcea84e5" integrity sha512-BEexYmjWafcISK8cT6O98E3TfcLuZL8DKuubry6G54n2+bD4GkoRD6HYUOnCkfl2p7jodA+s4369IjSFSWjtHg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.19.tgz#2c3e49b358a85328676298e327c158a936ecbd87" + integrity sha512-7AVoNnlLkU2Cm7yaJkPO3RxDwjbXR5pv6JQlnhUEjGdq2+anR235whUf9bJ77s3PgawLKN4bd/FiS+zTnrR5DA== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.13.tgz#7ff177193cffbba518a59dfa4666a2fbb3345330" @@ -4732,6 +4826,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.14.tgz#a8631e13a51a6f784fb0906e2a64c6ab53988755" integrity sha512-tnBKm41pDOB1GtZ8q/w26gZlLLRzVmP8fdsduYjvM+yFD7E2DLG4KbPAqFMWm4Md9B+DitBglP57FY7AznxbTg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.19.tgz#6eb8ea8d4dc161889ec5e4e66c2ec9719e9f46df" + integrity sha512-0th1UC7AwpUVjRAVbfrHeFMxAO4mHfj+ai+gkUmoTNmAZ2h5+wJM0la+9hEu7MtgE70NoX7c1m50PKJupFOk6A== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.13.tgz#648357ff0ca399ce65f7e7ebfff701cf105c70f3" @@ -4742,6 +4841,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.14.tgz#c280c2b944746b27ee6c6487c2691865c90bed2e" integrity sha512-Q9Rx6sgArOHalQtNwAaIzJ6dnQ8A+I7f/RsQsdkS3JrdzmnlFo8JEVofTmwVQLoIop7OKUqIVOGP4PoQcwfVMA== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.19.tgz#1868e2182e5f8933d986e2ef26e983722b826557" + integrity sha512-RvEKE6qUAlT8HpICIcj73ebOpwoRLKVNBcJVmeYEsiIwtJf/Cc0TW/jQagwqe3s2Cw0Os+FBtB7azNW670zwLQ== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.13.tgz#7cb0016dd64fd116624c56dcfe58b27fac8ceaee" @@ -4752,6 +4856,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.14.tgz#aa4e21276efcf20e5ab2487e91ca1d789573189b" integrity sha512-TJvq0OpLM7BkTczlyPIphcvnwrQwQDG1HqxzoYePWn26SMUAlt6wrLnEvxdbXAvNvDLVzG83kA+JimjK7aRNBA== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.19.tgz#fa853e4bc003ea81820776a7da94bf4f20007243" + integrity sha512-XIZKnLHwz4E18FOWi4bdl8CkV7HYxqHE8WS7j3HFw0+uJa6S0iCqDTz5QyQxxOxXbytQdKWAdB7zuU8k3KbrQA== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.13.tgz#50b197f6831e824660ab80d011b656505a0aae32" @@ -4762,6 +4871,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.14.tgz#3db4d929239203ce38a9060d5419ac6a6d28846c" integrity sha512-h/CrK9Baimt5VRbu8gqibWV7e1P9l+mkanQgyOgv0Ng3jHT1NVFC9e6rb1zbDdaJVmuhWX5xVliUA5bDDCcJeg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.19.tgz#adfb3f9bed5a28e30aa4d7771a77cb3c4aef2992" + integrity sha512-v1NBJjhYzJPJNrBzhiGGyM9N1rUsqLtyLPSnLldnvrWTC+OYgTbq2vItvzXKM6P36VpioFsPIIGe0FYI+z/lUg== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.13.tgz#d2ee4d780e3cadd129ab8988c7c75ca4bd636f3a" @@ -4772,6 +4886,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.14.tgz#f880026254c1f565a7a10fdebb7cff9b083a127d" integrity sha512-IC+wAiIg/egp5OhQp4W44D9PcBOH1b621iRn1OXmlLzij9a/6BGr9NMIL4CRwz4j2kp3WNZu5sT473tYdynOuQ== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.19.tgz#30a0066ff9293ae4b9a8ad4d4b4010b31db04260" + integrity sha512-DtnOiAo0Vc4elOxl8U6wRMRXEj7ZMVy1brlzGGS8ia1IzDoJce10+3y7yvhzJsTlYjIC2uZ1gfUadGSX+L1ZXg== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.13.tgz#9151963c55cd42968c97f2fd354cd6ff9b3cb476" @@ -4782,6 +4901,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.14.tgz#a34bc3076e50b109c3b8c8bad9c146e35942322b" integrity sha512-6QVul3RI4M5/VxVIRF/I5F+7BaxzR3DfNGoqEVSCZqUbgzHExPn+LXr5ly1C7af2Kw4AHpo+wDqx8A4ziP9avw== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.19.tgz#0bd976ec6ac92962e67df6a8825b71d1039f3527" + integrity sha512-igp6q1r60mGgOnzOkFdfa7GueXdTtsUCdkKvnKi3GMHIartBwccIIT1KfmE3JUAKsCpmuu0Qn6m05Oje7fIftw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.13.tgz#80e94cd8920607dc0addb97bac7ff5988d0fc28f" @@ -4792,6 +4916,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.14.tgz#231ffd12fef69ee06365d4c94b69850e4830e927" integrity sha512-gxpOaHOPwp7zSmcKYsHrtxabScMqaTzfSQioAMUaB047YiMuDBzqVcKBG8OuESrYkGrL9DDljXr/mQNg7pbdaQ== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.19.tgz#98d91bb47b758f7cd78122d65043bc588ca0392f" + integrity sha512-NAKn1k0sH7V1Qy2myC7DEwDKA6ZgHm9u0Iu8Sl3Ke+H9Mw4KN4/fxWa+NGaXc0s/qeM2zIz6OPc39UxREeu+jQ== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.13.tgz#8e7eeef567b0895f2ecc4d66b1f1e5a542f1ce5b" @@ -4802,6 +4931,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.14.tgz#bd00570e3a30422224b732c7a5f262146c357403" integrity sha512-4Jl5/+xoINKbA4cesH3f4R+q0vltAztZ6Jm8YycS8lNhN1pgZJBDxWfI6HUMIAdkKlIpR1PIkA9aXQgZ8sxFAg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.19.tgz#85579e946c7fe9d4c969e8cc1abc02fcd6b64230" + integrity sha512-fxqV/oe3uZYBWIwzYYX78qeMKoF+ovPCv5Y6OEBdw5bBvzhsY2SXHeMtedYSOAEtoUwQbPbRShXb1WpBLR/bTw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.13.tgz#ffbe9915a1d8080f9810a9c5938f453003c6de98" @@ -4812,6 +4946,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.14.tgz#430609413fd9e04d9def4e3f06726b031b23d825" integrity sha512-BitW37GxeebKxqYNl4SVuSdnIJAzH830Lr6Mkq3pBHXtzQay0vK+IeOR/Ele1GtNVJ+/f8wYM53tcThkv5SC5w== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.19.tgz#5441f8e86c9fa20be4e97d070ced7d18d6d797a7" + integrity sha512-YbfC4HD4GbiwkojrAL3aXHzvuOfUZwUMQP5EoctsOQQ5yYlfYQkeXtE2KWaoc1uf9XHsmLaapkEOL4Y30rhPEg== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.13.tgz#e27274d12f198580892432115fc0de432431d33d" @@ -4822,6 +4961,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.14.tgz#2f0d8cbfe53cf3cb97f6372549a41a8051dbd689" integrity sha512-vLj6p76HOZG3wfuTr5MyO3qW5iu8YdhUNxuY+tx846rPo7GcKtYSPMusQjeVEfZlJpSYoR+yrNBBxq+qVF9zrw== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.19.tgz#824478c5561835e0814fef98ae9376d5c27a3537" + integrity sha512-cjVGsJh+XAzWH/KmqaLcMKP7qP4WJJILmrn3AKVWhcNEYX/pfXFE6Gi1DIr/Wzp1j9cX+wA5xFCo4CJV0QPSSw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.13.tgz#78199fa57d5794e6ac6c33993dd0588fba22b353" @@ -4832,6 +4976,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.14.tgz#3e44de35e1add7e9582f3c0d2558d86aafbc813b" integrity sha512-fn8looXPQhpVqUyCBWUuPjesH+yGIyfbIQrLKG05rr1Kgm3rZD/gaYrd3Wpmf5syVZx70pKZPvdHp8OTA+y7cQ== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.19.tgz#144db6a7d7a6f7c0665dfb08802ec7385a5280c1" + integrity sha512-tteQWdqq4u4BpP3CjpW1CpZbeIuAtdrKV0i0C0TrrL5T0d1DPiGjiNuqu1YsyCfSP44Umk5DT4GZD0kpEwNN1g== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.13.tgz#5394336b602e1db15583bbef7d827a2b9648e373" @@ -4842,6 +4991,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.14.tgz#04710ef1d01cd9f15d54f50d20b5a3778f8306a2" integrity sha512-HdAnJ399pPff3SKbd8g+P4o5znseni5u5n5rJ6Z7ouqOdgbOwHe2ofZbMow17WMdNtz1IyOZk2Wo9Ve6/lZ4Rg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.19.tgz#7315464f4981acc21ba9f0f7ef1e303bba5f66f8" + integrity sha512-W6aQZlLkMHerQ6wKCR869pwkg5ohTUKNuhC8EBl9t6Cb8kv2KLWC8hG+477hksdeWMaVimu3pHvzCMVkBDIhmw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.13.tgz#4afcddcece51f943149fa07274bd58f64e0913a8" @@ -4852,6 +5006,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.14.tgz#8e583dd92c5c7ac4303ddc37f588e44211e04e19" integrity sha512-bmDHa99ulsGnYlh/xjBEfxoGuC8CEG5OWvlgD+pF7bKKiVTbtxqVCvOGEZeoDXB+ja6AvHIbPxrEE32J+m5nqQ== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.19.tgz#13f99b3b7ece52b0166a5375f89674cde1d635c9" + integrity sha512-FIsHunnUs6DqCYdkUNScxbdvjxIxW/33+4Kz6BNMekKPCqOKnXU/0xIaoRt7f798B4UI+ocx31hqSViRn37Qig== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.14.13.tgz#7850d9ccbe589a3fe9f0ac3bd5fd2095de0cbc65" @@ -4872,6 +5031,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.14.tgz#6d293ddfb71229f21cc13d85d5d2f43e8131693b" integrity sha512-6tVooQcxJCNenPp5GHZBs/RLu31q4B+BuF4MEoRxswT+Eq2JGF0ZWDRQwNKB8QVIo3t6Svc5wNGez+CwKNQjBg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.19.tgz#5d2a46ec5bdb7a6a91146953dd3ac575beaa1a85" + integrity sha512-HY9k1v9LXFYicR4h4F6c04a4Ls7jp2MOAxDVRAofq4Exfx5oogskFSAl2vdRfhmtBYGE9TrGUSs4GUUuKTsfWQ== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.13.tgz#3bbfba58e0185121280bd47ccd073b6c1849fd27" @@ -4882,6 +5046,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.14.tgz#08a36844b69542f8ec1cb33a5ddcea02b9d0b2e8" integrity sha512-kl3BdPXh0/RD/dad41dtzj2itMUR4C6nQbXQCyYHHo4zoUoeIXhpCrSl7BAW1nv5EFL8stT1V+TQVXGZca5A2A== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.19.tgz#8d5889a7370c84ef6d53c10535b022ab9c5864a2" + integrity sha512-qtDhyyCgHPjVQXNWQsfs5+dzqXeOkD58RmowUx7ps8prmkCfsSz6Uv0z0xgz04+S7ozng3+JSWHRc3JklpvLOg== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.13.tgz#9203d40d915d809c50bc91af5a8373e5f5abfc4c" @@ -4892,6 +5061,11 @@ [email protected]: resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.14.tgz#ca747ce4066d5b8a79dbe48fe6ecd92d202e5366" integrity sha512-dCm1wTOm6HIisLanmybvRKvaXZZo4yEVrHh1dY0v582GThXJOzuXGja1HIQgV09RpSHYRL3m4KoUBL00l6SWEg== [email protected]: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.19.tgz#cbb66fa06143ec7fe5538b5aef904daaa1c69a0e" + integrity sha512-i1vTm6dwHCoXB+Dg2bmyr/DlJevA05nHem0QlKK4XmR0lGqJjOmmvNKyOEyXCYMBCSqnJKpg5bDBY3O1mRO8Cw== + [email protected]: version "0.14.13" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.13.tgz#ce3fc7c45a6b8a40caad43daa39cdb9c1e84930a" @@ -4916,7 +5090,7 @@ [email protected]: esbuild-windows-64 "0.14.13" esbuild-windows-arm64 "0.14.13" [email protected], esbuild@^0.14.0: [email protected]: version "0.14.14" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.14.tgz#3b99f20d628013c3e2ae90e67687e03f1d6eb071" integrity sha512-aiK4ddv+uui0k52OqSHu4xxu+SzOim7Rlz4i25pMEiC8rlnGU0HJ9r+ZMfdWL5bzifg+nhnn7x4NSWTeehYblg== @@ -4940,6 +5114,30 @@ [email protected], esbuild@^0.14.0: esbuild-windows-64 "0.14.14" esbuild-windows-arm64 "0.14.14" +esbuild@^0.14.0: + version "0.14.19" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.19.tgz#d9cc016f3fa7affe705617126e3ed51791374324" + integrity sha512-aBbxc+wvD608wYlpKGtOjUGnhiM/0LLndrkVL8dYxIRb3I+lEBJ1w3i2A4rfd5z3Tf4IzJJ1c+HHliC02WQdJg== + optionalDependencies: + esbuild-android-arm64 "0.14.19" + esbuild-darwin-64 "0.14.19" + esbuild-darwin-arm64 "0.14.19" + esbuild-freebsd-64 "0.14.19" + esbuild-freebsd-arm64 "0.14.19" + esbuild-linux-32 "0.14.19" + esbuild-linux-64 "0.14.19" + esbuild-linux-arm "0.14.19" + esbuild-linux-arm64 "0.14.19" + esbuild-linux-mips64le "0.14.19" + esbuild-linux-ppc64le "0.14.19" + esbuild-linux-s390x "0.14.19" + esbuild-netbsd-64 "0.14.19" + esbuild-openbsd-64 "0.14.19" + esbuild-sunos-64 "0.14.19" + esbuild-windows-32 "0.14.19" + esbuild-windows-64 "0.14.19" + esbuild-windows-arm64 "0.14.19" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -5638,9 +5836,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" - integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== + version "13.12.1" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.1.tgz#ec206be932e6c77236677127577aa8e50bf1c5cb" + integrity sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw== dependencies: type-fest "^0.20.2" @@ -6432,9 +6630,9 @@ istanbul-lib-report@^3.0.0: supports-color "^7.1.0" istanbul-reports@^3.0.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.3.tgz#4bcae3103b94518117930d51283690960b50d3c2" - integrity sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg== + version "3.1.4" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -6494,10 +6692,10 @@ jasminewd2@^2.1.0: resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4= -jest-worker@^27.4.1: - version "27.4.6" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e" - integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw== +jest-worker@^27.4.5: + version "27.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.0.tgz#99ee77e4d06168107c27328bd7f54e74c3a48d59" + integrity sha512-8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -7063,7 +7261,7 @@ [email protected]: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memfs@^3.2.2: +memfs@^3.2.2, memfs@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== @@ -7120,7 +7318,7 @@ [email protected], [email protected], "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== @@ -7166,13 +7364,20 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== [email protected], minimatch@^3.0.2, minimatch@^3.0.4: [email protected]: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" +minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + [email protected]: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7315,7 +7520,7 @@ [email protected]: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nanoid@^3.1.30: +nanoid@^3.1.30, nanoid@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== @@ -7334,12 +7539,7 @@ needle@^2.5.2: iconv-lite "^0.4.4" sax "^1.2.4" [email protected]: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -negotiator@^0.6.2, negotiator@^0.6.3: [email protected], negotiator@^0.6.2, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -7358,9 +7558,9 @@ nice-napi@^1.0.2: node-gyp-build "^4.2.2" nock@^13.0.3: - version "13.2.2" - resolved "https://registry.yarnpkg.com/nock/-/nock-13.2.2.tgz#29a6942250278209c2b3e7a38310f703581b21fa" - integrity sha512-PcBHuvl9i6zfaJ50A7LS55oU+nFLv8htXIhffJO+FxyfibdZ4jEvd9kTuvkrJireBFIGMZ+oUIRpMK5gU9h//g== + version "13.2.4" + resolved "https://registry.yarnpkg.com/nock/-/nock-13.2.4.tgz#43a309d93143ee5cdcca91358614e7bde56d20e1" + integrity sha512-8GPznwxcPNCH/h8B+XZcKjYPXnUV5clOKCjAqyjsiqA++MpNx9E9+t8YPp0MbThO+KauRo7aZJ1WuIZmOrT2Ug== dependencies: debug "^4.1.0" json-stringify-safe "^5.0.1" @@ -7970,16 +8170,16 @@ postcss-attribute-case-insensitive@^5.0.0: postcss-selector-parser "^6.0.2" postcss-color-functional-notation@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.1.tgz#a25e9e1855e14d04319222a689f120b3240d39e0" - integrity sha512-62OBIXCjRXpQZcFOYIXwXBlpAVWrYk8ek1rcjvMING4Q2cf0ipyN9qT+BhHA6HmftGSEnFQu2qgKO3gMscl3Rw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz#f59ccaeb4ee78f1b32987d43df146109cc743073" + integrity sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ== dependencies: postcss-value-parser "^4.2.0" postcss-color-hex-alpha@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.2.tgz#7a248b006dd47bd83063f662352d31fd982f74ec" - integrity sha512-gyx8RgqSmGVK156NAdKcsfkY3KPGHhKqvHTL3hhveFrBBToguKFzhyiuk3cljH6L4fJ0Kv+JENuPXs1Wij27Zw== + version "8.0.3" + resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz#61a0fd151d28b128aa6a8a21a2dad24eebb34d52" + integrity sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw== dependencies: postcss-value-parser "^4.2.0" @@ -8010,39 +8210,39 @@ postcss-custom-selectors@^6.0.0: postcss-selector-parser "^6.0.4" postcss-dir-pseudo-class@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.3.tgz#febfe305e75267913a53bf5094c7679f5cfa9b55" - integrity sha512-qiPm+CNAlgXiMf0J5IbBBEXA9l/Q5HGsNGkL3znIwT2ZFRLGY9U2fTUpa4lqCUXQOxaLimpacHeQC80BD2qbDw== + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz#9afe49ea631f0cb36fa0076e7c2feb4e7e3f049c" + integrity sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw== dependencies: - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" postcss-double-position-gradients@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.4.tgz#2484b9785ef3ba81b0f03a279c52ec58fc5344c2" - integrity sha512-qz+s5vhKJlsHw8HjSs+HVk2QGFdRyC68KGRQGX3i+GcnUjhWhXQEmCXW6siOJkZ1giu0ddPwSO6I6JdVVVPoog== + version "3.0.5" + resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.5.tgz#f6b755e9850bb9816dfbf8fa346d9ce2e8a03848" + integrity sha512-XiZzvdxLOWZwtt/1GgHJYGoD9scog/DD/yI5dcvPrXNdNDEv7T53/6tL7ikl+EM3jcerII5/XIQzd1UHOdTi2w== dependencies: postcss-value-parser "^4.2.0" postcss-env-function@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.4.tgz#4e85359ca4fcdde4ec4b73752a41de818dbe91cc" - integrity sha512-0ltahRTPtXSIlEZFv7zIvdEib7HN0ZbUQxrxIKn8KbiRyhALo854I/CggU5lyZe6ZBvSTJ6Al2vkZecI2OhneQ== + version "4.0.5" + resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.5.tgz#b9614d50abd91e4c88a114644a9766880dabe393" + integrity sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA== dependencies: postcss-value-parser "^4.2.0" postcss-focus-visible@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.3.tgz#14635b71a6b9140f488f11f26cbc9965a13f6843" - integrity sha512-ozOsg+L1U8S+rxSHnJJiET6dNLyADcPHhEarhhtCI9DBLGOPG/2i4ddVoFch9LzrBgb8uDaaRI4nuid2OM82ZA== + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e" + integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw== dependencies: - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" postcss-focus-within@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.3.tgz#0b0bf425f14a646bbfd973b463e2d20d85a3a841" - integrity sha512-fk9y2uFS6/Kpp7/A9Hz9Z4rlFQ8+tzgBcQCXAFSrXFGAbKx+4ZZOmmfHuYjCOMegPWoz0pnC6fNzi8j7Xyqp5Q== + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20" + integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ== dependencies: - postcss-selector-parser "^6.0.8" + postcss-selector-parser "^6.0.9" postcss-font-variant@^5.0.0: version "5.0.0" @@ -8050,14 +8250,14 @@ postcss-font-variant@^5.0.0: integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA== postcss-gap-properties@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz#562fbf43a6a721565b3ca0e01008690991d2f726" - integrity sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz#6401bb2f67d9cf255d677042928a70a915e6ba60" + integrity sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ== postcss-image-set-function@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.5.tgz#8cb3a971507e2c00d5532658af62529c89f0ecc6" - integrity sha512-D4jXzlypkJ6BiSoUGazrRlR+GF3SED+BeiRDzOmuinDKdAn/Wuu8KtEGa5Z4pg4kxyeSMBywMgNt2+Yi/TZPPw== + version "4.0.6" + resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz#bcff2794efae778c09441498f40e0c77374870a9" + integrity sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A== dependencies: postcss-value-parser "^4.2.0" @@ -8076,9 +8276,9 @@ postcss-initial@^4.0.1: integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ== postcss-lab-function@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.0.3.tgz#633745b324afbcd5881da85fe2cef58b17487536" - integrity sha512-MH4tymWmefdZQ7uVG/4icfLjAQmH6o2NRYyVh2mKoB4RXJp9PjsyhZwhH4ouaCQHvg+qJVj3RzeAR1EQpIlXZA== + version "4.0.4" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.0.4.tgz#504747ab2754e046fb01e72779bbb434a05357df" + integrity sha512-TAEW8X/ahMYV33mvLFQARtBPAy1VVJsiR9VVx3Pcbu+zlqQj0EIyJ/Ie1/EwxwIt530CWtEDzzTXBDzfdb+qIQ== dependencies: postcss-value-parser "^4.2.0" @@ -8092,9 +8292,9 @@ [email protected]: semver "^7.3.5" postcss-logical@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.3.tgz#9934e0fb16af70adbd94217b24d2f315ceb5c2f0" - integrity sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ== + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73" + integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g== postcss-media-minmax@^5.0.0: version "5.0.0" @@ -8137,9 +8337,9 @@ postcss-nesting@^10.1.2: postcss-selector-parser "^6.0.8" postcss-overflow-shorthand@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz#b4e9c89728cd1e4918173dfb95936b75f78d4148" - integrity sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg== + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz#ebcfc0483a15bbf1b27fdd9b3c10125372f4cbc2" + integrity sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg== postcss-page-break@^3.0.4: version "3.0.4" @@ -8147,9 +8347,9 @@ postcss-page-break@^3.0.4: integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ== postcss-place@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.3.tgz#ca8040dfd937c7769a233a3bd6e66e139cf89e62" - integrity sha512-tDQ3m+GYoOar+KoQgj+pwPAvGHAp/Sby6vrFiyrELrMKQJ4AejL0NcS0mm296OKKYA2SRg9ism/hlT/OLhBrdQ== + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.4.tgz#eb026650b7f769ae57ca4f938c1addd6be2f62c9" + integrity sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg== dependencies: postcss-value-parser "^4.2.0" @@ -8193,9 +8393,9 @@ [email protected]: postcss-selector-not "^5.0.0" postcss-pseudo-class-any-link@^7.0.2: - version "7.1.0" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.0.tgz#88eb02b9529c5458ffebc68df3760534b6c9fbbf" - integrity sha512-l7sAkLmm3bYq8wt8/0r/dn6o9mVCPq7MOiNrb/Xi2zBlw/+w1V2jKFo/3IijKHfJ92SwDqkVLPwQfGO3xxUdAw== + version "7.1.1" + resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz#534eb1dadd9945eb07830dbcc06fb4d5d865b8e0" + integrity sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg== dependencies: postcss-selector-parser "^6.0.9" @@ -8224,7 +8424,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== [email protected], postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.7: [email protected]: version "8.4.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== @@ -8233,6 +8433,15 @@ [email protected], postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.7: picocolors "^1.0.0" source-map-js "^1.0.1" +postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.7: + version "8.4.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" + integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== + dependencies: + nanoid "^3.2.0" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -8515,10 +8724,10 @@ reflect-metadata@^0.1.13, reflect-metadata@^0.1.2: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== -regenerate-unicode-properties@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" - integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== +regenerate-unicode-properties@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" + integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== dependencies: regenerate "^1.4.2" @@ -8557,27 +8766,27 @@ regexpp@^3.2.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -regexpu-core@^4.7.1: - version "4.8.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" - integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== +regexpu-core@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" + integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== dependencies: regenerate "^1.4.2" - regenerate-unicode-properties "^9.0.0" - regjsgen "^0.5.2" - regjsparser "^0.7.0" + regenerate-unicode-properties "^10.0.1" + regjsgen "^0.6.0" + regjsparser "^0.8.2" unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" -regjsgen@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== +regjsgen@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" + integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== -regjsparser@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" - integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== +regjsparser@^0.8.2: + version "0.8.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" + integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== dependencies: jsesc "~0.5.0" @@ -8726,9 +8935,9 @@ rollup-plugin-sourcemaps@^0.6.0: source-map-resolve "^0.6.0" rollup@~2.67.0: - version "2.67.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.0.tgz#496de7e641dbe39f681c5a82419cb5013917d406" - integrity sha512-W83AaERwvDiHwHEF/dfAfS3z1Be5wf7n+pO3ZAO5IQadCT2lBTr7WQ2MwZZe+nodbD+n3HtC4OCOAdsOPPcKZQ== + version "2.67.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.1.tgz#4402665706fa00f321d446ce45f880e02cf54f01" + integrity sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg== optionalDependencies: fsevents "~2.3.2" @@ -9048,9 +9257,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.6" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" - integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== slash@^3.0.0: version "3.0.0" @@ -9062,7 +9271,7 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== -smart-buffer@^4.1.0: +smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== @@ -9138,14 +9347,14 @@ socks-proxy-agent@^6.0.0: socks "^2.6.1" socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + version "2.6.2" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a" + integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA== dependencies: ip "^1.1.5" - smart-buffer "^4.1.0" + smart-buffer "^4.2.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -9509,11 +9718,11 @@ tar@^6.0.2, tar@^6.1.0, tar@^6.1.2: yallist "^4.0.0" terser-webpack-plugin@^5.1.3: - version "5.3.0" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" - integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== + version "5.3.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54" + integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g== dependencies: - jest-worker "^27.4.1" + jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" @@ -10072,7 +10281,7 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== [email protected], webpack-dev-middleware@^5.3.0: [email protected]: version "5.3.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c" integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg== @@ -10083,6 +10292,17 @@ [email protected], webpack-dev-middleware@^5.3.0: range-parser "^1.2.1" schema-utils "^4.0.0" +webpack-dev-middleware@^5.3.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f" + integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg== + dependencies: + colorette "^2.0.10" + memfs "^3.4.1" + mime-types "^2.1.31" + range-parser "^1.2.1" + schema-utils "^4.0.0" + [email protected]: version "4.7.3" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
95c72677a5884eb8aa2b869b8a499f41b9aaafc9
2019-01-12 03:38:48
Alan Agius
build: terminate process with non zero error code when build fails
false
terminate process with non zero error code when build fails
build
diff --git a/bin/devkit-admin b/bin/devkit-admin index 45abb60cc659..f356b0d42e96 100755 --- a/bin/devkit-admin +++ b/bin/devkit-admin @@ -68,7 +68,7 @@ try { .then(() => require(scriptPath).default(args, logger, cwd)) .then(exitCode => process.exit(exitCode || 0)) .catch(err => { - logger.fatal(err.stack); + logger.fatal(err && err.stack); process.exit(99); }); } catch (err) {
824bc76d91d25300a9de60c5bb38eac4844366df
2018-03-27 19:08:15
Mike Brocchi
test: Add e2e tests for generating application and library
false
Add e2e tests for generating application and library
test
diff --git a/tests/e2e/tests/generate/application/application-basic.ts b/tests/e2e/tests/generate/application/application-basic.ts new file mode 100644 index 000000000000..000969407663 --- /dev/null +++ b/tests/e2e/tests/generate/application/application-basic.ts @@ -0,0 +1,11 @@ +import {ng} from '../../../utils/process'; +import { expectFileToMatch } from '../../../utils/fs'; +import { useCIChrome } from '../../../utils/project'; + + +export default function() { + return ng('generate', 'application', 'app2') + .then(() => expectFileToMatch('angular.json', /\"app2\":/)) + .then(() => useCIChrome('app2')) + .then(() => ng('test', 'app2', '--watch=false')); +} diff --git a/tests/e2e/tests/generate/library/library-basic.ts b/tests/e2e/tests/generate/library/library-basic.ts new file mode 100644 index 000000000000..5fd2090b40e4 --- /dev/null +++ b/tests/e2e/tests/generate/library/library-basic.ts @@ -0,0 +1,13 @@ +import {ng} from '../../../utils/process'; +import { expectFileToMatch } from '../../../utils/fs'; + + +export default function() { + return ng('generate', 'library', 'my-lib') + .then(() => expectFileToMatch('angular.json', /\"my-lib\":/)); + + // TODO: enable once generating Angular v6 projects + // this is due to the service using `providedIn` + // .then(() => useCIChrome()) + // .then(() => ng('test', 'my-lib', '--watch=false')); +} diff --git a/tests/e2e/utils/project.ts b/tests/e2e/utils/project.ts index 81ad5265fd92..be841366dfe0 100644 --- a/tests/e2e/utils/project.ts +++ b/tests/e2e/utils/project.ts @@ -173,13 +173,13 @@ export function useCIDefaults() { }); } -export function useCIChrome() { +export function useCIChrome(projectDir = 'test-project') { // There's a race condition happening in Chrome. Enabling logging in chrome used by // protractor actually fixes it. Logging is piped to a file so it doesn't affect our setup. // --no-sandbox is needed for Circle CI. // Travis can use headless chrome, but not appveyor. return Promise.resolve() - .then(() => replaceInFile('projects/test-project-e2e/protractor.conf.js', + .then(() => replaceInFile(`projects/${projectDir}-e2e/protractor.conf.js`, `'browserName': 'chrome'`, `'browserName': 'chrome', chromeOptions: { @@ -192,7 +192,7 @@ export function useCIChrome() { `)) // Not a problem if the file can't be found. .catch(() => null) - .then(() => replaceInFile('projects/test-project/karma.conf.js', `browsers: ['Chrome'],`, + .then(() => replaceInFile(`projects/${projectDir}/karma.conf.js`, `browsers: ['Chrome'],`, `browsers: ['ChromeCI'], customLaunchers: { ChromeCI: {
117b2479807e09a074eeeeeeb2d977c3d9870c04
2020-01-23 01:08:33
Alan Agius
fix: update `@types/hapi__hapi` as they are incompatible with `@hapi/inert`
false
update `@types/hapi__hapi` as they are incompatible with `@hapi/inert`
fix
diff --git a/integration/hapi-engine-ivy/package.json b/integration/hapi-engine-ivy/package.json index 1cacd1f0416a..5b339a8a0384 100644 --- a/integration/hapi-engine-ivy/package.json +++ b/integration/hapi-engine-ivy/package.json @@ -39,7 +39,7 @@ "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular", "@angular/cli": "file:../../node_modules/@angular/cli", "@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli", - "@types/hapi__hapi": "^18.2.5", + "@types/hapi__hapi": "^19.0.0", "@types/hapi__inert": "^5.2.0", "@types/node": "file:../../node_modules/@types/node", "@types/jasmine": "file:../../node_modules/@types/jasmine", diff --git a/integration/hapi-engine-ve/package.json b/integration/hapi-engine-ve/package.json index a87d46b0738e..b8944448ee53 100644 --- a/integration/hapi-engine-ve/package.json +++ b/integration/hapi-engine-ve/package.json @@ -39,7 +39,7 @@ "@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular", "@angular/cli": "file:../../node_modules/@angular/cli", "@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli", - "@types/hapi__hapi": "^18.2.5", + "@types/hapi__hapi": "^19.0.0", "@types/hapi__inert": "^5.2.0", "@types/node": "file:../../node_modules/@types/node", "@types/jasmine": "file:../../node_modules/@types/jasmine", diff --git a/modules/hapi-engine/schematics/install/index.ts b/modules/hapi-engine/schematics/install/index.ts index e702faff4b16..41e2e25d2a77 100644 --- a/modules/hapi-engine/schematics/install/index.ts +++ b/modules/hapi-engine/schematics/install/index.ts @@ -48,7 +48,7 @@ function addDependencies(options: UniversalOptions): Rule { addPackageJsonDependency(host, { type: NodeDependencyType.Dev, name: '@types/hapi__hapi', - version: '^18.2.5', + version: '^19.0.0', }); addPackageJsonDependency(host, { type: NodeDependencyType.Default, diff --git a/package.json b/package.json index c9b9a66b3743..b6de036a9b01 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/browser-sync": "^2.26.1", "@types/express": "4.17.1", "@types/fs-extra": "^8.0.0", - "@types/hapi__hapi": "^18.2.5", + "@types/hapi__hapi": "^19.0.0", "@types/hapi__inert": "^5.2.0", "@types/http-proxy-middleware": "^0.19.3", "@types/jasmine": "^3.4.4", diff --git a/yarn.lock b/yarn.lock index 83979b74906b..125b8b9c9199 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,6 @@ # yarn lockfile v1 -<<<<<<< HEAD "@angular-devkit/[email protected]", "@angular-devkit/architect@^0.900.0-rc.10": version "0.900.0-rc.10" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-rc.10.tgz#5fee2dd12de787d02c4c78d6d5dd53364bcaae25" @@ -24,29 +23,6 @@ "@babel/generator" "7.7.7" "@babel/preset-env" "7.7.7" "@ngtools/webpack" "9.0.0-rc.10" -======= -"@angular-devkit/[email protected]", "@angular-devkit/architect@^0.900.0-rc.7": - version "0.900.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-rc.9.tgz#6d47718a92ecc3e13ce215fc5f62aabaa7193e07" - integrity sha512-BbOyISigspJolSvlDa2ZkpO3ciifwUkiIdkka/VgKPc1Tvo1jBsTfsA3e4DpoJWTeP/9DXgmXjkIk7Avof0jiA== - dependencies: - "@angular-devkit/core" "9.0.0-rc.9" - rxjs "6.5.3" - -"@angular-devkit/build-angular@^0.900.0-rc.7": - version "0.900.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.900.0-rc.9.tgz#820b1533a569fcfaadc44a0ac17630912b197824" - integrity sha512-Kh7ULqZD0U29+zac/hlb0Kyc4YBz60nfZ97cMwDbyOxQGfjua0VxbXlvHX3qYo6uiJkgeV6CvQQay4J6R5DSAg== - dependencies: - "@angular-devkit/architect" "0.900.0-rc.9" - "@angular-devkit/build-optimizer" "0.900.0-rc.9" - "@angular-devkit/build-webpack" "0.900.0-rc.9" - "@angular-devkit/core" "9.0.0-rc.9" - "@babel/core" "7.7.7" - "@babel/generator" "7.7.7" - "@babel/preset-env" "7.7.7" - "@ngtools/webpack" "9.0.0-rc.9" ->>>>>>> build: update to version ajv "6.10.2" autoprefixer "9.7.1" babel-loader "8.0.6" @@ -101,17 +77,10 @@ webpack-subresource-integrity "1.3.4" worker-plugin "3.2.0" -<<<<<<< HEAD "@angular-devkit/[email protected]": version "0.900.0-rc.10" resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.0-rc.10.tgz#e2351297689185ed71b07d0537fc1d3c73e9b2b7" integrity sha512-cQkOLwzIdhZgAzkpea2Pi1oS8C8BDo+aB06JchMpdRudi1+ArbTbsaH/2FYhHMD4jkK2XCfKT8yFx20J8t2lVg== -======= -"@angular-devkit/[email protected]": - version "0.900.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.0-rc.9.tgz#d508896f2bc75c9719c9ebc0c8b5781ca355d069" - integrity sha512-1b68UheGtQEqiUks4G2cgCnt71yWc9MkLjElrvlxamKeJu/7dN8V4yvk0slHZtF1xkAhHFZZzDcwCi2TlZApTw== ->>>>>>> build: update to version dependencies: loader-utils "1.2.3" source-map "0.7.3" @@ -119,7 +88,6 @@ typescript "3.6.4" webpack-sources "1.4.3" -<<<<<<< HEAD "@angular-devkit/[email protected]": version "0.900.0-rc.10" resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.0-rc.10.tgz#d1c65bdf71fd13c8c524d1ec88302e3312bbfe58" @@ -133,21 +101,6 @@ version "9.0.0-rc.10" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-rc.10.tgz#e751cedf6483026bbb3f9a5a6ab9c6e9833e1c3a" integrity sha512-aEdHb9M1rwAsyJSkmQ8J4BRiRLK4zWQL/CXxK15c056H04ncwU8OntBChpnSIf5iGsBM9UQRtiFbRubLfrpxgQ== -======= -"@angular-devkit/[email protected]": - version "0.900.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.0-rc.9.tgz#5308deb2f62a66359e73f30e3bdc351fb91eefe7" - integrity sha512-HlYU08YqnXqxn3Xq89MwLfyz2UfmATc7FzMo0x1gKkLnSEnVCbzdhtHLjOhHITiMvIc0N1DK2g4ygPIWrgwQgA== - dependencies: - "@angular-devkit/architect" "0.900.0-rc.9" - "@angular-devkit/core" "9.0.0-rc.9" - rxjs "6.5.3" - -"@angular-devkit/[email protected]", "@angular-devkit/core@^9.0.0-rc.7": - version "9.0.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-rc.9.tgz#52106c57b6071752d048eda6d01ad6a33baea7a6" - integrity sha512-rU41RXDiMumxl9ra7ZDTt/UI5RJFdy3jIgHidsxIdy0YcSWn1k4XKzfYpNeKDf9GQPuHf00htdSOljWmZo4Jfg== ->>>>>>> build: update to version dependencies: ajv "6.10.2" fast-json-stable-stringify "2.0.0" @@ -155,7 +108,6 @@ rxjs "6.5.3" source-map "0.7.3" -<<<<<<< HEAD "@angular-devkit/[email protected]", "@angular-devkit/schematics@^9.0.0-rc.10": version "9.0.0-rc.10" resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-rc.10.tgz#65d5e3fbf6a0c7c0689f3ac27cc1b629ca6c8570" @@ -166,27 +118,11 @@ rxjs "6.5.3" "@angular/animations@^9.0.0-rc.9": -======= -"@angular-devkit/[email protected]", "@angular-devkit/schematics@^9.0.0-rc.7": - version "9.0.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-rc.9.tgz#61ed269bcd09239b116c98dfa130095dfff06fd1" - integrity sha512-EU6+FwICgHty8hCaTl+k0jU3OF4IZ688oZjz3K3dkdO3fTfWFtUN7BF5D/wHWTmU3F2xZcREVGNzUEBDX8ipRQ== - dependencies: - "@angular-devkit/core" "9.0.0-rc.9" - ora "4.0.2" - rxjs "6.5.3" - -"@angular/animations@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.0.0-rc.9.tgz#2a7747255470b1a80e072b3ed1c79186dc5acb5f" integrity sha512-JuLyMn2NYwBc8hN130bn42oaQROmzWXLku3QhrEtf5VBJkyo9fdkj/00UWMHWnOiJygh4oMC04jL9p10iTtVzw== -<<<<<<< HEAD "@angular/bazel@^9.0.0-rc.9": -======= -"@angular/bazel@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-9.0.0-rc.9.tgz#6e54255c5dd2742a08f366e27ad80c1e88bc1414" integrity sha512-3lRGOS51V6jDahIWtL6Fi8xxrVRlMK54EqsqLeJGASG+PbzQ5bULKejG+jq9VtwvFB+0EMX4KVIJAjJe3VaArA== @@ -195,7 +131,6 @@ shelljs "0.8.2" tsickle "^0.38.0" -<<<<<<< HEAD "@angular/cli@^9.0.0-rc.10": version "9.0.0-rc.10" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.0-rc.10.tgz#888a950638fbe19da3b2d241add02c373fe5b9db" @@ -206,18 +141,6 @@ "@angular-devkit/schematics" "9.0.0-rc.10" "@schematics/angular" "9.0.0-rc.10" "@schematics/update" "0.900.0-rc.10" -======= -"@angular/cli@^9.0.0-rc.7": - version "9.0.0-rc.9" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.0-rc.9.tgz#d5cb61bcb110f21bad63d78cfa7c056d9b5930e8" - integrity sha512-TprMYroBCsjaBVx8oOKynZyCMkI6XdMqC/sWJzZmBSSqbi4YmB7jeydxL1S5qqKrYLk5cemcMIt+Xf0RuK9/wA== - dependencies: - "@angular-devkit/architect" "0.900.0-rc.9" - "@angular-devkit/core" "9.0.0-rc.9" - "@angular-devkit/schematics" "9.0.0-rc.9" - "@schematics/angular" "9.0.0-rc.9" - "@schematics/update" "0.900.0-rc.9" ->>>>>>> build: update to version "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" debug "^4.1.1" @@ -234,20 +157,12 @@ universal-analytics "^0.4.20" uuid "^3.3.2" -<<<<<<< HEAD "@angular/common@^9.0.0-rc.9": -======= -"@angular/common@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.0.0-rc.9.tgz#1c631e4a4e2d27245168c25b25e9f61c9ab329bf" integrity sha512-HzR6AX0THLks88E1+LLsWW1N+kChKUh1gmx7e2Y4Zxl3BntdqA0FhrhR03sEfwzP7Wvd7nfZzncKNp94Z4tjhg== -<<<<<<< HEAD "@angular/compiler-cli@^9.0.0-rc.9": -======= -"@angular/compiler-cli@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.0.0-rc.9.tgz#b20cfabab2e5702d7c9b98cce2411bb065c90deb" integrity sha512-2Cotthl+EnrofJVPMB7zbmLwd7N+FQEHIS9voUaZiY+XoAZGn5FdArSdaKDOfpLei85OUdq4rnKkn6kdvQZFHA== @@ -263,47 +178,27 @@ source-map "^0.6.1" yargs "13.1.0" -<<<<<<< HEAD "@angular/compiler@^9.0.0-rc.9": -======= -"@angular/compiler@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0-rc.9.tgz#f6b9ce0e7ce723a6bcbbc6d10e21540ba528e9d7" integrity sha512-g8Z2tBB5KGF5WTJTnR02f3TZ+yBlkxdOT1vbrPOlPby2nR5a0+W9f/km0d9lPcQ/yYZcoG5EPlSecPoorI7qgQ== -<<<<<<< HEAD "@angular/core@^9.0.0-rc.9": -======= -"@angular/core@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0-rc.9.tgz#c9a2746106583036376db561a492f42edb5aeee2" integrity sha512-roC9wykbRv+n+Uen1KbdHS8xpaCEAFAemZXj9ClsIAcx1t6S2Wiw6QsgyhZZg4BKxKrqQc3eMG4bd+xY/XcKrw== -<<<<<<< HEAD "@angular/platform-browser-dynamic@^9.0.0-rc.9": -======= -"@angular/platform-browser-dynamic@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.0-rc.9.tgz#b106fd553772316fa7c00cb2faa6ace71ea42413" integrity sha512-SLpUU4V0Hotzi/cI29aclKJp/1L45S+Zq04jEAs5YXQcFlGdETAbmsNEsxt6G+EC/RXPrLpf6jxSuE1wbcQk3A== -<<<<<<< HEAD "@angular/platform-browser@^9.0.0-rc.9": -======= -"@angular/platform-browser@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.0.0-rc.9.tgz#2455b1d00cc47ecab66c671bd33e0f06c060dabf" integrity sha512-v9K1wNtJqdAMtSi2wI1kxyf1AtkKVO899CUinK/gFY+Hx0xA15rzxOJHlJ/B4XUzIHdU+jMEJlpO/59Z+jnD6Q== -<<<<<<< HEAD "@angular/platform-server@^9.0.0-rc.9": -======= -"@angular/platform-server@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.0.0-rc.9.tgz#883462e1fe78b01e7f5c76e9d648ea0a03690c4c" integrity sha512-0lRuMvFgrw8Kb+p/TrccOQyq62VO9agxv1FGJKV9dHXFqchiZEGRXCdjTEO7T6BK9mLtYGF/bbc7WqIsm23cCA== @@ -311,11 +206,7 @@ domino "^2.1.2" xhr2 "^0.1.4" -<<<<<<< HEAD "@angular/router@^9.0.0-rc.9": -======= -"@angular/router@^9.0.0-rc.7": ->>>>>>> build: update to version version "9.0.0-rc.9" resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.0.0-rc.9.tgz#7e8f203c0f3effa7b1d58b511cd66476ce254e7f" integrity sha512-LBatklBYMx8z+2pmFqxknAgGZ/XYwatICWa4dFE9Ghrn+oPf+tUrHCIH34yqlaHxQvyQUnPP5pxBswINaX3fvA== @@ -327,13 +218,6 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/code-frame@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== - dependencies: - "@babel/highlight" "^7.8.3" - "@babel/[email protected]": version "7.7.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9" @@ -395,27 +279,10 @@ lodash "^4.17.13" source-map "^0.5.0" -<<<<<<< HEAD -"@babel/generator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03" - integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug== - dependencies: - "@babel/types" "^7.8.3" - jsesc "^2.5.1" - lodash "^4.17.13" - source-map "^0.5.0" - -"@babel/helper-annotate-as-pure@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.0.tgz#334ae2cb801e2381509631a5caa1ac6ab1c5016a" - integrity sha512-WWj+1amBdowU2g18p3/KUc1Y5kWnaNm1paohq2tT4/RreeMNssYkv6ul9wkE2iIqjwLBwNMZGH4pTGlMSUqMMg== -======= "@babel/helper-annotate-as-pure@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw== ->>>>>>> build: update to version dependencies: "@babel/types" "^7.8.3" @@ -470,30 +337,6 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" -<<<<<<< HEAD -"@babel/helper-function-name@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" - integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA== - dependencies: - "@babel/helper-get-function-arity" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" - -"@babel/helper-get-function-arity@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.0.tgz#90977f61d76d2225d1ae0208def7df22ea92792e" - integrity sha512-eUP5grliToMapQiTaYS2AAO/WwaCG7cuJztR1v/a1aPzUzUeGt+AaI9OvLATc/AfFkF8SLJ10d5ugGt/AQ9d6w== -======= -"@babel/helper-get-function-arity@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" - integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== ->>>>>>> build: update to version - dependencies: - "@babel/types" "^7.8.3" - -<<<<<<< HEAD "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" @@ -501,16 +344,10 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-hoist-variables@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.0.tgz#693586b56487e60fff9d9c7074f4a86e1a8af348" - integrity sha512-jDl66KvuklTXUADcoXDMur1jDtAZUZZkzLIaQ54+z38ih8C0V0hC56hMaoVoyoxN60MwQmmrHctBwcLqP0c/Lw== -======= "@babel/helper-hoist-variables@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134" integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg== ->>>>>>> build: update to version dependencies: "@babel/types" "^7.8.3" @@ -559,43 +396,6 @@ dependencies: lodash "^4.17.13" -<<<<<<< HEAD -"@babel/helper-remap-async-to-generator@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.0.tgz#034c21154dd12472717cfb31faf1713426fbc435" - integrity sha512-+aKyBd4oHAaIZgOLq/uLjkUz7ExZ0ppdNBc8Qr72BmtKNAy3A6EJa/ifjj0//CIzQtUDPs3E6HjKM2cV6bnXsQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.8.0" - "@babel/helper-wrap-function" "^7.8.0" - "@babel/template" "^7.8.0" - "@babel/traverse" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/helper-replace-supers@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.0.tgz#d83cb117edb820eebe9ae6c970a8ad5eac09d19f" - integrity sha512-R2CyorW4tcO3YzdkClLpt6MS84G+tPkOi0MmiCn1bvYVnmDpdl9R15XOi3NQW2mhOAEeBnuQ4g1Bh7pT2sX8fg== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.8.0" - "@babel/helper-optimise-call-expression" "^7.8.0" - "@babel/traverse" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/helper-simple-access@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.0.tgz#a5095ab031f759995134183fa7719aa85f0ec962" - integrity sha512-I+7yKZJnxp7VIC2UFzXfVjLiJuU16rYFF59x27c+boINkO/pLETgZcoesCryg9jmU4jxEa0foFueW+2wjc9Gsw== - dependencies: - "@babel/template" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/helper-split-export-declaration@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.0.tgz#ed10cb03b07454c0d40735fad4e9c9711e739588" - integrity sha512-YhYFhH4T6DlbT6CPtVgLfC1Jp2gbCawU/ml7WJvUpBg01bCrXSzTYMZZXbbIGjq/kHmK8YUATxTppcRGzj31pA== - dependencies: - "@babel/types" "^7.8.0" -======= "@babel/helper-remap-async-to-generator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86" @@ -624,7 +424,6 @@ dependencies: "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" ->>>>>>> build: update to version "@babel/helper-split-export-declaration@^7.8.3": version "7.8.3" @@ -633,28 +432,6 @@ dependencies: "@babel/types" "^7.8.3" -<<<<<<< HEAD -"@babel/helper-wrap-function@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.0.tgz#a26751c7b0be765a0db10162c6de485402cb505c" - integrity sha512-2j6idN2jt8Y+8nJ4UPN/6AZa53DAkcETMVmroJQh50qZc59PuQKVjgOIIqmrLoQf6Ia9bs90MHRcID1OW5tfag== - dependencies: - "@babel/helper-function-name" "^7.8.0" - "@babel/template" "^7.8.0" - "@babel/traverse" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/helpers@^7.7.4": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.0.tgz#3d3e6e08febf5edbbf63b1cf64395525aa3ece37" - integrity sha512-srWKpjAFbiut5JoCReZJ098hLqoZ9HufOnKZPggc7j74XaPuQ+9b3RYPV1M/HfjL63lCNd8uI1O487qIWxAFNA== - dependencies: - "@babel/template" "^7.8.0" - "@babel/traverse" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/helpers@^7.8.3": -======= "@babel/helper-wrap-function@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610" @@ -666,7 +443,6 @@ "@babel/types" "^7.8.3" "@babel/helpers@^7.7.4", "@babel/helpers@^7.8.3": ->>>>>>> build: update to version version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.3.tgz#382fbb0382ce7c4ce905945ab9641d688336ce85" integrity sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ== @@ -675,47 +451,19 @@ "@babel/traverse" "^7.8.3" "@babel/types" "^7.8.3" -<<<<<<< HEAD -"@babel/highlight@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.0.tgz#4cc003dc10359919e2e3a1d9459150942913dd1a" - integrity sha512-OsdTJbHlPtIk2mmtwXItYrdmalJ8T0zpVzNAbKSkHshuywj7zb29Y09McV/jQsQunc/nEyHiPV2oy9llYMLqxw== -======= "@babel/highlight@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== ->>>>>>> build: update to version dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^4.0.0" -<<<<<<< HEAD -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.7.5", "@babel/parser@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" - integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== - -"@babel/parser@^7.7.7", "@babel/parser@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.0.tgz#54682775f1fb25dd29a93a02315aab29a6a292bb" - integrity sha512-VVtsnUYbd1+2A2vOVhm4P2qNXQE8L/W859GpUHfUcdhX8d3pEKThZuIr6fztocWx9HbK+00/CR0tXnhAggJ4CA== -======= "@babel/parser@^7.7.5", "@babel/parser@^7.7.7", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== ->>>>>>> build: update to version "@babel/plugin-proposal-async-generator-functions@^7.7.4": version "7.8.3" @@ -1110,20 +858,7 @@ js-levenshtein "^1.1.3" semver "^5.5.0" -<<<<<<< HEAD -"@babel/template@^7.7.4", "@babel/template@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.0.tgz#a32f57ad3be89c0fa69ae87b53b4826844dc6330" - integrity sha512-0NNMDsY2t3ltAVVK1WHNiaePo3tXPUeJpCX4I3xSKFoEl852wJHG8mrgHVADf8Lz1y+8al9cF7cSSfzSnFSYiw== - dependencies: - "@babel/code-frame" "^7.8.0" - "@babel/parser" "^7.8.0" - "@babel/types" "^7.8.0" - -"@babel/template@^7.8.3": -======= "@babel/template@^7.7.4", "@babel/template@^7.8.3": ->>>>>>> build: update to version version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -1132,19 +867,6 @@ "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" -<<<<<<< HEAD -"@babel/traverse@^7.7.4", "@babel/traverse@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.0.tgz#d85266fdcff553c10e57b672604b36383a127c1f" - integrity sha512-d/6sPXFLGlJHZO/zWDtgFaKyalCOHLedzxpVJn6el1cw+f2TZa7xZEszeXdOw6EUemqRFBAn106BWBvtSck9Qw== - dependencies: - "@babel/code-frame" "^7.8.0" - "@babel/generator" "^7.8.0" - "@babel/helper-function-name" "^7.8.0" - "@babel/helper-split-export-declaration" "^7.8.0" - "@babel/parser" "^7.8.0" - "@babel/types" "^7.8.0" -======= "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" @@ -1156,46 +878,14 @@ "@babel/helper-split-export-declaration" "^7.8.3" "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" ->>>>>>> build: update to version debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -<<<<<<< HEAD -"@babel/traverse@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" - integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.3" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/types" "^7.8.3" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" - -"@babel/types@^7.7.4", "@babel/types@^7.8.0": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.0.tgz#1a2039a028057a2c888b668d94c98e61ea906e7f" - integrity sha512-1RF84ehyx9HH09dMMwGWl3UTWlVoCPtqqJPjGuC4JzMe1ZIVDJ2DT8mv3cPv/A7veLD6sgR7vi95lJqm+ZayIg== -======= "@babel/types@^7.7.4", "@babel/types@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== ->>>>>>> build: update to version - dependencies: - esutils "^2.0.2" - lodash "^4.17.13" - to-fast-properties "^2.0.0" - -"@babel/types@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -1616,17 +1306,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -<<<<<<< HEAD -"@microsoft/[email protected]": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.7.2.tgz#4872f2a3a4f90e57b82ade913edba728f7aefb02" - integrity sha512-USwWUPV3YLS8ZOS11vFh3nzEWXC2d8OZJ6CGp0nRnCXtbqmKqAq4Jg9J5gs1PCemo7JQEbzbHGGwycC0DbRJqw== -======= "@microsoft/[email protected]": version "7.7.4" resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.7.4.tgz#45a1bd38499db5ae56dcecf1f68d4cf3c50a63ac" integrity sha512-/UGBXzEwOAYAS9Xg9I9RF3f+Fp1dowddMlisUlBASGJT38/ZhlMb8Zp0Y0ThJcY+VA6Wya0cMK3c/Lo2u+f2EQ== ->>>>>>> build: update to version dependencies: "@microsoft/node-core-library" "3.19.0" "@microsoft/tsdoc" "0.12.14" @@ -1673,21 +1356,12 @@ resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.14.tgz#0e0810a0a174e50e22dfe8edb30599840712f22d" integrity sha512-518yewjSga1jLdiLrcmpMFlaba5P+50b0TWNFUpC+SL9Yzf0kMi57qw+bMl+rQ08cGqH1vLx4eg9YFUbZXgZ0Q== -<<<<<<< HEAD "@ngtools/[email protected]": version "9.0.0-rc.10" resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.0-rc.10.tgz#8f03a350be995a5035f78ceb52067feacce2349c" integrity sha512-eOD0/GlhfO+W076H+fSmW8h58lOtzS7JL62CviKm8ttEkrvsTlOhXIjpNUDW69WJilfsNJjXzmB3QV9DeilgNQ== dependencies: "@angular-devkit/core" "9.0.0-rc.10" -======= -"@ngtools/[email protected]": - version "9.0.0-rc.9" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.0-rc.9.tgz#8b885591a3066666476cbd7f97ca9bbd78829d3d" - integrity sha512-SG7PrFTs2+xNw+IUeu/0U94gUbhKbhIltQy/EsgC4R00ZdwMOqK7BaFoKBu0nO2tUyI1x1AW0Jfr5ROkuVk4IA== - dependencies: - "@angular-devkit/core" "9.0.0-rc.9" ->>>>>>> build: update to version enhanced-resolve "4.1.1" rxjs "6.5.3" webpack-sources "1.4.3" @@ -1752,7 +1426,6 @@ dependencies: estree-walker "^0.6.1" -<<<<<<< HEAD "@schematics/[email protected]", "@schematics/angular@^9.0.0-rc.10": version "9.0.0-rc.10" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-rc.10.tgz#816b1dbbc353f4d4cc3688e82787a650d8ae1bdd" @@ -1768,23 +1441,6 @@ dependencies: "@angular-devkit/core" "9.0.0-rc.10" "@angular-devkit/schematics" "9.0.0-rc.10" -======= -"@schematics/[email protected]", "@schematics/angular@^9.0.0-rc.7": - version "9.0.0-rc.9" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-rc.9.tgz#70e4fd36a02cc5e1e823945ec49526d8efd36869" - integrity sha512-afrFXRy76MmlCMxdK5yRjcRrAHsyABLxfpkLsbbonPTExDkWi040Ai5Qaxbf+S/GZPOpGtl2StLY2wEmWXGJ+w== - dependencies: - "@angular-devkit/core" "9.0.0-rc.9" - "@angular-devkit/schematics" "9.0.0-rc.9" - -"@schematics/[email protected]": - version "0.900.0-rc.9" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-rc.9.tgz#e41b7a72817aad5237354cd4848e88ce682eaefd" - integrity sha512-N7i4FGdhAcI40V61jejzrkd3C9lMgqwIc5uI+3LrfKJdFkBGi+V9HiU9e93LILJiNn0SfxB8rHutFY63JkoUxA== - dependencies: - "@angular-devkit/core" "9.0.0-rc.9" - "@angular-devkit/schematics" "9.0.0-rc.9" ->>>>>>> build: update to version "@yarnpkg/lockfile" "1.1.0" ini "1.3.5" npm-package-arg "^7.0.0" @@ -1881,7 +1537,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/hapi__boom@*", "@types/[email protected]": +"@types/[email protected]": version "7.4.1" resolved "https://registry.yarnpkg.com/@types/hapi__boom/-/hapi__boom-7.4.1.tgz#06439d7637245dcbe6dd6548d2a91f2c1243d80b" integrity sha512-x/ZK824GomII7Yoei/nMoB46NQcSfGe0iVpZK3uUivxIAfUUSzRvu8RQO7ZkKapIgzgshHZc+GR+z/BQ8l2VLg== @@ -1891,7 +1547,7 @@ resolved "https://registry.yarnpkg.com/@types/hapi__catbox/-/hapi__catbox-10.2.2.tgz#b13fbdd6006c8793eb80919158593bc2bf8307c4" integrity sha512-AWK70LgRsRWL1TNw+aT0IlS56E0pobvFdr/en0K8XazyK4Ey6T/jXhQqv/iQ6FJAAU+somMzgmt9fWq2TaaOkA== -"@types/hapi__hapi@*": +"@types/hapi__hapi@*", "@types/hapi__hapi@^19.0.0": version "19.0.0" resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-19.0.0.tgz#99192d21dde97c6822c1a6ea3c779f1f47313e3b" integrity sha512-F36qfgrB5743UwoODMzeTLcixTsEqetVL+pvCWh9M+fUPEOWQUMKVEnURec3+Ptw2DKj2Uaaa82SZHUSYgiIWQ== @@ -1905,20 +1561,6 @@ "@types/hapi__shot" "*" "@types/node" "*" -"@types/hapi__hapi@^18.2.5": - version "18.2.6" - resolved "https://registry.yarnpkg.com/@types/hapi__hapi/-/hapi__hapi-18.2.6.tgz#61c1b210c55dee4636df594e7a0868ad48c8042a" - integrity sha512-sXFlSg9btu/LdHqK/N/kuQXVqZhSvibXbtZc0KfEcelRXKthdU5ZSu5qItDIov7SYnyK2faMe7dbZaC/VpC33w== - dependencies: - "@types/hapi__boom" "*" - "@types/hapi__catbox" "*" - "@types/hapi__iron" "*" - "@types/hapi__joi" "*" - "@types/hapi__mimos" "*" - "@types/hapi__podium" "*" - "@types/hapi__shot" "*" - "@types/node" "*" - "@types/hapi__inert@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@types/hapi__inert/-/hapi__inert-5.2.0.tgz#c6bd1a2f18c480eb19e824a483589c26450578fd" @@ -1926,7 +1568,7 @@ dependencies: "@types/hapi__hapi" "*" -"@types/hapi__iron@*", "@types/[email protected]": +"@types/[email protected]": version "5.1.0" resolved "https://registry.yarnpkg.com/@types/hapi__iron/-/hapi__iron-5.1.0.tgz#35ebddae3a100c468b84fe075689522ad2f3703d" integrity sha512-RxYHIc8wFe8M1jMwgovskoHNVjuP1q0tUGCNnbHnhA4SBMyYg+JHIAz8yFibSwgF4gWYh5yHMpbmK5kmnG4HRA== @@ -2396,8 +2038,6 @@ [email protected]: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -<<<<<<< HEAD -======= ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5: version "6.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" @@ -2408,7 +2048,6 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" ->>>>>>> build: update to version alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -3031,7 +2670,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" [email protected], browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.7.2, browserslist@^4.8.3: [email protected], browserslist@^4.6.0, browserslist@^4.7.2, browserslist@^4.8.3: version "4.8.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44" integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg== @@ -3268,26 +2907,20 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -<<<<<<< HEAD [email protected], caniuse-lite@^1.0.30001006, caniuse-lite@^1.0.30001017: -======= [email protected]: ->>>>>>> build: update to version version "1.0.30001020" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz#3f04c1737500ffda78be9beb0b5c1e2070e15926" integrity sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA== -<<<<<<< HEAD -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001022: - version "1.0.30001022" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6" - integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A== -======= caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001006, caniuse-lite@^1.0.30001017: version "1.0.30001021" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001021.tgz#e75ed1ef6dbadd580ac7e7720bb16f07b083f254" integrity sha512-wuMhT7/hwkgd8gldgp2jcrUjOU9RXJ4XxGumQeOsUr91l3WwmM68Cpa/ymCnWEDqakwFXhuDQbaKNHXBPgeE9g== ->>>>>>> build: update to version + +caniuse-lite@^1.0.30001022: + version "1.0.30001022" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6" + integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A== [email protected]: version "1.0.0" @@ -3299,17 +2932,10 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -<<<<<<< HEAD [email protected], chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== -======= [email protected]: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== ->>>>>>> build: update to version dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3508,11 +3134,7 @@ [email protected]: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -<<<<<<< HEAD -color-name@^1.0.0: -======= color-name@^1.0.0, color-name@~1.1.4: ->>>>>>> build: update to version version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -3983,16 +3605,12 @@ csso@^4.0.2: dependencies: css-tree "1.0.0-alpha.37" -<<<<<<< HEAD [email protected], cssom@^0.3.6: -======= cssom@^0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== cssom@~0.3.6: ->>>>>>> build: update to version version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== @@ -4540,7 +4158,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.0-next.1: version "1.17.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.3.tgz#d921ff5889a3664921094bb13aaf0dfd11818578" integrity sha512-AwiVPKf3sKGMoWtFw0J7Y4MTZ4Iek67k4COWOwHqS8B9TOZ71DCfcoBmdamy8Y6mj4MDz0+VNUpC2HKHFHA3pg== @@ -9220,14 +8838,6 @@ schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.5 ajv "^6.10.2" ajv-keywords "^3.4.1" -schema-utils@^2.6.1: - version "2.6.4" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" - integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== - dependencies: - ajv "^6.10.2" - ajv-keywords "^3.4.1" - select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -10084,8 +9694,6 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -<<<<<<< HEAD -======= supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" @@ -10093,7 +9701,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" ->>>>>>> build: update to version svgo@^1.0.0: version "1.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" @@ -10482,11 +10089,6 @@ typescript@~3.7.2, typescript@~3.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== -typescript@~3.7.4: - version "3.7.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" - integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== - [email protected]: version "0.7.17" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
48871381a169888f1d29275ab25915b0d815d1c1
2023-04-05 14:55:37
Charles Lyding
fix(@angular-devkit/architect): allow registered builder teardowns to execute
false
allow registered builder teardowns to execute
fix
diff --git a/goldens/public-api/angular_devkit/architect/index.md b/goldens/public-api/angular_devkit/architect/index.md index 70cdd28738ab..1dc0c183e10e 100644 --- a/goldens/public-api/angular_devkit/architect/index.md +++ b/goldens/public-api/angular_devkit/architect/index.md @@ -451,6 +451,8 @@ export function scheduleTargetAndForget(context: BuilderContext, target: Target, // @public interface SimpleJobHandlerContext<A extends JsonValue, I extends JsonValue, O extends JsonValue> extends JobHandlerContext<A, I, O> { + // (undocumented) + addTeardown(teardown: () => Promise<void> | void): void; // (undocumented) createChannel: (name: string) => Observer<JsonValue>; // (undocumented) diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts index 2f7f8c85d9df..d832c7e67755 100644 --- a/packages/angular_devkit/architect/src/create-builder.ts +++ b/packages/angular_devkit/architect/src/create-builder.ts @@ -47,9 +47,8 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput const scheduler = context.scheduler; const progressChannel = context.createChannel('progress'); const logChannel = context.createChannel('log'); + const addTeardown = context.addTeardown.bind(context); let currentState: BuilderProgressState = BuilderProgressState.Stopped; - const teardownLogics: Array<() => PromiseLike<void> | void> = []; - let tearingDown = false; let current = 0; let status = ''; let total = 1; @@ -83,18 +82,8 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput const inputSubscription = context.inboundBus.subscribe((i) => { switch (i.kind) { - case JobInboundMessageKind.Stop: - // Run teardown logic then complete. - tearingDown = true; - Promise.all(teardownLogics.map((fn) => fn() || Promise.resolve())).then( - () => observer.complete(), - (err) => observer.error(err), - ); - break; case JobInboundMessageKind.Input: - if (!tearingDown) { - onInput(i.value); - } + onInput(i.value); break; } }); @@ -209,9 +198,7 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput progress({ state: currentState, current, total, status }, context); } }, - addTeardown(teardown: () => Promise<void> | void): void { - teardownLogics.push(teardown); - }, + addTeardown, }; context.reportRunning(); diff --git a/packages/angular_devkit/architect/src/jobs/create-job-handler.ts b/packages/angular_devkit/architect/src/jobs/create-job-handler.ts index 36952e56a2ff..531c21e5fdc5 100644 --- a/packages/angular_devkit/architect/src/jobs/create-job-handler.ts +++ b/packages/angular_devkit/architect/src/jobs/create-job-handler.ts @@ -44,6 +44,7 @@ export interface SimpleJobHandlerContext< > extends JobHandlerContext<A, I, O> { createChannel: (name: string) => Observer<JsonValue>; input: Observable<I>; + addTeardown(teardown: () => Promise<void> | void): void; } /** @@ -72,6 +73,8 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext const inboundBus = context.inboundBus; const inputChannel = new Subject<I>(); let subscription: Subscription; + const teardownLogics: Array<() => PromiseLike<void> | void> = []; + let tearingDown = false; return new Observable<JobOutboundMessage<O>>((subject) => { function complete() { @@ -91,13 +94,22 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext break; case JobInboundMessageKind.Stop: - // There's no way to cancel a promise or a synchronous function, but we do cancel - // observables where possible. - complete(); + // Run teardown logic then complete. + tearingDown = true; + if (teardownLogics.length) { + Promise.all(teardownLogics.map((fn) => fn())).then( + () => complete(), + () => complete(), + ); + } else { + complete(); + } break; case JobInboundMessageKind.Input: - inputChannel.next(message.value); + if (!tearingDown) { + inputChannel.next(message.value); + } break; } }); @@ -108,6 +120,9 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext const newContext: SimpleJobHandlerContext<A, I, O> = { ...context, input: inputChannel.asObservable(), + addTeardown(teardown: () => Promise<void> | void): void { + teardownLogics.push(teardown); + }, createChannel(name: string) { if (channels.has(name)) { throw new ChannelAlreadyExistException(name);
4280990ef491897b453b951de74189e37f604dac
2022-01-20 17:01:38
Renovate Bot
build: update angular
false
update angular
build
diff --git a/package.json b/package.json index 17264ba3f176..91a0db1e68d2 100644 --- a/package.json +++ b/package.json @@ -64,21 +64,21 @@ }, "devDependencies": { "@ampproject/remapping": "1.0.2", - "@angular/animations": "13.1.2", - "@angular/cdk": "13.1.2", - "@angular/common": "13.1.2", - "@angular/compiler": "13.1.2", - "@angular/compiler-cli": "13.1.2", - "@angular/core": "13.1.2", + "@angular/animations": "13.1.3", + "@angular/cdk": "13.1.3", + "@angular/common": "13.1.3", + "@angular/compiler": "13.1.3", + "@angular/compiler-cli": "13.1.3", + "@angular/core": "13.1.3", "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#002770be8f5bf15c02293da454193bb0846969c1", - "@angular/forms": "13.1.2", - "@angular/localize": "13.1.2", - "@angular/material": "13.1.2", - "@angular/platform-browser": "13.1.2", - "@angular/platform-browser-dynamic": "13.1.2", - "@angular/platform-server": "13.1.2", - "@angular/router": "13.1.2", - "@angular/service-worker": "13.1.2", + "@angular/forms": "13.1.3", + "@angular/localize": "13.1.3", + "@angular/material": "13.1.3", + "@angular/platform-browser": "13.1.3", + "@angular/platform-browser-dynamic": "13.1.3", + "@angular/platform-server": "13.1.3", + "@angular/router": "13.1.3", + "@angular/service-worker": "13.1.3", "@babel/core": "7.16.10", "@babel/generator": "7.16.8", "@babel/helper-annotate-as-pure": "7.16.7", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 87d49951c918..81737388ebec 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "@angular-devkit/core": "0.0.0-PLACEHOLDER", - "@angular/compiler": "13.1.2", - "@angular/compiler-cli": "13.1.2", + "@angular/compiler": "13.1.3", + "@angular/compiler-cli": "13.1.3", "typescript": "4.5.4", "webpack": "5.66.0" } diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 3de5b3b88c0f..26b1746424c0 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#59918eeaad3ac62a3e521fced11a5a501be2aff2", - "@angular/cdk": "github:angular/cdk-builds#09545211b2167a0e0e13944388667a505eaff82d", - "@angular/common": "github:angular/common-builds#a4e24739e4f7a38ac27c4ff537c7a8ca3679c07b", - "@angular/compiler": "github:angular/compiler-builds#9ab2209c803f91ab1f0a10b1a74fe35aa933c49a", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#7c89aac1b01419a1d081ae5f557431338f17b56a", - "@angular/core": "github:angular/core-builds#cb4ff8a825d25d20e7baa0137d889097a4271d8e", - "@angular/forms": "github:angular/forms-builds#378479a2f137cdf8073ce55383c2277fc3e165b9", - "@angular/language-service": "github:angular/language-service-builds#2dce55b63573d481e9b0aaf89658b8671931053f", - "@angular/localize": "github:angular/localize-builds#cda9ef1e4614fcc382dc1e228477e35c3a0e6055", - "@angular/material": "github:angular/material2-builds#ad9ced8725bca3eea3d9e552bedb8c9062bffcfe", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#dbe63c66de66d95383d643b5702301158be8200d", - "@angular/platform-browser": "github:angular/platform-browser-builds#21a128b57ddc0f7cf6e86138939640db7445e222", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#d62defbfb16224d206b9a61b7637213e14e6c331", - "@angular/platform-server": "github:angular/platform-server-builds#13c788b12404c5fcd70cc36634c2458700ef87e1", - "@angular/router": "github:angular/router-builds#a7cfdfa7caa945dcecc4bdf4da2b8b97211d7363", - "@angular/service-worker": "github:angular/service-worker-builds#122f0c9e2d5921a2ea4302339670069015a56ae7" + "@angular/animations": "github:angular/animations-builds#a3bbb834eb3d2c91509b70465eb71069784832a2", + "@angular/cdk": "github:angular/cdk-builds#8180057d63f3e7af1c699424371f672fad3ee133", + "@angular/common": "github:angular/common-builds#787868777de73cc22b2f3ac631968b4ebb7662e2", + "@angular/compiler": "github:angular/compiler-builds#d33929afc9218be1f3a40bc5d54263f8e2735b7a", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#b6505440b145d75fb38b6302c055d0a9f93542dd", + "@angular/core": "github:angular/core-builds#4d54a875a2b0475021468b05e604ec8a7a80ce49", + "@angular/forms": "github:angular/forms-builds#df8848df20b56141f85fb99ea1ec23117476ade4", + "@angular/language-service": "github:angular/language-service-builds#89b810bcd404a2d798dc9112da311a2f344bda25", + "@angular/localize": "github:angular/localize-builds#a22253188d26302aec2d0db89fb3b059adfb2eb3", + "@angular/material": "github:angular/material2-builds#13301a6ba609f9196a0c5801910e213cc175d020", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#1891f79306543c1db616c8814683d9a2852042f9", + "@angular/platform-browser": "github:angular/platform-browser-builds#f78dc203b0de4b1e09c34e13158263c841b02864", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#e8b7c630fe856a20538b59680051e26e72ef2952", + "@angular/platform-server": "github:angular/platform-server-builds#273f942ad3def450fba8d04773e9f0647f8bada8", + "@angular/router": "github:angular/router-builds#0851698bf5ad76655986de529afceb81f60daa8a", + "@angular/service-worker": "github:angular/service-worker-builds#415f68193f7166d681e94f027b3df38524a10ac9" } } diff --git a/yarn.lock b/yarn.lock index 8d40b3d356b0..a1e9fd6b6178 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,10 +134,10 @@ rxjs "6.6.7" source-map "0.7.3" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-13.1.2.tgz#fdf0776eaf053b14a4118c682a62f24e4192609a" - integrity sha512-k1eQ8YZq3eelLhJDQjkRCt/4MXxwK2TFeGdtcYJF0G7vFOppE8hlI4PT7Bvmk08lTqvgiqtTI3ZaYmIINLfUMg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-13.1.3.tgz#2da6ad99602bfb450624a7499d6f81366c3a4519" + integrity sha512-OwsVQsNHubIgRcxnjti4CU3QJnqd7Z2b+2iu3M349Oxyqxz4DNCqKXalDuJZt/b0yNfirvYO3kCgBfj4PF43QQ== dependencies: tslib "^2.3.0" @@ -149,26 +149,26 @@ "@angular/core" "^10.0.0-0 || ^11.0.0" reflect-metadata "^0.1.13" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-13.1.2.tgz#aaa1b577d1b8101d3d59f4da9a1ea51b7f7a5191" - integrity sha512-xORyqvfM0MueJpxHxVi3CR/X/f1RPKr45vt7NV6/x91OTnh2ukwxg++dAGuA6M5gUAHcVAcaBrfju4GQlU9hmg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-13.1.3.tgz#a32306cd977fe59ded2dcc799ef844c0972232d3" + integrity sha512-Psuri2mc6W+xKtZr39FHL+cDz7Le9kKTo8ziCtUiydikBBdqfOu6AnWUrEMEGFxS2wt8nolFXDAGUaMUAE3Ekg== dependencies: tslib "^2.3.0" optionalDependencies: parse5 "^5.0.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.1.2.tgz#6a4abe30b1cc42702452bfd2214e482675f5d889" - integrity sha512-/8RWYQkZ1KPNvu2FANJM44wXlOMjMyxZVOEIn3llMRgxV2iiYtmluAOJNafTAbKedAuD6wiSpbi++QbioqCyyA== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.1.3.tgz#4c80f45cfd00a17543559c5fbebe0a7a7cf403ed" + integrity sha512-8qf5syeXUogf3+GSu6IRJjrk46UKh9L0QuLx+OSIl/df0y1ewx7e28q3BAUEEnOnKrLzpPNxWs2iwModc4KYfg== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-13.1.2.tgz#f9adde80bd9d0c3d90d8758c9803537373259053" - integrity sha512-yqM6RLcYtfwIuqBQ7eS7WdksBYY7Dh9sP4rElgLiEhDGIPQf6YE5zeuRThGq5pQ2fvHbNflw8QmTHu/18Y1u/g== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-13.1.3.tgz#0269370350e928f22f3150523f95bc490a1e7a7a" + integrity sha512-ALURaJATc54DzPuiZBvALf/alEp1wr7Hjmw4FuMn2cU7p8lwKkra1Dz5dAZOxh7jAcD1GJfrK/+Sb7A3cuuKjQ== dependencies: "@babel/core" "^7.8.6" canonical-path "1.0.0" @@ -182,17 +182,17 @@ tslib "^2.3.0" yargs "^17.2.1" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.1.2.tgz#86afbe282d0ff407fd8aeb66a79a804f40e7efa4" - integrity sha512-xbM3eClhUIHEFR0Et1bVC18Q7+kJx+hNNWWQl63RNYYBxTZnZpXA3mYi6IcEasy7BHkobVW+5teqlibFQY4gfQ== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.1.3.tgz#fc33b06046599ecc943f55049e0a121d5ab46d4f" + integrity sha512-dbHs/Oa+Dn+7i0jKtlVDE0lD0DaUC+lVzAcTK/zS37LrckrTMn1CA+z9bZ4gpHig9RU0wgV3YORxv0wokyiB8A== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.1.2.tgz#793b97d0b7339d5b405f39dd5d021b4b78fcf256" - integrity sha512-dsb90lUf8BELzdg7MgSMfPc36xzZKsDggOimfXhIvmctgc+H71Zo07KYTy5JVqsscLdT+A/KBvtU1bKk4P+Rfg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.1.3.tgz#4afd71f674f9ead1aada81315f84846cdba10fa4" + integrity sha512-rvCnIAonRx7VnH2Mv9lQR+UYdlFQQetZCjPw8QOswOspEpHpEPDrp1HxDIqJnHxNqW0n8J3Zev/VgQYr0481UA== dependencies: tslib "^2.3.0" @@ -263,63 +263,63 @@ yaml "^1.10.0" yargs "^17.0.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-13.1.2.tgz#f72d7f84b78844a1606cd4226c2a3a1eb1de56b5" - integrity sha512-r5I5cPngk2Erxe/OEL9Hl1j1VcNSAAyVzh7KmtOP8z7RZYCd0MeRISKrmA5CGn5Dh7A5POFLoOpBatmvnc4Z/A== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-13.1.3.tgz#4b31d1208e2b191766efbbe1a502193e28e89240" + integrity sha512-c4N9zZSILyEbomY2CJo1WAMxiHu/qlycvzxKH5NFS2P2+fieORlbKUJ2p1CbYqcIxVnLYRSdWH8f1JpoaG0ETw== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-13.1.2.tgz#51ee620869e79a2633947d970660243df83968c4" - integrity sha512-v+PzWbE5ZoQ/XFbpjCK96xdj1t+TSkHbzuCqZrIF04WCbNC803c3fxAz7fAMjLTs78Bd3R5n5pSITnb3pGnVPg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-13.1.3.tgz#05c27275aec7d461e1b2ae2f0b19fef7d0265df8" + integrity sha512-SGKdVtFnMtwQK3BebsOWf9rJjczVDKDbuO+5xXivD9k0gu5zrRy7x7mwLR7cGlWNDEmoiId705ItC+Mm5n+FVQ== dependencies: "@babel/core" "7.8.6" glob "7.2.0" yargs "^17.2.1" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-13.1.2.tgz#497e9b34f4672ce207bb1198a823cda1f1d416ef" - integrity sha512-M7eDgTMCZ/naoiS6Z5nj3N/sNUFc+CGPHX4yb563RuknqN7huDCvdyxA6KnhYLZsVlNCPh5ZrEr6H8ZiYJWcpg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-13.1.3.tgz#1bfdb2e85f6eadafa4acfeff59847038f86e5a89" + integrity sha512-fJmd73Tqlk/eKJ68XBGgwnoME3j+tfRG6CEFtNwMnWLkPTziWX5PHkY1D/cDWFa9VB6vjW8jxAE9UeQmXSk/RA== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.1.2.tgz#2d381503862be7a9d5fd74a27c1f8cf10d9b086e" - integrity sha512-gABOn8DxGai56WmIt5o+eXtduabiq4Mlprg+6+dv+2PvWV871pLvswV9EGUSgwKXvbhBlDZDuNFU5LgvNDuGFg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.1.3.tgz#08cbe321e5f39636a08eb77606ff496df478a21e" + integrity sha512-vEWyJ+2gkwh2N6KOJfxUNSdSO51ROlzCqqzCfHrPYQrlOFUfKsYKA1uoiB5UGfFEU0HBtIRWn6xoUy3wzVOZbw== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-13.1.2.tgz#6b24c26cc01733f933a3c15288989259f83e8f46" - integrity sha512-yBUWtYJHr/1LuK3/YRRav2O82i6RHVPtRoAlZHoeTlh2CYA4u1m3JHq9XBrxIxSXexBX69pMrZENW1xskwKRTQ== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-13.1.3.tgz#69d90b10e89e11f14f5798d1b6fd788255a6114e" + integrity sha512-mnWjdr9UTNZvGk8jPI6O9FIhun8Q/0ghy3dg3I9AfRzEG4vPiIZW1ICksTiB+jV9etzhKpidtmg71bwgeXax1A== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-13.1.2.tgz#30834a4960759bc8e01a7c1140393543a0f4319e" - integrity sha512-fSrdMeLoypuH0NfivYnztfKbwZhAGtfFFfBYZL27gQJLDmYkbr5fWFe3e4cVNdY/J2LcIDUSJptQmnIC1EKOlA== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-13.1.3.tgz#8cda1104622ae2a12cb34cbd72d268f2905b8bba" + integrity sha512-uwfz5UJLUtvhIk83Ecdx0rkhyNg3rdjmbgtWvf2os4Q4lDnbg9y77MKQ9rKJtHqXtrhD9a4W/hAEsFJjexNQBg== dependencies: domino "^2.1.2" tslib "^2.3.0" xhr2 "^0.2.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-13.1.2.tgz#69146055473b9f5b8f9ba9b4de3a0740778ea174" - integrity sha512-5S0De6SdlbERoX9FwOBiTWxINchW7nTPUIH/tdanOqq12cqp6/7NigOr3BZDSvUNIh/6Is+pSQTKGAbhxejN2w== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-13.1.3.tgz#2330254febabce55061236f1761a03aae9a9418f" + integrity sha512-L86kARlc5UNi5KeI0O8PO7wFbTzjEI8ouz+z+aNmCnMUUNX0rbvbuXiPdDvLc71nKZznsPCl2IuO8ojyHrSPsQ== dependencies: tslib "^2.3.0" -"@angular/[email protected]": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-13.1.2.tgz#39007cea6c8dc359f7a6998edc5d1420f4e1c771" - integrity sha512-tsYWIrVDKeiEVJb/QtKc5EIGiGWdpjdrZLXvQkkiNPfbKwONU/rpD4zO+rqr2Ote1s/IFAycp9CyMMOZw0lgeg== +"@angular/[email protected]": + version "13.1.3" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-13.1.3.tgz#a673d28d97cf6e1a245f24a70e84d6c3fb8cc909" + integrity sha512-R9Oaw/ao62J9OlVKaAMB6WF0n+PD/Jg98c5I04DE14YMcGO32pYOCLPA6oTubwW3gJndk+WSNqijSBXMvaVFsw== dependencies: tslib "^2.3.0"
e44fcf31d8f7b9265731cf78f4218e7cfc06ec79
2021-02-12 14:56:08
Renovate Bot
build: update critters to version 0.0.7
false
update critters to version 0.0.7
build
diff --git a/package.json b/package.json index 6c8719aae881..d527554102f2 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@types/node": "12.12.37", "@types/shelljs": "^0.8.6", "browser-sync": "^2.26.7", - "critters": "0.0.6", + "critters": "0.0.7", "domino": "^2.1.2", "express": "^4.15.2", "guess-parser": "^0.4.12", diff --git a/yarn.lock b/yarn.lock index baec2666759d..a7840fc3f79f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3895,6 +3895,17 @@ [email protected]: parse5-htmlparser2-tree-adapter "^6.0.1" pretty-bytes "^5.3.0" [email protected]: + version "0.0.7" + resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.7.tgz#548b470360f4f3c51e622de3b7aa733c8f0b17bf" + integrity sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ== + dependencies: + chalk "^4.1.0" + css "^3.0.0" + parse5 "^6.0.1" + parse5-htmlparser2-tree-adapter "^6.0.1" + pretty-bytes "^5.3.0" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
355822059661b75a1b7fa5c6ace890b4d63f940e
2019-11-07 23:36:50
Filipe Silva
test: update FW size expectations
false
update FW size expectations
test
diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts index 99bc1cb0767e..e60d8f4b3adc 100644 --- a/tests/legacy-cli/e2e/tests/build/prod-build.ts +++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts @@ -57,8 +57,8 @@ export default async function () { verifySize(mainES5Path, 184470); verifySize(mainES2015Path, 163627); } else { - verifySize(mainES5Path, 148031); - verifySize(mainES2015Path, 137494); + verifySize(mainES5Path, 163321); + verifySize(mainES2015Path, 141032); } // Check that the process didn't change local files.
c0bc8be01b494c7f5aab20f77e8163f322c82590
2020-12-18 13:00:57
Renovate Bot
build: update angular packages
false
update angular packages
build
diff --git a/package.json b/package.json index 2b983bb45573..e877891f44f7 100644 --- a/package.json +++ b/package.json @@ -64,21 +64,21 @@ ] }, "devDependencies": { - "@angular/animations": "11.1.0-next.2", + "@angular/animations": "11.1.0-next.3", "@angular/cdk": "11.0.3", - "@angular/common": "11.1.0-next.2", - "@angular/compiler": "11.1.0-next.2", - "@angular/compiler-cli": "11.1.0-next.2", - "@angular/core": "11.1.0-next.2", - "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#28b8e8f9d2f97d8e9742fa7de5b8f55d651f756b", - "@angular/forms": "11.1.0-next.2", - "@angular/localize": "11.1.0-next.2", + "@angular/common": "11.1.0-next.3", + "@angular/compiler": "11.1.0-next.3", + "@angular/compiler-cli": "11.1.0-next.3", + "@angular/core": "11.1.0-next.3", + "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2ecec27bc850c11603ccd9fff21c440ba8b03dbb", + "@angular/forms": "11.1.0-next.3", + "@angular/localize": "11.1.0-next.3", "@angular/material": "11.0.3", - "@angular/platform-browser": "11.1.0-next.2", - "@angular/platform-browser-dynamic": "11.1.0-next.2", - "@angular/platform-server": "11.1.0-next.2", - "@angular/router": "11.1.0-next.2", - "@angular/service-worker": "11.1.0-next.2", + "@angular/platform-browser": "11.1.0-next.3", + "@angular/platform-browser-dynamic": "11.1.0-next.3", + "@angular/platform-server": "11.1.0-next.3", + "@angular/router": "11.1.0-next.3", + "@angular/service-worker": "11.1.0-next.3", "@babel/core": "7.12.10", "@babel/generator": "7.12.11", "@babel/plugin-transform-runtime": "7.12.10", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index d7c20091ada1..50539631cb2b 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -31,8 +31,8 @@ "webpack": "^4.0.0" }, "devDependencies": { - "@angular/compiler": "11.1.0-next.2", - "@angular/compiler-cli": "11.1.0-next.2", + "@angular/compiler": "11.1.0-next.3", + "@angular/compiler-cli": "11.1.0-next.3", "typescript": "4.1.3", "webpack": "4.44.2" } diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index b283d9849ddc..fea0ed3205c3 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,20 +2,20 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#e8eb7f425e9eab6ac4dfcabd9eb41900fed95654", - "@angular/cdk": "github:angular/cdk-builds#d39f1c82854fb27e41d69b328c43c416113a83d2", - "@angular/common": "github:angular/common-builds#2359ce198c68a1f6f08e9447b29129f02292f60f", - "@angular/compiler": "github:angular/compiler-builds#e5c2e25537ea3fafe46254a13bf446f632619bf4", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#47a1d7541bd2fb91aa1ddff4b06aadb77fef7645", - "@angular/core": "github:angular/core-builds#9ffff744d9ba647274ae54b20a2a0f8a8aa93161", - "@angular/forms": "github:angular/forms-builds#67b24db1327f5d8bd19d4836e803e1120735cbd5", - "@angular/language-service": "github:angular/language-service-builds#271251ea1023f82ee09cde27a2f629bf34ff073d", - "@angular/localize": "github:angular/localize-builds#b12f793fdfa49293318f9a4b5a442a5b0aff770b", - "@angular/material": "github:angular/material2-builds#2c57bb20a19760801afb3511b30681374cd4837e", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#c5dc7cbe29dd0af51d095d599b656db82d400902", - "@angular/platform-browser": "github:angular/platform-browser-builds#2b4b17a6fe663969bd27589e965745ace738b201", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#fbf8008be250d3417bc461013aef3bd7c90258ae", - "@angular/platform-server": "github:angular/platform-server-builds#9a1abfcbfff169f8c0c0557befd2b8832e859007", - "@angular/router": "github:angular/router-builds#7facef82e53a7eebc9b58bf06b53bea11636c641" + "@angular/animations": "github:angular/animations-builds#2129f4f213e4250851b9066bef9ef6fad8bc0066", + "@angular/cdk": "github:angular/cdk-builds#905bab99fd689545cd7cb49d0b053c221e606940", + "@angular/common": "github:angular/common-builds#2f60df871c1b73462724eb625eb63206deb68f65", + "@angular/compiler": "github:angular/compiler-builds#4db278f070f9c74b08e01d32445460b2b9a2c25e", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#23e1e7dc111c1f017e01a7b21bbd433af9cc1885", + "@angular/core": "github:angular/core-builds#9f2aa82202089f02b79019ce2f0dcde651facdf7", + "@angular/forms": "github:angular/forms-builds#c229d2006bca5a04c925a71aa56c693a90c0d68d", + "@angular/language-service": "github:angular/language-service-builds#ff901c6fda8067891780093fbc258e8be09545a9", + "@angular/localize": "github:angular/localize-builds#b66332ae70d52fd3fea331d3bf67fa34e3861eb8", + "@angular/material": "github:angular/material2-builds#47a15775bde16781258ecbaa36af4e5b2741b95d", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#f0a520261fe5a47bb87ea3195713aa43ba99b453", + "@angular/platform-browser": "github:angular/platform-browser-builds#e039fa670a1e5533f7ddb9a7835fa6a2bb9c9fe8", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#390531710803c02699a435073faeca302bee4a63", + "@angular/platform-server": "github:angular/platform-server-builds#347d6c3e304a6e8fd79d11ec6c6bf1db208f6a06", + "@angular/router": "github:angular/router-builds#1f2cbd22ca1507fc05bf8993358e9853746d5306" } } diff --git a/yarn.lock b/yarn.lock index 8dc3a0358ea5..87b3afbf2f8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.0-next.2.tgz#49bdc9b4fa9e9808f568f2b2a1371a2446101c36" - integrity sha512-RwznPcrMsm1shxeIinDv4DN/ll7ch9IlnUbufuITf0RhwaojbcCbuogiz4lAfBpfcEo26x4N9Z9n4ZGvmo+i5Q== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.1.0-next.3.tgz#428361bac55260b923b26c82026d2e30c6d6822a" + integrity sha512-urEdMTXc+3gMluZgkAGUa4vL42PITPLSh6CNdBFHVSxA6mCGP+jGtwyYzQgpxn53KnYBRSB0dpWLUOXwyRS1kQ== dependencies: tslib "^2.0.0" @@ -26,17 +26,17 @@ optionalDependencies: parse5 "^5.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.0-next.2.tgz#b96f75f594a2d95e08bd2d880ef5c8968ef8894b" - integrity sha512-+Ol5J+x9qaO7FrjiTOJ8Nm4NMCU1SJwXtba2WeGVwYodCyiv2KCG8DJwIbG23C4AgKHML8Fi5UVYkMYnl/CIYw== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.1.0-next.3.tgz#740db1edadcb03b6a120b41f6533e5b98ff8850a" + integrity sha512-VgMEr2V8lkdRWUYHlQ3sl+hL28IsvSrlfGnEuy7fJFZGGnB6/JSfmRgOi3DQ/51Dz3sp7bBGWlxyg/zYxZa3vg== dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.1.0-next.2.tgz#b435cf188ab9e02b7ea8f0c5cb30ffd0789b6866" - integrity sha512-3icuD/LOd056xzxMJV7a9NuxoY1QTKjZ+weGBDL5h3jnWInzq1Wr0oceqUl424Qflj2xHnGTEHSGxrleGU6BNQ== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.1.0-next.3.tgz#eb883f2d5f94a24f1c22198107a8d1121e7e37b3" + integrity sha512-2czfPRY6cevuprGG8HwPhqG5E4Oc9H2ejYFhNkTfnft27WHbMkekhxMIgay5XBE1e9hAWlyAN1gWkq1TJPqgfg== dependencies: "@babel/core" "^7.8.6" "@babel/types" "^7.8.6" @@ -54,10 +54,10 @@ tslib "^2.0.0" yargs "^16.1.1" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.0-next.2.tgz#a9c3557f464fc98d2e38ff35a0062003e43d2d8d" - integrity sha512-Xh5OEdI7k7CvA4iHhsYRoZPhlvRXaj9AdndZMpXGyek4P8rTio2VYtbtTRBmyK9ekOysZLMV3Nm9BjNQ/N925A== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.1.0-next.3.tgz#5febc73f6e7eeaf5fd0ec149edb68b3d00fcf9ec" + integrity sha512-9OM3w3iOhDHDD1l3mYDvFGJ7A7y83VBRLn/+/jE/gOU9bOUurhGhXkd7UaGqKp5+jd6O5EliYqcLI2DVmQ36Gg== dependencies: tslib "^2.0.0" @@ -66,10 +66,10 @@ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.0-next.2.tgz#ccd232d0fadacb183e7419eedeb9745b4944de5d" - integrity sha512-eT0gAi/q9on3Ewb9EXzK8OwjxzMRbveCaFskAmSPPHCDiJsYZDuihjLJR+3UY1fqO1JTFz4YgBnOUNGTZ4Z5YA== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.1.0-next.3.tgz#64ceb9a6717840f4c83d13d97068a6620e9a2a7e" + integrity sha512-dFJSUx/PyTk0gUIDV0BQ0WOhkHZH1bdK+FeM5E3vzMsvl08P4+fkpc4B60z8X1Nc3m8rsJyCA+oy8qR9LuLwPg== dependencies: tslib "^2.0.0" @@ -85,9 +85,9 @@ dependencies: tslib "^2.0.0" -"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#28b8e8f9d2f97d8e9742fa7de5b8f55d651f756b": +"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#2ecec27bc850c11603ccd9fff21c440ba8b03dbb": version "0.0.0" - resolved "https://github.com/angular/dev-infra-private-builds.git#28b8e8f9d2f97d8e9742fa7de5b8f55d651f756b" + resolved "https://github.com/angular/dev-infra-private-builds.git#2ecec27bc850c11603ccd9fff21c440ba8b03dbb" dependencies: "@angular/benchpress" "0.2.1" "@bazel/buildifier" "^0.29.0" @@ -117,17 +117,17 @@ yaml "^1.10.0" yargs "^16.1.1" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.0-next.2.tgz#57a4d024cfbad4e842acd9bfef9e02dc491355bb" - integrity sha512-r7+UcfeaQ/XMTWt8N6uozlf/5De/E1GxSQwRpXHmpQaTG7xEPIJHC1a5wlNAtOjkmD8K4Z+KrLoHBefEfGiW4w== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.1.0-next.3.tgz#aa174476c91cf8f0e55d597c5f05ceca56f98489" + integrity sha512-LPI+Yti6zi4kgAIgTopQeCSN7Q3cXGWai/CRnkAGHm0glaXo16N8imUdNNwOS9S6mi2Nb+vU6VU9MfjtA/C4uQ== dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.1.0-next.2.tgz#08a065472ad6e42192ec60c686e4e087fe1591b2" - integrity sha512-BNRC4EqllHz2oFmIG+u1rpuhBg5kl72fHFT6FSpjyZSGVVhwIWe4gjGz2q0jZJAqAQB1he9tKrUhNxSA+hIJIw== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-11.1.0-next.3.tgz#9ebc26c8dc55d62c7c4f2a1e9149aa828244f289" + integrity sha512-7xfusCwQCGK/kzQiNlqS3yzMpF2SGsh4W2ZRultjnZhJ8zZAihEai7Lp7nfWViUNGNsGTeIOTQOQH2sP9G7t2Q== dependencies: "@babel/core" "7.8.3" glob "7.1.2" @@ -140,40 +140,40 @@ dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.0-next.2.tgz#56445649c776458672c5b3b8d5d6ba2d98a9a21f" - integrity sha512-nL5N2/ShVDKTk2lSFPM7nyfGqQyYdIdSMYGrOk9CV3rm1tO+ZQJ2PtSlByX6Hud+LJMR2hZxZPLitsygQXNqaA== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.1.0-next.3.tgz#ab88416f8e5e413d60a57b701d0e35c2bbd125b1" + integrity sha512-3pomuouEluaVQDICrbdtC0tSlawpwIb6fAqMutx+5PobTkMfjXx938A7P1RmVIKuIyj0HTLKqpnMrSESnDRKrw== dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.0-next.2.tgz#f5b2b1a2c46d44f31c0aa510e8aabccf5fac9210" - integrity sha512-855lxNPOIOgjwAIR8BDPCM1dY8mjX5VI0Oz18Db4mQuZakv4ewT9jDA/b2IqUInFhHnpwGBNxuBbE8x1WN6JmQ== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.1.0-next.3.tgz#8125367ef37f69b28503b51dd6420ab34cb171f9" + integrity sha512-HFtDSe8y3rBOZAk1xSyB290rLRFry63an6i2lK7Cr5njqGp9SP61Zqgt2AjXASj2zYRYAuK45xYUJ3YAiZfckA== dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.1.0-next.2.tgz#dd68682b0505bfa72068cb4d0d92e21addacede6" - integrity sha512-h12I/wEv4NLHmr7TNSmtuif3S3ZRrlqqlOR+5qNmz4M91Gho6GQOAYWfyoNp6Pl+jfvIrJ/Yi5ZUqMnDu+4e8A== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-11.1.0-next.3.tgz#c086342be68f1247af0f74bfe9352726079dafc3" + integrity sha512-aMgJGrO4JGc2L99leXW+juBvQfjin9E/6sF9CY87qrznoAVz/pImyhAfoGLNptZsJseArYBYKXnDQvlFShk46g== dependencies: domino "^2.1.2" tslib "^2.0.0" xhr2 "^0.2.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.1.0-next.2.tgz#50b434120332b115d2c9ccd6f8aa67c63ea78ac6" - integrity sha512-Jhty78hq5QdAuhLJ8LfZ7+mLLvFNUOAzgTvr810TlENH8/a2RJpajMG/9mrzZnB/7MZFHa81jIQChNa7jEu4ww== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.1.0-next.3.tgz#19967c8f0ed696c98ff553ae57cc3434ac2d92af" + integrity sha512-uGhVVyEYKuWFOnbsbi5hki3JxHSFTfwU3UEEco8OPHPBcO6XNYPbYVq8JOs1/5btwFGGygJsKKAVXBDOeCPyAg== dependencies: tslib "^2.0.0" -"@angular/[email protected]": - version "11.1.0-next.2" - resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.1.0-next.2.tgz#2f85eb4fa7beb1ed9077c0038a4652b81d7133df" - integrity sha512-/eKcBWeb8VBKhN1yUKXjq6ye5SmPVxIrjMchTd6AN93IrlY3Fi27zZ70lCYNqrkoWl4KMAJBKzQ5tzh6ayH6FQ== +"@angular/[email protected]": + version "11.1.0-next.3" + resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-11.1.0-next.3.tgz#9d0a0be09655cc47537d74a51b2014c95384745d" + integrity sha512-O5TAAzBDCXWgsAx4m8vN6eL0kSXzSgQii9Vm1XXm3gTyoua3Xs7XJfvChSiYX2OT75p1aY5hwyh1ncp2IMyPvQ== dependencies: tslib "^2.0.0"
57400a934632ba0e7cbaf11d93e37c17adb0aad7
2016-03-10 04:56:48
gdi2290
chore(universal): patch 0.70.8
false
patch 0.70.8
chore
diff --git a/modules/universal/package.json b/modules/universal/package.json index b0b374c2d198..ef4f8044f57c 100644 --- a/modules/universal/package.json +++ b/modules/universal/package.json @@ -1,6 +1,6 @@ { "name": "angular2-universal-preview", - "version": "0.70.7", + "version": "0.70.8", "description": "Universal (isomorphic) javascript support for Angular2", "homepage": "https://github.com/angular/universal", "license": "MIT",
7992218a9c22ea9469bd3386c7dc1d5efc6e51f9
2024-08-21 03:27:15
Charles Lyding
fix(@schematics/angular): remove `declaration` and `sourceMap` from default tsconfig
false
remove `declaration` and `sourceMap` from default tsconfig
fix
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template index c8e87ddf97cf..14ba7de7844a 100644 --- a/packages/schematics/angular/workspace/files/tsconfig.json.template +++ b/packages/schematics/angular/workspace/files/tsconfig.json.template @@ -12,8 +12,6 @@ "skipLibCheck": true, "isolatedModules": true, "esModuleInterop": true, - "sourceMap": true, - "declaration": false, "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true,
9b6b1c53a32582782972803ce42638839a3a2783
2016-08-10 04:24:24
PatrickJS
chore(examples): include style example
false
include style example
chore
diff --git a/examples/next-hello-world/src/app/index.ts b/examples/next-hello-world/src/app/index.ts index 8c3e1f662520..9a03a6b88248 100644 --- a/examples/next-hello-world/src/app/index.ts +++ b/examples/next-hello-world/src/app/index.ts @@ -4,7 +4,14 @@ import { Component } from '@angular/core'; @Component({ selector: 'app', - template: 'hello world!!!' + styles: [` + div { + background-color: red; + } + `], + template: ` + <div>hello world!!!</div> + ` }) export class App {
455b5700c29845829235e17efec320e634553108
2024-08-30 22:19:24
Alan Agius
feat(@angular/ssr): expose `writeResponseToNodeResponse` and `createWebRequestFromNodeRequest` in public API
false
expose `writeResponseToNodeResponse` and `createWebRequestFromNodeRequest` in public API
feat
diff --git a/goldens/public-api/angular/ssr/node/index.api.md b/goldens/public-api/angular/ssr/node/index.api.md index 23541740991d..a695e5068131 100644 --- a/goldens/public-api/angular/ssr/node/index.api.md +++ b/goldens/public-api/angular/ssr/node/index.api.md @@ -5,6 +5,8 @@ ```ts import { ApplicationRef } from '@angular/core'; +import type { IncomingMessage } from 'node:http'; +import type { ServerResponse } from 'node:http'; import { StaticProvider } from '@angular/core'; import { Type } from '@angular/core'; @@ -35,6 +37,12 @@ export interface CommonEngineRenderOptions { url?: string; } +// @public +export function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage): Request; + +// @public +export function writeResponseToNodeResponse(source: Response, destination: ServerResponse): Promise<void>; + // (No @packageDocumentation comment for this package) ``` diff --git a/packages/angular/ssr/node/public_api.ts b/packages/angular/ssr/node/public_api.ts index e65ed9da7c6a..4736a45c24f9 100644 --- a/packages/angular/ssr/node/public_api.ts +++ b/packages/angular/ssr/node/public_api.ts @@ -11,3 +11,6 @@ export { type CommonEngineRenderOptions, type CommonEngineOptions, } from './src/common-engine/common-engine'; + +export { writeResponseToNodeResponse } from './src/response'; +export { createWebRequestFromNodeRequest } from './src/request'; diff --git a/packages/angular/ssr/node/src/request.ts b/packages/angular/ssr/node/src/request.ts index b29ab88df1f4..644c8c6084e7 100644 --- a/packages/angular/ssr/node/src/request.ts +++ b/packages/angular/ssr/node/src/request.ts @@ -13,6 +13,7 @@ import type { IncomingHttpHeaders, IncomingMessage } from 'node:http'; * * @param nodeRequest - The Node.js `IncomingMessage` object to convert. * @returns A Web Standard `Request` object. + * @developerPreview */ export function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage): Request { const { headers, method = 'GET' } = nodeRequest; diff --git a/packages/angular/ssr/node/src/response.ts b/packages/angular/ssr/node/src/response.ts index 1610dcbf7de8..f243be1a7acb 100644 --- a/packages/angular/ssr/node/src/response.ts +++ b/packages/angular/ssr/node/src/response.ts @@ -14,6 +14,7 @@ import type { ServerResponse } from 'node:http'; * @param source - The web-standard `Response` object to stream from. * @param destination - The Node.js `ServerResponse` object to stream into. * @returns A promise that resolves once the streaming operation is complete. + * @developerPreview */ export async function writeResponseToNodeResponse( source: Response,
72b224a569c0f6239be83ea7052ece1b95b6f5d3
2021-04-20 20:02:29
Renovate Bot
build: update enhanced-resolve to version 5.8.0
false
update enhanced-resolve to version 5.8.0
build
diff --git a/package.json b/package.json index ea7f0d4627bb..a49437e6c996 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "css-loader": "5.2.4", "cssnano": "5.0.1", "debug": "^4.1.1", - "enhanced-resolve": "5.7.0", + "enhanced-resolve": "5.8.0", "express": "4.17.1", "fast-json-stable-stringify": "2.1.0", "find-cache-dir": "3.3.1", diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 5f841c1f79fe..7252684b7d72 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -21,7 +21,7 @@ }, "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack", "dependencies": { - "enhanced-resolve": "5.7.0" + "enhanced-resolve": "5.8.0" }, "peerDependencies": { "@angular/compiler-cli": "^12.0.0-next", diff --git a/yarn.lock b/yarn.lock index 480731753fb3..ef2463013b3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4858,18 +4858,18 @@ engine.io@~4.1.0: engine.io-parser "~4.0.0" ws "~7.4.2" [email protected], enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== [email protected], enhanced-resolve@^5.8.0: + version "5.8.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0" + integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" -enhanced-resolve@^5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0" - integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ== +enhanced-resolve@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" + integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0"
5c1360179cec2f0fad6b2adb4a8e4d6930738976
2025-02-06 02:46:32
Charles Lyding
fix(@angular/build): avoid pre-transform errors with Vite pre-bundling
false
avoid pre-transform errors with Vite pre-bundling
fix
diff --git a/packages/angular/build/src/builders/dev-server/tests/behavior/build-external-dependencies_spec.ts b/packages/angular/build/src/builders/dev-server/tests/behavior/build-external-dependencies_spec.ts index 583f988ba12a..476ea0cec47a 100644 --- a/packages/angular/build/src/builders/dev-server/tests/behavior/build-external-dependencies_spec.ts +++ b/packages/angular/build/src/builders/dev-server/tests/behavior/build-external-dependencies_spec.ts @@ -83,5 +83,21 @@ describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupT expect(text).toContain(`import { BehaviorSubject } from "rxjs";`); expect(text).toContain(`import { map } from "rxjs/operators";`); }); + + // TODO: Enable when Vite has a custom logger setup to redirect logging into the builder system + xit('does not show pre-transform errors in the console for external dependencies', async () => { + harness.useTarget('serve', { + ...BASE_OPTIONS, + }); + + const { result, logs } = await executeOnceAndFetch(harness, 'main.js'); + + expect(result?.success).toBeTrue(); + expect(logs).not.toContain( + jasmine.objectContaining({ + message: jasmine.stringMatching('Pre-transform error'), + }), + ); + }); }); }); diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts index 89b93d2a8f51..7ac866ad893a 100644 --- a/packages/angular/build/src/builders/dev-server/vite-server.ts +++ b/packages/angular/build/src/builders/dev-server/vite-server.ts @@ -803,6 +803,15 @@ export async function setupServer( mainFields: ['es2020', 'browser', 'module', 'main'], preserveSymlinks, }, + dev: { + // This is needed when `externalDependencies` is used to prevent Vite load errors. + // NOTE: If Vite adds direct support for externals, this can be removed. + // NOTE: Vite breaks the resolution of browser modules in SSR + // when accessing a url with two or more segments (e.g., 'foo/bar'), + // as they are not re-based from the base href. + preTransformRequests: + externalMetadata.explicitBrowser.length === 0 && ssrMode === ServerSsrMode.NoSsr, + }, server: { warmup: { ssrFiles, @@ -841,13 +850,6 @@ export async function setupServer( ...[...assets.values()].map(({ source }) => source), ], }, - // This is needed when `externalDependencies` is used to prevent Vite load errors. - // NOTE: If Vite adds direct support for externals, this can be removed. - // NOTE: Vite breaks the resolution of browser modules in SSR - // when accessing a url with two or more segments (e.g., 'foo/bar'), - // as they are not re-based from the base href. - preTransformRequests: - externalMetadata.explicitBrowser.length === 0 && ssrMode === ServerSsrMode.NoSsr, }, ssr: { // Note: `true` and `/.*/` have different sematics. When true, the `external` option is ignored.
6e9008c37ac6b874586a47474ea1e782a53a291b
2022-11-23 19:12:56
Alan Agius
fix(@angular-devkit/build-angular): hide loader paths in webpack warnings
false
hide loader paths in webpack warnings
fix
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts b/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts index 8b45ea38a0d7..3e3a64407316 100644 --- a/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts +++ b/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts @@ -343,7 +343,17 @@ export function statsWarningsToString( if (typeof warning === 'string') { output += yb(`Warning: ${warning}\n\n`); } else { - const file = warning.file || warning.moduleName; + let file = warning.file || warning.moduleName; + // Clean up warning paths + // Ex: ./src/app/styles.scss.webpack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js.... + // to ./src/app/styles.scss.webpack + if (file && !statsConfig.errorDetails) { + const webpackPathIndex = file.indexOf('.webpack['); + if (webpackPathIndex !== -1) { + file = file.substring(0, webpackPathIndex); + } + } + if (file) { output += c(file); if (warning.loc) {
1153c9214ef2f558288048718a81f2dd056d6dd8
2016-12-22 07:39:50
Filipe Silva
fix(tests): add global scripts in karma plugin (#3543)
false
add global scripts in karma plugin (#3543)
fix
diff --git a/packages/angular-cli/plugins/karma.js b/packages/angular-cli/plugins/karma.js index 0131b660264e..16c4fc7cafea 100644 --- a/packages/angular-cli/plugins/karma.js +++ b/packages/angular-cli/plugins/karma.js @@ -11,6 +11,7 @@ const init = (config) => { } const angularCliConfig = require(path.join(config.basePath, config.angularCli.config)); const appConfig = angularCliConfig.apps[0]; + const appRoot = path.join(config.basePath, appConfig.root); const environment = config.angularCli.environment || 'dev'; const testConfig = { codeCoverage: config.angularCli.codeCoverage || false, @@ -66,6 +67,25 @@ const init = (config) => { .filter((file) => config.preprocessors[file].indexOf('angular-cli') !== -1) .map((file) => config.preprocessors[file]) .map((arr) => arr.splice(arr.indexOf('angular-cli'), 1, 'webpack', 'sourcemap')); + + // Add global scripts + if (appConfig.scripts && appConfig.scripts.length > 0) { + const globalScriptPatterns = appConfig.scripts + .map(script => typeof script === 'string' ? { input: script } : script) + // Neither renamed nor lazy scripts are currently supported + .filter(script => !(script.output || script.lazy)) + .map(script => ({ + pattern: path.resolve(appRoot, script.input), + included: true, + served: true, + watched: true + })); + + // Unshift elements onto the beginning of the files array. + // It's important to not replace the array, because + // karma already has a reference to the existing array. + Array.prototype.unshift.apply(config.files, globalScriptPatterns); + } } init.$inject = ['config']; diff --git a/tests/e2e/tests/test/test-assets.ts b/tests/e2e/tests/test/test-assets.ts new file mode 100644 index 000000000000..195b05e47c35 --- /dev/null +++ b/tests/e2e/tests/test/test-assets.ts @@ -0,0 +1,49 @@ +import { writeMultipleFiles } from '../../utils/fs'; +import { ng } from '../../utils/process'; +import { updateJsonFile } from '../../utils/project'; +import { expectToFail } from '../../utils/utils'; +import { stripIndent } from 'common-tags'; + +// Make sure asset files are served +export default function () { + return Promise.resolve() + .then(() => writeMultipleFiles({ + 'src/assets/file.txt': 'assets-folder-content', + 'src/file.txt': 'file-content', + // Not using `async()` in tests as it seemed to swallow `fetch()` errors + 'src/app/app.component.spec.ts': stripIndent` + describe('Test Runner', () => { + const fetch = global['fetch']; + it('should serve files in assets folder', (done) => { + fetch('/assets/file.txt') + .then(response => response.text()) + .then(fileText => { + expect(fileText).toMatch('assets-folder-content'); + done(); + }); + }); + it('should serve files explicitly added to assets array', (done) => { + fetch('/file.txt') + .then(response => response.text()) + .then(fileText => { + expect(fileText).toMatch('file-content'); + done(); + }); + }); + }); + ` + })) + // Test failure condition (no assets in angular-cli.json) + .then(() => updateJsonFile('angular-cli.json', configJson => { + const app = configJson['apps'][0]; + app['assets'] = []; + })) + .then(() => expectToFail(() => ng('test', '--single-run'), + 'Should fail because the assets to serve were not in the angular-cli config')) + // Test passing condition (assets are included) + .then(() => updateJsonFile('angular-cli.json', configJson => { + const app = configJson['apps'][0]; + app['assets'] = ['assets', 'file.txt']; + })) + .then(() => ng('test', '--single-run')); +} diff --git a/tests/e2e/tests/test/test-scripts.ts b/tests/e2e/tests/test/test-scripts.ts new file mode 100644 index 000000000000..2e4d581d1bb5 --- /dev/null +++ b/tests/e2e/tests/test/test-scripts.ts @@ -0,0 +1,71 @@ +import { writeMultipleFiles } from '../../utils/fs'; +import { ng } from '../../utils/process'; +import { updateJsonFile } from '../../utils/project'; +import { expectToFail } from '../../utils/utils'; +import { stripIndent } from 'common-tags'; + +export default function () { + return Promise.resolve() + .then(() => ng('test', '--watch=false')) + // prepare global scripts test files + .then(() => writeMultipleFiles({ + 'src/string-script.js': `stringScriptGlobal = 'string-scripts.js';`, + 'src/input-script.js': `inputScriptGlobal = 'input-scripts.js';`, + 'src/typings.d.ts': stripIndent` + declare var stringScriptGlobal: any; + declare var inputScriptGlobal: any; + `, + 'src/app/app.component.ts': stripIndent` + import { Component } from '@angular/core'; + + @Component({ selector: 'app-root', template: '' }) + export class AppComponent { + stringScriptGlobalProp = stringScriptGlobal; + inputScriptGlobalProp = inputScriptGlobal; + } + `, + 'src/app/app.component.spec.ts': stripIndent` + import { TestBed, async } from '@angular/core/testing'; + import { AppComponent } from './app.component'; + + describe('AppComponent', () => { + beforeEach(() => { + TestBed.configureTestingModule({ declarations: [ AppComponent ] }); + TestBed.compileComponents(); + }); + + it('should have access to string-script.js', async(() => { + let app = TestBed.createComponent(AppComponent).debugElement.componentInstance; + expect(app.stringScriptGlobalProp).toEqual('string-scripts.js'); + })); + + it('should have access to input-script.js', async(() => { + let app = TestBed.createComponent(AppComponent).debugElement.componentInstance; + expect(app.inputScriptGlobalProp).toEqual('input-scripts.js'); + })); + }); + + describe('Spec', () => { + it('should have access to string-script.js', async(() => { + expect(stringScriptGlobal).toBe('string-scripts.js'); + })); + + it('should have access to input-script.js', async(() => { + expect(inputScriptGlobal).toBe('input-scripts.js'); + })); + }); + ` + })) + // should fail because the global scripts were not added to scripts array + .then(() => expectToFail(() => ng('test', '--single-run'))) + .then(() => updateJsonFile('angular-cli.json', configJson => { + const app = configJson['apps'][0]; + app['scripts'] = [ + 'string-script.js', + { input: 'input-script.js' } + ]; + })) + // should pass now + .then(() => ng('test', '--single-run')); +} + diff --git a/tests/e2e/tests/test/test.ts b/tests/e2e/tests/test/test.ts index 89859a4caef9..ed4ea6c5f0d4 100644 --- a/tests/e2e/tests/test/test.ts +++ b/tests/e2e/tests/test/test.ts @@ -1,65 +1,7 @@ -import { writeMultipleFiles } from '../../utils/fs'; import { ng } from '../../utils/process'; -import { updateJsonFile } from '../../utils/project'; -import { expectToFail } from '../../utils/utils'; -import { stripIndent } from 'common-tags'; - export default function () { - // Each test function returns PromiseLike<Something_Different>, - // which would throw normally - // but resolve() normalizes this to <any> from the start - return Promise.resolve() - .then(() => testWatchFalseAndSingleRun()) - .then(() => testAssetsAreServed()); -} - -// Make sure both --watch=false and --single-run work -function testWatchFalseAndSingleRun() { + // make sure both --watch=false and --single-run work return ng('test', '--single-run') .then(() => ng('test', '--watch=false')); } - -// Make sure asset files are served -function testAssetsAreServed() { - return Promise.resolve() - .then(() => writeMultipleFiles({ - 'src/assets/file.txt': 'assets-folder-content', - 'src/file.txt': 'file-content', - // Not using `async()` in tests as it seemed to swallow `fetch()` errors - 'src/app/app.component.spec.ts': stripIndent` - describe('Test Runner', () => { - const fetch = global['fetch']; - it('should serve files in assets folder', (done) => { - fetch('/assets/file.txt') - .then(response => response.text()) - .then(fileText => { - expect(fileText).toMatch('assets-folder-content'); - done(); - }); - }); - it('should serve files explicitly added to assets array', (done) => { - fetch('/file.txt') - .then(response => response.text()) - .then(fileText => { - expect(fileText).toMatch('file-content'); - done(); - }); - }); - }); - ` - })) - // Test failure condition (no assets in angular-cli.json) - .then(() => updateJsonFile('angular-cli.json', configJson => { - const app = configJson['apps'][0]; - app['assets'] = []; - })) - .then(() => expectToFail(() => ng('test', '--single-run'), - 'Should fail because the assets to serve were not in the angular-cli config')) - // Test passing condition (assets are included) - .then(() => updateJsonFile('angular-cli.json', configJson => { - const app = configJson['apps'][0]; - app['assets'] = ['assets', 'file.txt']; - })) - .then(() => ng('test', '--single-run')); -}
74bba8c18470f36f37e1c6c914906e9dd32f0ce2
2024-06-21 00:05:36
Angular Robot
build: update angular
false
update angular
build
diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml index ae1f7c679f22..aca13c73489a 100644 --- a/.github/workflows/assistant-to-the-branch-manager.yml +++ b/.github/workflows/assistant-to-the-branch-manager.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - - uses: angular/dev-infra/github-actions/branch-manager@f9a55a8d166809baa07af8b6bb51438a06ea025c + - uses: angular/dev-infra/github-actions/branch-manager@c6406e1cddeaac35f6b4ee02fa60823404d45f6b with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a01ee8e7c9a6..57472a36ebbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Run ESLint @@ -39,11 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -53,11 +53,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Run module tests @@ -89,13 +89,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -110,13 +110,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -131,13 +131,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} @@ -148,13 +148,13 @@ jobs: SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run E2E Browser tests env: SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }} @@ -181,11 +181,11 @@ jobs: CIRCLE_BRANCH: ${{ github.ref_name }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - run: yarn admin snapshots --verbose env: SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }} diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml index c11c9a8aa7d4..f353f103eae8 100644 --- a/.github/workflows/dev-infra.yml +++ b/.github/workflows/dev-infra.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/commit-message-based-labels@f9a55a8d166809baa07af8b6bb51438a06ea025c + - uses: angular/dev-infra/github-actions/commit-message-based-labels@c6406e1cddeaac35f6b4ee02fa60823404d45f6b with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} post_approval_changes: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: angular/dev-infra/github-actions/post-approval-changes@f9a55a8d166809baa07af8b6bb51438a06ea025c + - uses: angular/dev-infra/github-actions/post-approval-changes@c6406e1cddeaac35f6b4ee02fa60823404d45f6b with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml index 07a5660dee02..45ea8e1db21e 100644 --- a/.github/workflows/feature-requests.yml +++ b/.github/workflows/feature-requests.yml @@ -16,6 +16,6 @@ jobs: if: github.repository == 'angular/angular-cli' runs-on: ubuntu-latest steps: - - uses: angular/dev-infra/github-actions/feature-request@f9a55a8d166809baa07af8b6bb51438a06ea025c + - uses: angular/dev-infra/github-actions/feature-request@c6406e1cddeaac35f6b4ee02fa60823404d45f6b with: angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1e6cbea32dd7..14647967be0f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup ESLint Caching uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: @@ -51,7 +51,7 @@ jobs: - name: Run Validation run: yarn admin validate - name: Check Package Licenses - uses: angular/dev-infra/github-actions/linting/licenses@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/linting/licenses@c6406e1cddeaac35f6b4ee02fa60823404d45f6b with: allow-dependencies-licenses: 'pkg:npm/[email protected]' - name: Check tooling setup @@ -69,11 +69,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Build release targets @@ -89,11 +89,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Run module tests @@ -112,13 +112,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -133,13 +133,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }} @@ -156,12 +156,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Initialize environment - uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Install node modules run: yarn install --immutable - name: Setup Bazel - uses: angular/dev-infra/github-actions/bazel/setup@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/setup@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@f9a55a8d166809baa07af8b6bb51438a06ea025c + uses: angular/dev-infra/github-actions/bazel/configure-remote@c6406e1cddeaac35f6b4ee02fa60823404d45f6b - name: Run CLI E2E tests run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }} diff --git a/package.json b/package.json index 1636283a1632..567ae89f96c3 100644 --- a/package.json +++ b/package.json @@ -54,16 +54,16 @@ "@ampproject/remapping": "2.3.0", "@angular/animations": "18.1.0-next.2", "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=71bd2e043e076365effdb6076f33b2d8d6bd6d02#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch", - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#262dbe37d2da168deee0fa25901da397c92a6e88", - "@angular/cdk": "18.0.3", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#c7df3539c0c366530e5fb4280d0b371d14fb30de", + "@angular/cdk": "18.0.4", "@angular/common": "18.1.0-next.2", "@angular/compiler": "18.1.0-next.2", "@angular/compiler-cli": "18.1.0-next.2", "@angular/core": "18.1.0-next.2", "@angular/forms": "18.1.0-next.2", "@angular/localize": "18.1.0-next.2", - "@angular/material": "18.0.3", - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#c76591b8d2302378e51fc29619c87c1e947fb9b0", + "@angular/material": "18.0.4", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#1a714249dfb98ef8067b3f610180c2a940f20294", "@angular/platform-browser": "18.1.0-next.2", "@angular/platform-browser-dynamic": "18.1.0-next.2", "@angular/platform-server": "18.1.0-next.2", diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json index 00f094e45cf7..e4ebf0a79af4 100644 --- a/tests/legacy-cli/e2e/ng-snapshot/package.json +++ b/tests/legacy-cli/e2e/ng-snapshot/package.json @@ -2,21 +2,21 @@ "description": "snapshot versions of Angular for e2e testing", "private": true, "dependencies": { - "@angular/animations": "github:angular/animations-builds#f83ed23d8c07da52ebc59d2e39eabc3861aa98ae", - "@angular/cdk": "github:angular/cdk-builds#121b00b9db7a26e2285398c9941ee375729b3f99", - "@angular/common": "github:angular/common-builds#414d982b638154fac89ae83c92521ed9195bf55f", - "@angular/compiler": "github:angular/compiler-builds#b218448ac993a7112f96260eb747686fd37c5059", - "@angular/compiler-cli": "github:angular/compiler-cli-builds#c147b229587b0e6cec94cb25fa96feaebf67cfb2", - "@angular/core": "github:angular/core-builds#3ead8ed3bdb25b8067adca4f8d2534f5509912d1", - "@angular/forms": "github:angular/forms-builds#fb7bc58376491a153b68cf463ecc580e2beacb5e", - "@angular/language-service": "github:angular/language-service-builds#7bb06b90ce16752540dee4e39595dbc0ed5c8abf", - "@angular/localize": "github:angular/localize-builds#587a6220aa76548a2aeeac95849fb7b042f76156", - "@angular/material": "github:angular/material-builds#a05254d609ab8ad90eb27807aed57144fefc7412", - "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#d780a6a8d43ae773b789d4208da297a4b862e18c", - "@angular/platform-browser": "github:angular/platform-browser-builds#67a00c458cf59089e6f250cfd9739b24b5fbc6b7", - "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#695dbcac4a3424743611eb771be2c98ac3ad76ad", - "@angular/platform-server": "github:angular/platform-server-builds#636b82e07e04a841fda8273533d32b239d0b50bf", - "@angular/router": "github:angular/router-builds#f1d8926e890727e4f746c34b3cd29bca66a98505", - "@angular/service-worker": "github:angular/service-worker-builds#5b69827cb5a0d1f88344d970e56dd14d06b01e80" + "@angular/animations": "github:angular/animations-builds#ca512dd0614b46571ecfc141b1da6fea55ffb870", + "@angular/cdk": "github:angular/cdk-builds#3bf010e87ddcab3d93c0158d6156dd4257a40e3e", + "@angular/common": "github:angular/common-builds#192ef9e61c18a987d07943e4d6193827dc8bc0b9", + "@angular/compiler": "github:angular/compiler-builds#4a36a9474f397fe4c4e945fc9b6672c690d59002", + "@angular/compiler-cli": "github:angular/compiler-cli-builds#5e6b4a8ac02cb0c0f24e3ab5b2cd1895bc2ff76f", + "@angular/core": "github:angular/core-builds#a396c7ffa0688319c24cad9d5538969c1eded3ab", + "@angular/forms": "github:angular/forms-builds#3b69b53cd29b61076875da8db8f83a0734896f7c", + "@angular/language-service": "github:angular/language-service-builds#14dee587af083f05430773bc5d15382e4ef93f1d", + "@angular/localize": "github:angular/localize-builds#3ecf4fe49ae65e516fc2306934843b70f5dccbb2", + "@angular/material": "github:angular/material-builds#fd0199a15f7395fec90227d468bb062400571001", + "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#c525f0bed4507642a5fd9192cd79f28e3b8f12c2", + "@angular/platform-browser": "github:angular/platform-browser-builds#676f097cdfe7a724c18bbb9026896f353ed8e0fb", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#bae0a5ca87d11c86c7ee43a0f74fb1afa034cc62", + "@angular/platform-server": "github:angular/platform-server-builds#4e73d934a4321d3e29217dd3756b15e82cdd11ef", + "@angular/router": "github:angular/router-builds#ed1752bde49d770507eeaaae8e003c8fa6e75cd3", + "@angular/service-worker": "github:angular/service-worker-builds#c26b7472c7ecf3188f43c3b9f2dfd9a597c06639" } } diff --git a/yarn.lock b/yarn.lock index 77ab4b40d8fb..5889242a8121 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,13 +50,18 @@ __metadata: languageName: unknown linkType: soft -"@angular-devkit/architect@npm:0.1801.0-next.1": - version: 0.1801.0-next.1 - resolution: "@angular-devkit/architect@npm:0.1801.0-next.1" +"@angular-devkit/architect@npm:0.1801.0-next.2": + version: 0.1801.0-next.2 + resolution: "@angular-devkit/architect@npm:0.1801.0-next.2" dependencies: - "@angular-devkit/core": "npm:18.1.0-next.1" + "@angular-devkit/core": "npm:18.1.0-next.2" rxjs: "npm:7.8.1" - checksum: 10c0/5654d7c9ade5ef774df62a6ef16d64af0c1d257d88753281f9513df1bb224c8dd086d48fd40f0f493a7ce785680dd8c2b6633094f7d1f5d6cb03450d26920772 + dependenciesMeta: + esbuild: + built: true + puppeteer: + built: true + checksum: 10c0/122b9214d4d88ad1e47433bf146851ada7003ea3114f5eb5a9ef6374973c2048c5d985a778ad9b894546d473d54deb8f3d22c2e3e1e1bc442b302e89f712f37b languageName: node linkType: hard @@ -203,9 +208,9 @@ __metadata: languageName: unknown linkType: soft -"@angular-devkit/core@npm:18.1.0-next.1": - version: 18.1.0-next.1 - resolution: "@angular-devkit/core@npm:18.1.0-next.1" +"@angular-devkit/core@npm:18.1.0-next.2": + version: 18.1.0-next.2 + resolution: "@angular-devkit/core@npm:18.1.0-next.2" dependencies: ajv: "npm:8.16.0" ajv-formats: "npm:3.0.1" @@ -215,10 +220,15 @@ __metadata: source-map: "npm:0.7.4" peerDependencies: chokidar: ^3.5.2 + dependenciesMeta: + esbuild: + built: true + puppeteer: + built: true peerDependenciesMeta: chokidar: optional: true - checksum: 10c0/72a2981c8f4dc85dfae60df65af8b46aba7e0e8d1fd2dda6b618b685700f6cc50db1812100188351f190540a796dbea57a5c567596cf8f3ec1da0ae056dce0fd + checksum: 10c0/ff37e88acd78ae0ae64fd2b3e076ea17a76aa57d3e91bc42d3ffa2338ee3b639658ecc7738ba7b0a20dd0de3341e3193583786c9445ce95d16e965bd65db89e8 languageName: node linkType: hard @@ -328,12 +338,12 @@ __metadata: languageName: node linkType: hard -"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#262dbe37d2da168deee0fa25901da397c92a6e88": - version: 0.0.0-f9a55a8d166809baa07af8b6bb51438a06ea025c - resolution: "@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#commit=262dbe37d2da168deee0fa25901da397c92a6e88" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#c7df3539c0c366530e5fb4280d0b371d14fb30de": + version: 0.0.0-c6406e1cddeaac35f6b4ee02fa60823404d45f6b + resolution: "@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#commit=c7df3539c0c366530e5fb4280d0b371d14fb30de" dependencies: "@angular/benchpress": "npm:0.3.0" - "@angular/build": "npm:18.1.0-next.1" + "@angular/build": "npm:18.1.0-next.2" "@babel/core": "npm:^7.16.0" "@babel/helper-annotate-as-pure": "npm:^7.18.6" "@babel/plugin-proposal-async-generator-functions": "npm:^7.20.1" @@ -375,7 +385,7 @@ __metadata: dependenciesMeta: re2: built: false - checksum: 10c0/d7baa4daf0ef0bb62908e563a94449c95123958fcd5fdd5561652d810956b5068427feb7fbd02ec01d46f1e84e303d16ad22494f83d3217875ad6a3621e31f78 + checksum: 10c0/8d0f6ea41642d291bfe7b577c9d5c31b8c82d9810d30417256de228616606e7b94a1214e730f8bf24bf2978158e3fc77642d40cf23fa83c78ecf726624527af1 languageName: node linkType: hard @@ -433,34 +443,34 @@ __metadata: languageName: unknown linkType: soft -"@angular/build@npm:18.1.0-next.1": - version: 18.1.0-next.1 - resolution: "@angular/build@npm:18.1.0-next.1" +"@angular/build@npm:18.1.0-next.2": + version: 18.1.0-next.2 + resolution: "@angular/build@npm:18.1.0-next.2" dependencies: "@ampproject/remapping": "npm:2.3.0" - "@angular-devkit/architect": "npm:0.1801.0-next.1" + "@angular-devkit/architect": "npm:0.1801.0-next.2" "@babel/core": "npm:7.24.7" "@babel/helper-annotate-as-pure": "npm:7.24.7" "@babel/helper-split-export-declaration": "npm:7.24.7" + "@inquirer/confirm": "npm:3.1.9" "@vitejs/plugin-basic-ssl": "npm:1.1.0" ansi-colors: "npm:4.1.3" browserslist: "npm:^4.23.0" critters: "npm:0.0.22" - esbuild: "npm:0.21.4" + esbuild: "npm:0.21.5" fast-glob: "npm:3.3.2" https-proxy-agent: "npm:7.0.4" - inquirer: "npm:9.2.23" - lmdb: "npm:3.0.11" + lmdb: "npm:3.0.12" magic-string: "npm:0.30.10" mrmime: "npm:2.0.0" ora: "npm:5.4.1" parse5-html-rewriting-stream: "npm:7.0.0" picomatch: "npm:4.0.2" piscina: "npm:4.5.1" - sass: "npm:1.77.4" + sass: "npm:1.77.5" semver: "npm:7.6.2" undici: "npm:6.18.2" - vite: "npm:5.2.12" + vite: "npm:5.2.13" watchpack: "npm:2.4.1" peerDependencies: "@angular/compiler-cli": ^18.0.0 || ^18.1.0-next.0 @@ -471,6 +481,11 @@ __metadata: postcss: ^8.4.0 tailwindcss: ^2.0.0 || ^3.0.0 typescript: ">=5.4 <5.6" + dependenciesMeta: + esbuild: + built: true + puppeteer: + built: true peerDependenciesMeta: "@angular/localize": optional: true @@ -484,13 +499,13 @@ __metadata: optional: true tailwindcss: optional: true - checksum: 10c0/54f30068caa2484973d9f57b49fcc63f9437046843762f5746db62e7d9f356c825b3da556d5394eeff96500ec4fdfb6b0387ff004b9f56c5a410bfad99e20d96 + checksum: 10c0/ad61a82f11be881fd3db46e68f73a7bb96d9710202ce87600aafb7cc1eb79ed7c59f4d51bbbccebb0705d19a0d9f0c6600406dfe2726361b3592343acf5217cc languageName: node linkType: hard -"@angular/cdk@npm:18.0.3": - version: 18.0.3 - resolution: "@angular/cdk@npm:18.0.3" +"@angular/cdk@npm:18.0.4": + version: 18.0.4 + resolution: "@angular/cdk@npm:18.0.4" dependencies: parse5: "npm:^7.1.2" tslib: "npm:^2.3.0" @@ -501,7 +516,7 @@ __metadata: dependenciesMeta: parse5: optional: true - checksum: 10c0/ce5e90c5151da5634973f5336bee4e4c567ef342251b12595096b85285be1353dbbdfcd82cdab4a015c9a2039ce73b380c5604d555de71147a74b4a9e3620a1e + checksum: 10c0/87d7dc8d9377d1fb91310175936a4ca5dea74ead9b9cd43792f2283116024ebc0985bc7b177aa7ba4fa068af60a1dd77e3c0d7f34037e2199a129e3161e92560 languageName: node linkType: hard @@ -621,16 +636,16 @@ __metadata: "@ampproject/remapping": "npm:2.3.0" "@angular/animations": "npm:18.1.0-next.2" "@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=71bd2e043e076365effdb6076f33b2d8d6bd6d02#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch" - "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#262dbe37d2da168deee0fa25901da397c92a6e88" - "@angular/cdk": "npm:18.0.3" + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#c7df3539c0c366530e5fb4280d0b371d14fb30de" + "@angular/cdk": "npm:18.0.4" "@angular/common": "npm:18.1.0-next.2" "@angular/compiler": "npm:18.1.0-next.2" "@angular/compiler-cli": "npm:18.1.0-next.2" "@angular/core": "npm:18.1.0-next.2" "@angular/forms": "npm:18.1.0-next.2" "@angular/localize": "npm:18.1.0-next.2" - "@angular/material": "npm:18.0.3" - "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#c76591b8d2302378e51fc29619c87c1e947fb9b0" + "@angular/material": "npm:18.0.4" + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#1a714249dfb98ef8067b3f610180c2a940f20294" "@angular/platform-browser": "npm:18.1.0-next.2" "@angular/platform-browser-dynamic": "npm:18.1.0-next.2" "@angular/platform-server": "npm:18.1.0-next.2" @@ -819,9 +834,9 @@ __metadata: languageName: node linkType: hard -"@angular/material@npm:18.0.3": - version: 18.0.3 - resolution: "@angular/material@npm:18.0.3" +"@angular/material@npm:18.0.4": + version: 18.0.4 + resolution: "@angular/material@npm:18.0.4" dependencies: "@material/animation": "npm:15.0.0-canary.7f224ddd4.0" "@material/auto-init": "npm:15.0.0-canary.7f224ddd4.0" @@ -874,19 +889,19 @@ __metadata: tslib: "npm:^2.3.0" peerDependencies: "@angular/animations": ^18.0.0 || ^19.0.0 - "@angular/cdk": 18.0.3 + "@angular/cdk": 18.0.4 "@angular/common": ^18.0.0 || ^19.0.0 "@angular/core": ^18.0.0 || ^19.0.0 "@angular/forms": ^18.0.0 || ^19.0.0 "@angular/platform-browser": ^18.0.0 || ^19.0.0 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/47048856f94b501ef59b404c641832ba4a943927e407eb9a9d332635a937ff78fe4fb3ecd29061b913672bf507bf493d8612130218effddaf034baad812dbd03 + checksum: 10c0/12d9f25c0485404533f48972e7aa6f0eb4170646c0dbab6d78075f71c87ba7d33a4975baa62d511a83026efa9ce6cf5a49977f21891140db430c45a349323304 languageName: node linkType: hard -"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#c76591b8d2302378e51fc29619c87c1e947fb9b0": - version: 0.0.0-f9a55a8d166809baa07af8b6bb51438a06ea025c - resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=c76591b8d2302378e51fc29619c87c1e947fb9b0" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#1a714249dfb98ef8067b3f610180c2a940f20294": + version: 0.0.0-c6406e1cddeaac35f6b4ee02fa60823404d45f6b + resolution: "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#commit=1a714249dfb98ef8067b3f610180c2a940f20294" dependencies: "@octokit/rest": "npm:20.1.1" "@types/semver": "npm:^7.3.6" @@ -899,7 +914,7 @@ __metadata: typescript: "npm:~4.9.0" bin: ng-dev: ./bundles/cli.mjs - checksum: 10c0/423c45d275b51d74aa6a7dc2f6c20ad6322d4a6b5249202927aef6b2744641104688c4829bfd720ce7460ffd504b7cacd9889ee15954c2cff7a95b1f980de139 + checksum: 10c0/6e2bb1a354f2c976fd437378e807fdbf4fa18cf689518b6552c12fe45a3f37e6995f03f659811363ca64ca5505f272c704bb9b4fbe4becdfb40caba64eadbc48 languageName: node linkType: hard @@ -2580,13 +2595,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/aix-ppc64@npm:0.21.4" - conditions: os=aix & cpu=ppc64 - languageName: node - linkType: hard - "@esbuild/aix-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/aix-ppc64@npm:0.21.5" @@ -2601,13 +2609,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/android-arm64@npm:0.21.4" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/android-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-arm64@npm:0.21.5" @@ -2622,13 +2623,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/android-arm@npm:0.21.4" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - "@esbuild/android-arm@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-arm@npm:0.21.5" @@ -2643,13 +2637,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/android-x64@npm:0.21.4" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - "@esbuild/android-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/android-x64@npm:0.21.5" @@ -2664,13 +2651,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/darwin-arm64@npm:0.21.4" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/darwin-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/darwin-arm64@npm:0.21.5" @@ -2685,13 +2665,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/darwin-x64@npm:0.21.4" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@esbuild/darwin-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/darwin-x64@npm:0.21.5" @@ -2706,13 +2679,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/freebsd-arm64@npm:0.21.4" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/freebsd-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/freebsd-arm64@npm:0.21.5" @@ -2727,13 +2693,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/freebsd-x64@npm:0.21.4" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/freebsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/freebsd-x64@npm:0.21.5" @@ -2748,13 +2707,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-arm64@npm:0.21.4" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/linux-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-arm64@npm:0.21.5" @@ -2769,13 +2721,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-arm@npm:0.21.4" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - "@esbuild/linux-arm@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-arm@npm:0.21.5" @@ -2790,13 +2735,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-ia32@npm:0.21.4" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - "@esbuild/linux-ia32@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-ia32@npm:0.21.5" @@ -2811,13 +2749,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-loong64@npm:0.21.4" - conditions: os=linux & cpu=loong64 - languageName: node - linkType: hard - "@esbuild/linux-loong64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-loong64@npm:0.21.5" @@ -2832,13 +2763,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-mips64el@npm:0.21.4" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - "@esbuild/linux-mips64el@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-mips64el@npm:0.21.5" @@ -2853,13 +2777,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-ppc64@npm:0.21.4" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - "@esbuild/linux-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-ppc64@npm:0.21.5" @@ -2874,13 +2791,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-riscv64@npm:0.21.4" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - "@esbuild/linux-riscv64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-riscv64@npm:0.21.5" @@ -2895,13 +2805,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-s390x@npm:0.21.4" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - "@esbuild/linux-s390x@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-s390x@npm:0.21.5" @@ -2916,13 +2819,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/linux-x64@npm:0.21.4" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - "@esbuild/linux-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/linux-x64@npm:0.21.5" @@ -2937,13 +2833,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/netbsd-x64@npm:0.21.4" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/netbsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/netbsd-x64@npm:0.21.5" @@ -2958,13 +2847,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/openbsd-x64@npm:0.21.4" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - "@esbuild/openbsd-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/openbsd-x64@npm:0.21.5" @@ -2979,13 +2861,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/sunos-x64@npm:0.21.4" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - "@esbuild/sunos-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/sunos-x64@npm:0.21.5" @@ -3000,13 +2875,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/win32-arm64@npm:0.21.4" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@esbuild/win32-arm64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-arm64@npm:0.21.5" @@ -3021,13 +2889,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/win32-ia32@npm:0.21.4" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@esbuild/win32-ia32@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-ia32@npm:0.21.5" @@ -3042,13 +2903,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.21.4": - version: 0.21.4 - resolution: "@esbuild/win32-x64@npm:0.21.4" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@esbuild/win32-x64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/win32-x64@npm:0.21.5" @@ -3160,7 +3014,17 @@ __metadata: languageName: node linkType: hard -"@inquirer/core@npm:^8.2.3": +"@inquirer/confirm@npm:3.1.9": + version: 3.1.9 + resolution: "@inquirer/confirm@npm:3.1.9" + dependencies: + "@inquirer/core": "npm:^8.2.2" + "@inquirer/type": "npm:^1.3.3" + checksum: 10c0/9fb63a052cbe3705bcab706b3e68d70aa75ac7c7bfc04cc4fee2319e4da9355150c99b205bc72b595844e1549705643049e71d14070a3ab3d6483941c1e6a239 + languageName: node + linkType: hard + +"@inquirer/core@npm:^8.2.2, @inquirer/core@npm:^8.2.3": version: 8.2.3 resolution: "@inquirer/core@npm:8.2.3" dependencies: @@ -3418,22 +3282,6 @@ __metadata: languageName: node linkType: hard -"@ljharb/through@npm:^2.3.13": - version: 2.3.13 - resolution: "@ljharb/through@npm:2.3.13" - dependencies: - call-bind: "npm:^1.0.7" - checksum: 10c0/fb60b2fb2c674a674d8ebdb8972ccf52f8a62a9c1f5a2ac42557bc0273231c65d642aa2d7627cbb300766a25ae4642acd0f95fba2f8a1ff891086f0cb15807c3 - languageName: node - linkType: hard - -"@lmdb/lmdb-darwin-arm64@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-darwin-arm64@npm:3.0.11" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@lmdb/lmdb-darwin-arm64@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-darwin-arm64@npm:3.0.12" @@ -3441,13 +3289,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-darwin-x64@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-darwin-x64@npm:3.0.11" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@lmdb/lmdb-darwin-x64@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-darwin-x64@npm:3.0.12" @@ -3455,13 +3296,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-linux-arm64@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-linux-arm64@npm:3.0.11" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "@lmdb/lmdb-linux-arm64@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-linux-arm64@npm:3.0.12" @@ -3469,13 +3303,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-linux-arm@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-linux-arm@npm:3.0.11" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - "@lmdb/lmdb-linux-arm@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-linux-arm@npm:3.0.12" @@ -3483,13 +3310,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-linux-x64@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-linux-x64@npm:3.0.11" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - "@lmdb/lmdb-linux-x64@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-linux-x64@npm:3.0.12" @@ -3497,13 +3317,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-win32-x64@npm:3.0.11": - version: 3.0.11 - resolution: "@lmdb/lmdb-win32-x64@npm:3.0.11" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@lmdb/lmdb-win32-x64@npm:3.0.12": version: 3.0.12 resolution: "@lmdb/lmdb-win32-x64@npm:3.0.12" @@ -9671,86 +9484,6 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:0.21.4": - version: 0.21.4 - resolution: "esbuild@npm:0.21.4" - dependencies: - "@esbuild/aix-ppc64": "npm:0.21.4" - "@esbuild/android-arm": "npm:0.21.4" - "@esbuild/android-arm64": "npm:0.21.4" - "@esbuild/android-x64": "npm:0.21.4" - "@esbuild/darwin-arm64": "npm:0.21.4" - "@esbuild/darwin-x64": "npm:0.21.4" - "@esbuild/freebsd-arm64": "npm:0.21.4" - "@esbuild/freebsd-x64": "npm:0.21.4" - "@esbuild/linux-arm": "npm:0.21.4" - "@esbuild/linux-arm64": "npm:0.21.4" - "@esbuild/linux-ia32": "npm:0.21.4" - "@esbuild/linux-loong64": "npm:0.21.4" - "@esbuild/linux-mips64el": "npm:0.21.4" - "@esbuild/linux-ppc64": "npm:0.21.4" - "@esbuild/linux-riscv64": "npm:0.21.4" - "@esbuild/linux-s390x": "npm:0.21.4" - "@esbuild/linux-x64": "npm:0.21.4" - "@esbuild/netbsd-x64": "npm:0.21.4" - "@esbuild/openbsd-x64": "npm:0.21.4" - "@esbuild/sunos-x64": "npm:0.21.4" - "@esbuild/win32-arm64": "npm:0.21.4" - "@esbuild/win32-ia32": "npm:0.21.4" - "@esbuild/win32-x64": "npm:0.21.4" - dependenciesMeta: - "@esbuild/aix-ppc64": - optional: true - "@esbuild/android-arm": - optional: true - "@esbuild/android-arm64": - optional: true - "@esbuild/android-x64": - optional: true - "@esbuild/darwin-arm64": - optional: true - "@esbuild/darwin-x64": - optional: true - "@esbuild/freebsd-arm64": - optional: true - "@esbuild/freebsd-x64": - optional: true - "@esbuild/linux-arm": - optional: true - "@esbuild/linux-arm64": - optional: true - "@esbuild/linux-ia32": - optional: true - "@esbuild/linux-loong64": - optional: true - "@esbuild/linux-mips64el": - optional: true - "@esbuild/linux-ppc64": - optional: true - "@esbuild/linux-riscv64": - optional: true - "@esbuild/linux-s390x": - optional: true - "@esbuild/linux-x64": - optional: true - "@esbuild/netbsd-x64": - optional: true - "@esbuild/openbsd-x64": - optional: true - "@esbuild/sunos-x64": - optional: true - "@esbuild/win32-arm64": - optional: true - "@esbuild/win32-ia32": - optional: true - "@esbuild/win32-x64": - optional: true - bin: - esbuild: bin/esbuild - checksum: 10c0/83276c7b82bc3415199da91a84a01cf287d4912f2c02fead9c0542d6bda463d6d152cb7fb86f680dae72dc701c864a8963069ddb9e2b344948595cc87f81c4f1 - languageName: node - linkType: hard - "esbuild@npm:0.21.5, esbuild@npm:^0.21.3": version: 0.21.5 resolution: "esbuild@npm:0.21.5" @@ -11625,29 +11358,6 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:9.2.23": - version: 9.2.23 - resolution: "inquirer@npm:9.2.23" - dependencies: - "@inquirer/figures": "npm:^1.0.3" - "@ljharb/through": "npm:^2.3.13" - ansi-escapes: "npm:^4.3.2" - chalk: "npm:^5.3.0" - cli-cursor: "npm:^3.1.0" - cli-width: "npm:^4.1.0" - external-editor: "npm:^3.1.0" - lodash: "npm:^4.17.21" - mute-stream: "npm:1.0.0" - ora: "npm:^5.4.1" - run-async: "npm:^3.0.0" - rxjs: "npm:^7.8.1" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - wrap-ansi: "npm:^6.2.0" - checksum: 10c0/6adf3a6a9c666ff2baf3e8aef841f3ae266506cf0256ef445de5ec9a456aec8d6ff38180cc436ad3f9045cbb018d11dca98ed3570c28fbf8a857f1e4712eddc7 - languageName: node - linkType: hard - "internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" @@ -13114,41 +12824,6 @@ __metadata: languageName: node linkType: hard -"lmdb@npm:3.0.11": - version: 3.0.11 - resolution: "lmdb@npm:3.0.11" - dependencies: - "@lmdb/lmdb-darwin-arm64": "npm:3.0.11" - "@lmdb/lmdb-darwin-x64": "npm:3.0.11" - "@lmdb/lmdb-linux-arm": "npm:3.0.11" - "@lmdb/lmdb-linux-arm64": "npm:3.0.11" - "@lmdb/lmdb-linux-x64": "npm:3.0.11" - "@lmdb/lmdb-win32-x64": "npm:3.0.11" - msgpackr: "npm:^1.9.9" - node-addon-api: "npm:^6.1.0" - node-gyp: "npm:latest" - node-gyp-build-optional-packages: "npm:5.1.1" - ordered-binary: "npm:^1.4.1" - weak-lru-cache: "npm:^1.2.2" - dependenciesMeta: - "@lmdb/lmdb-darwin-arm64": - optional: true - "@lmdb/lmdb-darwin-x64": - optional: true - "@lmdb/lmdb-linux-arm": - optional: true - "@lmdb/lmdb-linux-arm64": - optional: true - "@lmdb/lmdb-linux-x64": - optional: true - "@lmdb/lmdb-win32-x64": - optional: true - bin: - download-lmdb-prebuilds: bin/download-prebuilds.js - checksum: 10c0/de71618214b67ce6233487765688650833c79b9f260150ff32665e375914f060dc763ceaa166396eb455e2fc9a7c57f9e467cd015d9766f5d4947db5a8c152db - languageName: node - linkType: hard - "lmdb@npm:3.0.12": version: 3.0.12 resolution: "lmdb@npm:3.0.12" @@ -13908,7 +13583,7 @@ __metadata: languageName: node linkType: hard -"msgpackr@npm:^1.10.2, msgpackr@npm:^1.9.9": +"msgpackr@npm:^1.10.2": version: 1.10.2 resolution: "msgpackr@npm:1.10.2" dependencies: @@ -13932,7 +13607,7 @@ __metadata: languageName: node linkType: hard -"mute-stream@npm:1.0.0, mute-stream@npm:^1.0.0": +"mute-stream@npm:^1.0.0": version: 1.0.0 resolution: "mute-stream@npm:1.0.0" checksum: 10c0/dce2a9ccda171ec979a3b4f869a102b1343dee35e920146776780de182f16eae459644d187e38d59a3d37adf85685e1c17c38cf7bfda7e39a9880f7a1d10a74c @@ -14148,19 +13823,6 @@ __metadata: languageName: node linkType: hard -"node-gyp-build-optional-packages@npm:5.1.1": - version: 5.1.1 - resolution: "node-gyp-build-optional-packages@npm:5.1.1" - dependencies: - detect-libc: "npm:^2.0.1" - bin: - node-gyp-build-optional-packages: bin.js - node-gyp-build-optional-packages-optional: optional.js - node-gyp-build-optional-packages-test: build-test.js - checksum: 10c0/f9fad2061c48fb0fc90831cd11d6a7670d731d22a5b00c7d3441b43b4003543299ff64ff2729afe2cefd7d14928e560d469336e5bb00f613932ec2cd56b3665b - languageName: node - linkType: hard - "node-gyp-build-optional-packages@npm:5.2.2": version: 5.2.2 resolution: "node-gyp-build-optional-packages@npm:5.2.2" @@ -14635,7 +14297,7 @@ __metadata: languageName: node linkType: hard -"ora@npm:5.4.1, ora@npm:^5.1.0, ora@npm:^5.4.1": +"ora@npm:5.4.1, ora@npm:^5.1.0": version: 5.4.1 resolution: "ora@npm:5.4.1" dependencies: @@ -16253,13 +15915,6 @@ __metadata: languageName: node linkType: hard -"run-async@npm:^3.0.0": - version: 3.0.0 - resolution: "run-async@npm:3.0.0" - checksum: 10c0/b18b562ae37c3020083dcaae29642e4cc360c824fbfb6b7d50d809a9d5227bb986152d09310255842c8dce40526e82ca768f02f00806c91ba92a8dfa6159cb85 - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -16369,16 +16024,16 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.77.4": - version: 1.77.4 - resolution: "sass@npm:1.77.4" +"sass@npm:1.77.5, sass@npm:^1.69.5": + version: 1.77.5 + resolution: "sass@npm:1.77.5" dependencies: chokidar: "npm:>=3.0.0 <4.0.0" immutable: "npm:^4.0.0" source-map-js: "npm:>=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 10c0/b9cb4882bded282aabe38d011adfce375e1f282184fcf93dc3da5d5be834c6aa53c474c15634c351ef7bd85146cfd1cc81343654cc3bcf000d78e856da4225ef + checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69 languageName: node linkType: hard @@ -16395,19 +16050,6 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.69.5": - version: 1.77.5 - resolution: "sass@npm:1.77.5" - dependencies: - chokidar: "npm:>=3.0.0 <4.0.0" - immutable: "npm:^4.0.0" - source-map-js: "npm:>=0.6.2 <2.0.0" - bin: - sass: sass.js - checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69 - languageName: node - linkType: hard - "saucelabs@npm:^1.5.0": version: 1.5.0 resolution: "saucelabs@npm:1.5.0" @@ -18522,9 +18164,9 @@ __metadata: languageName: node linkType: hard -"vite@npm:5.2.12": - version: 5.2.12 - resolution: "vite@npm:5.2.12" +"vite@npm:5.2.13": + version: 5.2.13 + resolution: "vite@npm:5.2.13" dependencies: esbuild: "npm:^0.20.1" fsevents: "npm:~2.3.3" @@ -18558,7 +18200,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/f03fdfc320adea3397df3e327029fd875f8220779f679ab183a3a994e8788b4ce531fee28f830361fb274f3cf08ed9adb9429496ecefdc3faf535b38da7ea8b1 + checksum: 10c0/f7a99da71884e69cc581dcfb43d73c8d56d73b9668d6980131603c544d6323c6003a20f376531dc0cfcf36bf5009bc465f89e6c5f8bd9d22868987aba4e4af1b languageName: node linkType: hard
f14b4f2bf61c384f4abdc5989f56d6cf0e4eea0f
2023-09-20 23:16:42
Alan Agius
ci: run all unit tests in CI
false
run all unit tests in CI
ci
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e322531e050d..593ac8596c05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,31 +90,19 @@ jobs: test: runs-on: ubuntu-latest - env: - defaultVersion: 16 - strategy: - matrix: - version: [18] steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - with: - persist-credentials: false - - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 + - name: Initialize environment + uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b57414124cf00fcbf1ecb190bdeb1a1396361424 with: - node-version: ${{ matrix.version }} - cache: 'yarn' - - name: Install node modules - run: yarn install --frozen-lockfile + fetch-depth: 1 - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@b57414124cf00fcbf1ecb190bdeb1a1396361424 - name: Setup Bazel RBE uses: angular/dev-infra/github-actions/bazel/configure-remote@b57414124cf00fcbf1ecb190bdeb1a1396361424 - - if: matrix.version == env.defaultVersion - name: Run tests for default node version - run: yarn bazel test --test_tag_filters=-node18,-node16-broken //packages/... - - if: matrix.version != env.defaultVersion - name: Run tests for non-default node version - run: yarn bazel test --test_tag_filters=node18,-node18-broken //packages/... + - name: Install node modules + run: yarn install --frozen-lockfile + - name: Run tests + run: yarn bazel test //packages/... e2e: strategy:
78cacc30e5fe2f3ca293bdfd2dae42dd178b86e8
2022-08-11 19:10:42
Alan Agius
refactor(@angular-devkit/build-angular): remove workaround for handle options requests
false
remove workaround for handle options requests
refactor
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts b/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts index 9135bd2aa9c4..9aa6c6a1910c 100644 --- a/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts +++ b/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts @@ -92,26 +92,6 @@ export async function getDevServerConfig( publicPath: servePath, stats: false, }, - setupMiddlewares: (middlewares, _devServer) => { - // Temporary workaround for https://github.com/webpack/webpack-dev-server/issues/4180 - middlewares.push({ - name: 'options-request-response', - path: '*', - middleware: (req: Request, res: Response, next: NextFunction) => { - if (req.method === 'OPTIONS') { - res.statusCode = 204; - res.setHeader('Content-Length', 0); - res.end(); - - return; - } - - next(); - }, - }); - - return middlewares; - }, liveReload, hot: hmr && !liveReload ? 'only' : hmr, proxy: await addProxyConfig(root, proxyConfig),
a3e3bb2524d51ca77c1f937ed6b1abca2ae6a4d7
2018-11-20 06:51:55
Alan Agius
docs: point root README to branch-relative links
false
point root README to branch-relative links
docs
diff --git a/.monorepo.json b/.monorepo.json index 9058b2a7f426..54a1f68eca58 100644 --- a/.monorepo.json +++ b/.monorepo.json @@ -19,7 +19,7 @@ { "label": "License", "image": "https://img.shields.io/npm/l/@angular/cli.svg", - "url": "https://github.com/angular/angular-cli/blob/master/LICENSE" + "url": "/LICENSE" } ], [ @@ -37,7 +37,7 @@ ], "links": { "Gitter": "https://gitter.im/angular/angular-cli", - "Contributing": "https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md", + "Contributing": "/CONTRIBUTING.md", "Angular CLI": "http://github.com/angular/angular-cli" }, "packages": { @@ -59,7 +59,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md" + "url": "/packages/angular/cli/README.md" } ], "version": "7.1.0-rc.0", @@ -78,7 +78,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md" + "url": "/packages/angular_devkit/architect/README.md" } ], "version": "0.11.0-rc.0", @@ -102,7 +102,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md" + "url": "/packages/angular_devkit/build_optimizer/README.md" } ], "version": "0.11.0-rc.0", @@ -114,7 +114,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md" + "url": "/packages/angular_devkit/build_ng_packagr/README.md" } ], "version": "0.11.0-rc.0", @@ -126,7 +126,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md" + "url": "/packages/angular_devkit/build_angular/README.md" } ], "version": "0.11.0-rc.0", @@ -138,7 +138,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md" + "url": "/packages/angular_devkit/build_webpack/README.md" } ], "version": "0.11.0-rc.0", @@ -150,7 +150,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md" + "url": "/packages/angular_devkit/core/README.md" } ], "version": "7.1.0-rc.0", @@ -162,7 +162,7 @@ "links": [ { "label": "README", - "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md" + "url": "/packages/angular_devkit/schematics/README.md" } ], "version": "7.1.0-rc.0", diff --git a/README.md b/README.md index f3606ec894ef..4e3a100311d1 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,14 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula [![CircleCI branch](https://img.shields.io/circleci/project/github/angular/angular-cli/master.svg?label=circleci)](https://circleci.com/gh/angular/angular-cli) [![Dependency Status](https://david-dm.org/angular/angular-cli.svg)](https://david-dm.org/angular/angular-cli) [![devDependency Status](https://david-dm.org/angular/angular-cli/dev-status.svg)](https://david-dm.org/angular/angular-cli?type=dev) -[![License](https://img.shields.io/npm/l/@angular/cli.svg)](https://github.com/angular/angular-cli/blob/master/LICENSE) +[![License](https://img.shields.io/npm/l/@angular/cli.svg)](/LICENSE) [![GitHub forks](https://img.shields.io/github/forks/angular/angular-cli.svg?style=social&label=Fork)](https://github.com/angular/angular-cli/fork) [![GitHub stars](https://img.shields.io/github/stars/angular/angular-cli.svg?style=social&label=Star)](https://github.com/angular/angular-cli) ### Quick Links -[Gitter](https://gitter.im/angular/angular-cli) | [Contributing](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) | +[Gitter](https://gitter.im/angular/angular-cli) | [Contributing](/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) | |---|---|---| ---- @@ -74,7 +74,7 @@ This is a monorepo which contains many tools and packages: | Project | Package | Version | Links | |---|---|---|---| -**Angular CLI** | [`@angular/cli`](https://npmjs.com/package/@angular/cli) | [![latest](https://img.shields.io/npm/v/%40angular%2Fcli/latest.svg)](https://npmjs.com/package/@angular/cli) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/cli-builds) +**Angular CLI** | [`@angular/cli`](https://npmjs.com/package/@angular/cli) | [![latest](https://img.shields.io/npm/v/%40angular%2Fcli/latest.svg)](https://npmjs.com/package/@angular/cli) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular/cli/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/cli-builds) **Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-cli-builds) @@ -83,14 +83,14 @@ This is a monorepo which contains many tools and packages: | Project | Package | Version | Links | |---|---|---|---| -**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds) +**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds) **Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-cli-builds) -**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds) -**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds) -**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds) -**Build Webpack** | [`@angular-devkit/build-webpack`](https://npmjs.com/package/@angular-devkit/build-webpack) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-webpack/latest.svg)](https://npmjs.com/package/@angular-devkit/build-webpack) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-webpack-builds) -**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-core-builds) -**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-builds) +**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds) +**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds) +**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds) +**Build Webpack** | [`@angular-devkit/build-webpack`](https://npmjs.com/package/@angular-devkit/build-webpack) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-webpack/latest.svg)](https://npmjs.com/package/@angular-devkit/build-webpack) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_webpack/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-webpack-builds) +**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/core/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-core-builds) +**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/schematics/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-builds) #### Schematics
fd512b821705de094e8aa8c9e44fa5c99aa007d0
2019-07-02 23:37:13
Hans Larsen
refactor: do not report errors if there is no errors to report
false
do not report errors if there is no errors to report
refactor
diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts index 147557f8dae3..509c8a1d18c0 100644 --- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts +++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts @@ -123,8 +123,11 @@ export class NgBuildAnalyticsPlugin { } protected _getDimensions(stats: Stats) { const dimensions: (string | number)[] = []; - // Adding commas before and after so the regex are easier to define. - dimensions[analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`; + + if (this._stats.errors.length) { + // Adding commas before and after so the regex are easier to define filters. + dimensions[analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`; + } return dimensions; }
ee86327167a0d70973409957ea9b9b06f8a0b730
2021-04-27 21:08:03
Charles Lyding
build: update prettier configuration and ignore files
false
update prettier configuration and ignore files
build
diff --git a/.prettierignore b/.prettierignore index fbcd212375a5..04975244c3e8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,9 @@ +/bazel-out/ +/dist-schema/ /etc/api +/tests/ +/README.md +/CONTRIBUTING.md +.yarn/ +dist/ +third_party/ \ No newline at end of file diff --git a/.prettierrc b/.prettierrc index 5e2863a11f68..8ef20e3c1ea0 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "printWidth": 100, + "quoteProps": "preserve", "singleQuote": true, "trailingComma": "all" }
2b0197f02ff80070b8bdaf2e145aa1661688514f
2022-06-04 00:23:22
Alan Agius
test: remove update tests for no longer LTS versions
false
remove update tests for no longer LTS versions
test
diff --git a/tests/legacy-cli/e2e/assets/10.0-project/karma.conf.js b/tests/legacy-cli/e2e/assets/10.0-project/karma.conf.js deleted file mode 100644 index 544af4666fa5..000000000000 --- a/tests/legacy-cli/e2e/assets/10.0-project/karma.conf.js +++ /dev/null @@ -1,32 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma'), - ], - client: { - clearContext: false, // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, './coverage/ten-project'), - reports: ['html', 'lcovonly', 'text-summary'], - fixWebpackSourcePaths: true, - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true, - }); -}; diff --git a/tests/legacy-cli/e2e/assets/10.0-project/package.json b/tests/legacy-cli/e2e/assets/10.0-project/package.json deleted file mode 100644 index bcee31fdf914..000000000000 --- a/tests/legacy-cli/e2e/assets/10.0-project/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "ten-project", - "version": "0.0.0", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "~10.2.5", - "@angular/common": "~10.2.5", - "@angular/compiler": "~10.2.5", - "@angular/core": "~10.2.5", - "@angular/forms": "~10.2.5", - "@angular/platform-browser": "~10.2.5", - "@angular/platform-browser-dynamic": "~10.2.5", - "@angular/router": "~10.2.5", - "rxjs": "~6.6.0", - "tslib": "^2.0.0", - "zone.js": "~0.10.2" - }, - "devDependencies": { - "@angular-devkit/build-angular": "~0.1002.4", - "@angular/cli": "~10.2.4", - "@angular/compiler-cli": "~10.2.5", - "@types/node": "^12.11.1", - "@types/jasmine": "~3.5.0", - "@types/jasminewd2": "~2.0.3", - "codelyzer": "^6.0.0", - "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~5.0.0", - "karma": "~5.0.0", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~3.0.2", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "~1.5.0", - "protractor": "~7.0.0", - "ts-node": "~8.3.0", - "tslint": "~6.1.0", - "typescript": "~4.0.2" - } -} diff --git a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.json b/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.json deleted file mode 100644 index f1830d0f877e..000000000000 --- a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.json +++ /dev/null @@ -1,17 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "compileOnSave": false, - "compilerOptions": { - "baseUrl": "./", - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "downlevelIteration": true, - "experimentalDecorators": true, - "moduleResolution": "node", - "importHelpers": true, - "target": "es2015", - "module": "es2020", - "lib": ["es2018", "dom"] - } -} diff --git a/tests/legacy-cli/e2e/assets/10.0-project/tslint.json b/tests/legacy-cli/e2e/assets/10.0-project/tslint.json deleted file mode 100644 index 66766f469253..000000000000 --- a/tests/legacy-cli/e2e/assets/10.0-project/tslint.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "extends": "tslint:recommended", - "rulesDirectory": ["codelyzer"], - "rules": { - "align": { - "options": ["parameters", "statements"] - }, - "array-type": false, - "arrow-return-shorthand": true, - "curly": true, - "deprecation": { - "severity": "warning" - }, - "eofline": true, - "import-spacing": true, - "indent": { - "options": ["spaces"] - }, - "max-classes-per-file": false, - "max-line-length": [true, 140], - "member-ordering": [ - true, - { - "order": ["static-field", "instance-field", "static-method", "instance-method"] - } - ], - "no-console": [true, "debug", "info", "time", "timeEnd", "trace"], - "no-empty": false, - "no-inferrable-types": [true, "ignore-params"], - "no-non-null-assertion": true, - "no-redundant-jsdoc": true, - "no-switch-case-fall-through": true, - "no-var-requires": false, - "object-literal-key-quotes": [true, "as-needed"], - "quotemark": [true, "single"], - "semicolon": { - "options": ["always"] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "typedef": [true, "call-signature"], - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "variable-name": { - "options": ["ban-keywords", "check-format", "allow-pascal-case"] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - }, - "component-class-suffix": true, - "contextual-lifecycle": true, - "directive-class-suffix": true, - "no-conflicting-lifecycle": true, - "no-host-metadata-property": true, - "no-input-rename": true, - "no-inputs-metadata-property": true, - "no-output-native": true, - "no-output-on-prefix": true, - "no-output-rename": true, - "no-outputs-metadata-property": true, - "template-banana-in-box": true, - "template-no-negated-async": true, - "use-lifecycle-interface": true, - "use-pipe-transform-interface": true, - "directive-selector": [true, "attribute", "app", "camelCase"], - "component-selector": [true, "element", "app", "kebab-case"] - } -} diff --git a/tests/legacy-cli/e2e/assets/10.0-project/.browserslistrc b/tests/legacy-cli/e2e/assets/12.0-project/.browserslistrc similarity index 82% rename from tests/legacy-cli/e2e/assets/10.0-project/.browserslistrc rename to tests/legacy-cli/e2e/assets/12.0-project/.browserslistrc index 0ccadaf32fba..427441dc9308 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/.browserslistrc +++ b/tests/legacy-cli/e2e/assets/12.0-project/.browserslistrc @@ -14,5 +14,4 @@ last 2 Edge major versions last 2 Safari major versions last 2 iOS major versions Firefox ESR -not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line. not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. diff --git a/tests/legacy-cli/e2e/assets/10.0-project/.editorconfig b/tests/legacy-cli/e2e/assets/12.0-project/.editorconfig similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/.editorconfig rename to tests/legacy-cli/e2e/assets/12.0-project/.editorconfig diff --git a/tests/legacy-cli/e2e/assets/10.0-project/.gitignore b/tests/legacy-cli/e2e/assets/12.0-project/.gitignore similarity index 95% rename from tests/legacy-cli/e2e/assets/10.0-project/.gitignore rename to tests/legacy-cli/e2e/assets/12.0-project/.gitignore index 86d943a9b2e8..de51f68a2cda 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/.gitignore +++ b/tests/legacy-cli/e2e/assets/12.0-project/.gitignore @@ -12,7 +12,6 @@ # profiling files chrome-profiler-events*.json -speed-measure-plugin*.json # IDEs and editors /.idea diff --git a/tests/legacy-cli/e2e/assets/10.0-project/README.md b/tests/legacy-cli/e2e/assets/12.0-project/README.md similarity index 78% rename from tests/legacy-cli/e2e/assets/10.0-project/README.md rename to tests/legacy-cli/e2e/assets/12.0-project/README.md index 36796dab3bff..e5ad9d504c52 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/README.md +++ b/tests/legacy-cli/e2e/assets/12.0-project/README.md @@ -1,6 +1,6 @@ -# TenProject +# TwelveProject -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.2.4. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.0.5. ## Development server @@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github. ## Running end-to-end tests -Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). +Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities. ## Further help diff --git a/tests/legacy-cli/e2e/assets/10.0-project/angular.json b/tests/legacy-cli/e2e/assets/12.0-project/angular.json similarity index 56% rename from tests/legacy-cli/e2e/assets/10.0-project/angular.json rename to tests/legacy-cli/e2e/assets/12.0-project/angular.json index 1c20732db6c7..7c5d8e218668 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/angular.json +++ b/tests/legacy-cli/e2e/assets/12.0-project/angular.json @@ -3,9 +3,13 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "ten-project": { + "twelve-project": { "projectType": "application", - "schematics": {}, + "schematics": { + "@schematics/angular:application": { + "strict": true + } + }, "root": "", "sourceRoot": "src", "prefix": "app", @@ -13,97 +17,102 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/ten-project", + "outputPath": "dist/twelve-project", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", - "aot": true, - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.css"], + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.css" + ], "scripts": [] }, "configurations": { "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, "budgets": [ { "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" + "maximumWarning": "500kb", + "maximumError": "1mb" }, { "type": "anyComponentStyle", - "maximumWarning": "6kb", - "maximumError": "10kb" + "maximumWarning": "2kb", + "maximumError": "4kb" + } + ], + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" } - ] + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true } - } + }, + "defaultConfiguration": "production" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "ten-project:build" - }, "configurations": { "production": { - "browserTarget": "ten-project:build:production" + "browserTarget": "twelve-project:build:production" + }, + "development": { + "browserTarget": "twelve-project:build:development" } - } + }, + "defaultConfiguration": "development" }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "ten-project:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.css"], - "scripts": [] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"], - "exclude": ["**/node_modules/**"] + "browserTarget": "twelve-project:build" } }, "e2e": { "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "ten-project:serve" + "devServerTarget": "twelve-project:serve" }, "configurations": { "production": { - "devServerTarget": "ten-project:serve:production" + "devServerTarget": "twelve-project:serve:production" } } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.css" + ], + "scripts": [] + } } } } }, - "defaultProject": "ten-project" + "defaultProject": "twelve-project" } diff --git a/tests/legacy-cli/e2e/assets/10.0-project/e2e/protractor.conf.js b/tests/legacy-cli/e2e/assets/12.0-project/e2e/protractor.conf.js similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/e2e/protractor.conf.js rename to tests/legacy-cli/e2e/assets/12.0-project/e2e/protractor.conf.js diff --git a/tests/legacy-cli/e2e/assets/10.0-project/e2e/src/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/12.0-project/e2e/src/app.e2e-spec.ts similarity index 81% rename from tests/legacy-cli/e2e/assets/10.0-project/e2e/src/app.e2e-spec.ts rename to tests/legacy-cli/e2e/assets/12.0-project/e2e/src/app.e2e-spec.ts index e41670e502c2..2c278bbb44db 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/e2e/src/app.e2e-spec.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/e2e/src/app.e2e-spec.ts @@ -8,9 +8,9 @@ describe('workspace-project App', () => { page = new AppPage(); }); - it('should display welcome message', () => { + it('should display welcome message', async () => { page.navigateTo(); - expect(page.getTitleText()).toEqual('ten-project app is running!'); + expect(await page.getTitleText()).toMatch(/app is running/); }); afterEach(async () => { diff --git a/tests/legacy-cli/e2e/assets/10.0-project/e2e/src/app.po.ts b/tests/legacy-cli/e2e/assets/12.0-project/e2e/src/app.po.ts similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/e2e/src/app.po.ts rename to tests/legacy-cli/e2e/assets/12.0-project/e2e/src/app.po.ts diff --git a/tests/legacy-cli/e2e/assets/10.0-project/e2e/tsconfig.json b/tests/legacy-cli/e2e/assets/12.0-project/e2e/tsconfig.json similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/e2e/tsconfig.json rename to tests/legacy-cli/e2e/assets/12.0-project/e2e/tsconfig.json diff --git a/tests/legacy-cli/e2e/assets/12.0-project/karma.conf.js b/tests/legacy-cli/e2e/assets/12.0-project/karma.conf.js new file mode 100644 index 000000000000..23f103f11d79 --- /dev/null +++ b/tests/legacy-cli/e2e/assets/12.0-project/karma.conf.js @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, './coverage/twelve-project'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' } + ] + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false, + restartOnFileChange: true + }); +}; diff --git a/tests/legacy-cli/e2e/assets/12.0-project/package.json b/tests/legacy-cli/e2e/assets/12.0-project/package.json new file mode 100644 index 000000000000..086bb4308355 --- /dev/null +++ b/tests/legacy-cli/e2e/assets/12.0-project/package.json @@ -0,0 +1,43 @@ +{ + "name": "twelve-project", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "watch": "ng build --watch --configuration development", + "test": "ng test" + }, + "private": true, + "dependencies": { + "@angular/animations": "~12.0.5", + "@angular/common": "~12.0.5", + "@angular/compiler": "~12.0.5", + "@angular/core": "~12.0.5", + "@angular/forms": "~12.0.5", + "@angular/platform-browser": "~12.0.5", + "@angular/platform-browser-dynamic": "~12.0.5", + "@angular/router": "~12.0.5", + "rxjs": "~6.6.0", + "tslib": "^2.1.0", + "zone.js": "~0.11.4" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~12.0.5", + "@angular/cli": "~12.0.5", + "@angular/compiler-cli": "~12.0.5", + "@types/node": "^12.11.1", + "@types/jasmine": "~3.6.0", + "jasmine-core": "~3.7.0", + "jasmine-spec-reporter": "~7.0.0", + "karma": "~6.3.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage": "~2.2.0", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "~1.5.0", + "protractor": "~7.0.0", + "ts-node": "~8.3.0", + "tslint": "~6.1.0", + "typescript": "~4.2.3" + } +} diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app-routing.module.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app-routing.module.ts similarity index 52% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app-routing.module.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app-routing.module.ts index 11c2e84079ec..02972627f8df 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app-routing.module.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app-routing.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = []; @NgModule({ imports: [RouterModule.forRoot(routes)], - exports: [RouterModule], + exports: [RouterModule] }) -export class AppRoutingModule {} +export class AppRoutingModule { } diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.css b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.css similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.css rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.css diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.html b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.html similarity index 81% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.html rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.html index e48d8c109d66..a751c67c5f2d 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.html +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.html @@ -52,11 +52,17 @@ } .toolbar #twitter-logo { + height: 40px; + margin: 0 8px; + } + + .toolbar #youtube-logo { height: 40px; margin: 0 16px; } - .toolbar #twitter-logo:hover { + .toolbar #twitter-logo:hover, + .toolbar #youtube-logo:hover { opacity: 0.8; } @@ -313,6 +319,12 @@ <path d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23" fill="#fff"/> </svg> </a> + <a aria-label="Angular on YouTube" target="_blank" rel="noopener" href="https://youtube.com/angular" title="YouTube"> + <svg id="youtube-logo" height="24" width="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#fff"> + <path d="M0 0h24v24H0V0z" fill="none"/> + <path d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"/> + </svg> + </a> </div> <div class="content" role="main"> @@ -320,7 +332,8 @@ <!-- Highlight Card --> <div class="card highlight-card card-small"> - <svg id="rocket" alt="Rocket Ship" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678"> + <svg id="rocket" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678"> + <title>Rocket Ship</title> <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)"> <circle id="Ellipse_8" data-name="Ellipse 8" cx="50.839" cy="50.839" r="50.839" transform="translate(141 696)" fill="#dd0031"/> <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)"> @@ -332,7 +345,8 @@ <span>{{ title }} app is running!</span> - <svg id="rocket-smoke" alt="Rocket Ship Smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632"> + <svg id="rocket-smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632"> + <title>Rocket Ship Smoke</title> <path id="Path_40" data-name="Path 40" d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z" transform="translate(-147.025 -140.939)" fill="#f5f5f5"/> </svg> @@ -419,7 +433,7 @@ <h2>Next Steps</h2> <pre *ngSwitchCase="'pwa'">ng add @angular/pwa</pre> <pre *ngSwitchCase="'dependency'">ng add _____</pre> <pre *ngSwitchCase="'test'">ng test</pre> - <pre *ngSwitchCase="'build'">ng build --prod</pre> + <pre *ngSwitchCase="'build'">ng build</pre> </div> <!-- Links --> @@ -435,7 +449,8 @@ <h2>Next Steps</h2> </a> <a class="circle-link" title="CLI" href="https://cli.angular.io/" target="_blank" rel="noopener"> - <svg alt="Angular CLI Logo" xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447"> + <svg xmlns="http://www.w3.org/2000/svg" width="21.762" height="23.447" viewBox="0 0 21.762 23.447"> + <title>Angular CLI Logo</title> <g id="Group_21" data-name="Group 21" transform="translate(0)"> <path id="Path_20" data-name="Path 20" d="M2660.313,313.618h0l-10.833,3.9,1.637,14.4,9.2,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-2649.48 -313.618)" fill="#37474f"/> <path id="Path_21" data-name="Path 21" d="M2741.883,313.618v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-2731.05 -313.618)" fill="#263238"/> @@ -446,57 +461,18 @@ <h2>Next Steps</h2> </svg> </a> - <a class="circle-link" title="Augury" href="https://augury.rangle.io/" target="_blank" rel="noopener"> - <svg alt="Angular Augury Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21.81" height="23.447" viewBox="0 0 21.81 23.447"> - <defs> - <clipPath id="clip-path"> - <rect id="Rectangle_13" data-name="Rectangle 13" width="10.338" height="10.27" fill="none"/> - </clipPath> - </defs> - <g id="Group_25" data-name="Group 25" transform="translate(0)"> - <path id="Path_24" data-name="Path 24" d="M3780.155,311.417h0l-10.881,3.9,1.637,14.4,9.244,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-3769.274 -311.417)" fill="#4a3493"/> - <path id="Path_25" data-name="Path 25" d="M3862.088,311.417v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-3851.207 -311.417)" fill="#311b92"/> - <g id="Group_24" data-name="Group 24" transform="translate(6.194 6.73)" opacity="0.5"> - <g id="Group_23" data-name="Group 23" transform="translate(0 0)"> - <g id="Group_22" data-name="Group 22" clip-path="url(#clip-path)"> - <path id="Path_26" data-name="Path 26" d="M3832.4,373.252a5.168,5.168,0,1,1-5.828-4.383,5.216,5.216,0,0,1,2.574.3,3.017,3.017,0,1,0,3.252,4.086Z" transform="translate(-3822.107 -368.821)" fill="#fff"/> - </g> - </g> - </g> - <path id="Path_27" data-name="Path 27" d="M3830.582,370.848a5.162,5.162,0,1,1-3.254-4.086,3.017,3.017,0,1,0,3.252,4.086Z" transform="translate(-3814.311 -359.969)" fill="#fff"/> - </g> - </svg> - </a> - - <a class="circle-link" title="Protractor" href="https://www.protractortest.org/" target="_blank" rel="noopener"> - <svg alt="Angular Protractor Logo" xmlns="http://www.w3.org/2000/svg" width="21.81" height="23.447" viewBox="0 0 21.81 23.447"> - <g id="Group_26" data-name="Group 26" transform="translate(0)"> - <path id="Path_28" data-name="Path 28" d="M4620.155,311.417h0l-10.881,3.9,1.637,14.4,9.244,5.152,9.244-5.152,1.685-14.4Z" transform="translate(-4609.274 -311.417)" fill="#e13439"/> - <path id="Path_29" data-name="Path 29" d="M4702.088,311.417v23.447l9.244-5.152,1.685-14.4Z" transform="translate(-4691.207 -311.417)" fill="#b52f32"/> - <path id="Path_30" data-name="Path 30" d="M4651.044,369.58v-.421h1.483a7.6,7.6,0,0,0-2.106-5.052l-1.123,1.123-.3-.3,1.122-1.121a7.588,7.588,0,0,0-4.946-2.055v1.482h-.421v-1.485a7.589,7.589,0,0,0-5.051,2.058l1.122,1.121-.3.3-1.123-1.123a7.591,7.591,0,0,0-2.106,5.052h1.482v.421h-1.489v1.734h15.241V369.58Zm-10.966-.263a4.835,4.835,0,0,1,9.67,0Z" transform="translate(-4634.008 -355.852)" fill="#fff"/> - </g> - </svg> - </a> - <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener"> - <svg alt="Meetup Logo" xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447"> + <svg xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447"> + <title>Meetup Logo</title> <path id="logo--mSwarm" d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z" transform="translate(0 0.123)" fill="#f64060"/> </svg> </a> - <a class="circle-link" title="Join the Conversation on Gitter" href="https://gitter.im/angular/angular" target="_blank" rel="noopener"> - <svg alt="Gitter Logo" xmlns="http://www.w3.org/2000/svg" width="19.447" height="19.447" viewBox="0 0 19.447 19.447"> - <g id="Group_40" data-name="Group 40" transform="translate(-1612 -405)"> - <rect id="Rectangle_19" data-name="Rectangle 19" width="19.447" height="19.447" transform="translate(1612 405)" fill="#e60257"/> - <g id="gitter" transform="translate(1617.795 408.636)"> - <g id="Group_33" data-name="Group 33" transform="translate(0 0)"> - <rect id="Rectangle_15" data-name="Rectangle 15" width="1.04" height="9.601" transform="translate(2.304 2.324)" fill="#fff"/> - <rect id="Rectangle_16" data-name="Rectangle 16" width="1.04" height="9.601" transform="translate(4.607 2.324)" fill="#fff"/> - <rect id="Rectangle_17" data-name="Rectangle 17" width="1.04" height="4.648" transform="translate(6.91 2.324)" fill="#fff"/> - <rect id="Rectangle_18" data-name="Rectangle 18" width="1.04" height="6.971" transform="translate(0 0)" fill="#fff"/> - </g> - </g> - </g> + <a class="circle-link" title="Join the Conversation on Discord" href="https://discord.gg/angular" target="_blank" rel="noopener"> + <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240"> + <title>Discord Logo</title> + <path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/> + <path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/> </svg> </a> </div> @@ -515,7 +491,8 @@ <h2>Next Steps</h2> </a> </footer> - <svg id="clouds" alt="Gray Clouds Background" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677"> + <svg id="clouds" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677"> + <title>Gray Clouds Background</title> <path id="Path_39" data-name="Path 39" d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z" transform="translate(142.69 -634.312)" fill="#eee"/> </svg> @@ -529,6 +506,4 @@ <h2>Next Steps</h2> <!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * --> <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * --> - - -<router-outlet></router-outlet> \ No newline at end of file +<router-outlet></router-outlet> diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.spec.ts similarity index 76% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.spec.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.spec.ts index bdea908638d1..c7060eb77ad5 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.spec.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.spec.ts @@ -5,8 +5,12 @@ import { AppComponent } from './app.component'; describe('AppComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [RouterTestingModule], - declarations: [AppComponent], + imports: [ + RouterTestingModule + ], + declarations: [ + AppComponent + ], }).compileComponents(); }); @@ -16,18 +20,16 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have as title 'ten-project'`, () => { + it(`should have as title 'twelve-project'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance; - expect(app.title).toEqual('ten-project'); + expect(app.title).toEqual('twelve-project'); }); it('should render title', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.nativeElement; - expect(compiled.querySelector('.content span').textContent).toContain( - 'ten-project app is running!', - ); + expect(compiled.querySelector('.content span').textContent).toContain('twelve-project app is running!'); }); }); diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.ts similarity index 70% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.ts index cb054a486094..2e27024b0e44 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.component.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.component.ts @@ -3,8 +3,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.css'], + styleUrls: ['./app.component.css'] }) export class AppComponent { - title = 'ten-project'; + title = 'twelve-project'; } diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.module.ts similarity index 61% rename from tests/legacy-cli/e2e/assets/10.0-project/src/app/app.module.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/app/app.module.ts index 4fac0768bbb2..b1c6c96a9de8 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/app/app.module.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/app/app.module.ts @@ -1,13 +1,18 @@ -import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @NgModule({ - declarations: [AppComponent], - imports: [BrowserModule, AppRoutingModule], + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + AppRoutingModule + ], providers: [], - bootstrap: [AppComponent], + bootstrap: [AppComponent] }) -export class AppModule {} +export class AppModule { } diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/assets/.gitkeep b/tests/legacy-cli/e2e/assets/12.0-project/src/assets/.gitkeep similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/src/assets/.gitkeep rename to tests/legacy-cli/e2e/assets/12.0-project/src/assets/.gitkeep diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.prod.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.prod.ts similarity index 61% rename from tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.prod.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.prod.ts index c9669790be17..3612073bc31c 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.prod.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.prod.ts @@ -1,3 +1,3 @@ export const environment = { - production: true, + production: true }; diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.ts similarity index 75% rename from tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.ts index 99c3763cad6f..f56ff47022c7 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/environments/environment.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/environments/environment.ts @@ -1,9 +1,9 @@ // This file can be replaced during build by using the `fileReplacements` array. -// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. +// `ng build` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. export const environment = { - production: false, + production: false }; /* @@ -13,4 +13,4 @@ export const environment = { * This import should be commented out in production mode because it will have a negative impact * on performance if an error is thrown. */ -// import 'zone.js/dist/zone-error'; // Included with Angular CLI. +// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/favicon.ico b/tests/legacy-cli/e2e/assets/12.0-project/src/favicon.ico similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/src/favicon.ico rename to tests/legacy-cli/e2e/assets/12.0-project/src/favicon.ico diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/index.html b/tests/legacy-cli/e2e/assets/12.0-project/src/index.html similarity index 89% rename from tests/legacy-cli/e2e/assets/10.0-project/src/index.html rename to tests/legacy-cli/e2e/assets/12.0-project/src/index.html index 6024d63f0f9b..23fb2840679d 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/index.html +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/index.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>TenProject</title> + <title>TwelveProject</title> <base href="/"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/x-icon" href="favicon.ico"> diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/main.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/main.ts similarity index 75% rename from tests/legacy-cli/e2e/assets/10.0-project/src/main.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/main.ts index d9a2e7e4a582..c7b673cf44b3 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/main.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/main.ts @@ -8,6 +8,5 @@ if (environment.production) { enableProdMode(); } -platformBrowserDynamic() - .bootstrapModule(AppModule) - .catch((err) => console.error(err)); +platformBrowserDynamic().bootstrapModule(AppModule) + .catch(err => console.error(err)); diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/polyfills.ts similarity index 97% rename from tests/legacy-cli/e2e/assets/10.0-project/src/polyfills.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/polyfills.ts index 5812bad0d42e..373f538a7197 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/polyfills.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/polyfills.ts @@ -57,7 +57,8 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js'; // Included with Angular CLI. + /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/styles.css b/tests/legacy-cli/e2e/assets/12.0-project/src/styles.css similarity index 100% rename from tests/legacy-cli/e2e/assets/10.0-project/src/styles.css rename to tests/legacy-cli/e2e/assets/12.0-project/src/styles.css diff --git a/tests/legacy-cli/e2e/assets/10.0-project/src/test.ts b/tests/legacy-cli/e2e/assets/12.0-project/src/test.ts similarity index 64% rename from tests/legacy-cli/e2e/assets/10.0-project/src/test.ts rename to tests/legacy-cli/e2e/assets/12.0-project/src/test.ts index 045d6b4a8c19..2042356408ff 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/src/test.ts +++ b/tests/legacy-cli/e2e/assets/12.0-project/src/test.ts @@ -1,26 +1,25 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/zone-testing'; +import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, - platformBrowserDynamicTesting, + platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: { - context( - path: string, - deep?: boolean, - filter?: RegExp, - ): { + context(path: string, deep?: boolean, filter?: RegExp): { keys(): string[]; <T>(id: string): T; }; }; // First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. -context.keys().forEach(context); +context.keys().map(context); diff --git a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.app.json b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.app.json similarity index 65% rename from tests/legacy-cli/e2e/assets/10.0-project/tsconfig.app.json rename to tests/legacy-cli/e2e/assets/12.0-project/tsconfig.app.json index ff396d4ce2d8..82d91dc4a4de 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.app.json +++ b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.app.json @@ -5,6 +5,11 @@ "outDir": "./out-tsc/app", "types": [] }, - "files": ["src/main.ts", "src/polyfills.ts"], - "include": ["src/**/*.d.ts"] + "files": [ + "src/main.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" + ] } diff --git a/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.json b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.json new file mode 100644 index 000000000000..6df828326e3f --- /dev/null +++ b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.json @@ -0,0 +1,30 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "sourceMap": true, + "declaration": false, + "downlevelIteration": true, + "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, + "target": "es2017", + "module": "es2020", + "lib": [ + "es2018", + "dom" + ] + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + } +} diff --git a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.spec.json similarity index 51% rename from tests/legacy-cli/e2e/assets/10.0-project/tsconfig.spec.json rename to tests/legacy-cli/e2e/assets/12.0-project/tsconfig.spec.json index 669344f8d2b7..092345b02e80 100644 --- a/tests/legacy-cli/e2e/assets/10.0-project/tsconfig.spec.json +++ b/tests/legacy-cli/e2e/assets/12.0-project/tsconfig.spec.json @@ -3,8 +3,16 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "types": ["jasmine"] + "types": [ + "jasmine" + ] }, - "files": ["src/test.ts", "src/polyfills.ts"], - "include": ["src/**/*.spec.ts", "src/**/*.d.ts"] + "files": [ + "src/test.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] } diff --git a/tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts b/tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts index 5123af8ed506..afae2e771fb2 100644 --- a/tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts +++ b/tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts @@ -6,7 +6,7 @@ import { expectToFail } from '../../utils/utils'; export default async function () { try { - await createProjectFromAsset('10.0-project', true, true); + await createProjectFromAsset('12.0-project', true, true); await setRegistry(false); await installWorkspacePackages(); await setRegistry(true); @@ -16,12 +16,12 @@ export default async function () { extraArgs.push('--next'); } - // Update Angular from v10 to 11 + // Update Angular from v12 to 13 const { stdout } = await ng('update', ...extraArgs); - if (!/@angular\/core\s+10\.\d\.\d+ -> 11\.\d\.\d+\s+ng update @angular\/core@11/.test(stdout)) { - // @angular/core 10.x.x -> 11.x.x ng update @angular/core@11 + if (!/@angular\/core\s+12\.\d\.\d+ -> 13\.\d\.\d+\s+ng update @angular\/core@13/.test(stdout)) { + // @angular/core 12.x.x -> 13.x.x ng update @angular/core@13 throw new Error( - `Output didn't match "@angular/core 10.x.x -> 11.x.x ng update @angular/core@11". OUTPUT: \n` + + `Output didn't match "@angular/core 12.x.x -> 13.x.x ng update @angular/core@13". OUTPUT: \n` + stdout, ); } diff --git a/tests/legacy-cli/e2e/tests/update/update-10.ts b/tests/legacy-cli/e2e/tests/update/update.ts similarity index 95% rename from tests/legacy-cli/e2e/tests/update/update-10.ts rename to tests/legacy-cli/e2e/tests/update/update.ts index 016f9676e049..25812d3045a5 100644 --- a/tests/legacy-cli/e2e/tests/update/update-10.ts +++ b/tests/legacy-cli/e2e/tests/update/update.ts @@ -11,7 +11,7 @@ export default async function () { // We need to use the public registry because in the local NPM server we don't have // older versions @angular/cli packages which would cause `npm install` during `ng update` to fail. await setRegistry(false); - await createProjectFromAsset('10.0-project', true); + await createProjectFromAsset('12.0-project', true); // If using npm, enable legacy peer deps mode to avoid defects in npm 7+'s peer dependency resolution // Example error where 11.2.14 satisfies the SemVer range ^11.0.0 but still fails: @@ -73,15 +73,16 @@ export default async function () { // Setup testing to use CI Chrome. await useCIChrome('./'); await useCIChrome('./e2e/'); - await useCIDefaults('ten-project'); + await useCIDefaults('twelve-project'); // Run CLI commands. await ng('generate', 'component', 'my-comp'); await ng('test', '--watch=false'); + await ng('e2e'); await ng('e2e', '--configuration=production'); // Verify project now creates bundles await noSilentNg('build', '--configuration=production'); - await expectFileMatchToExist('dist/ten-project/', /main\.[0-9a-f]{16}\.js/); + await expectFileMatchToExist('dist/twelve-project/', /main\.[0-9a-f]{16}\.js/); }
a7e91954dc6f39d34f0a8d61a817b2031dc5700e
2020-06-17 10:46:41
renovate[bot]
build: update puppeteer to version ~4.0.0 (#1734)
false
update puppeteer to version ~4.0.0 (#1734)
build
diff --git a/package.json b/package.json index e437898679e2..88da99b3c7a1 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "minimatch": "^3.0.4", "node-fetch": "^2.2.0", "protractor": "7.0.0", - "puppeteer": "~3.3.0", + "puppeteer": "~4.0.0", "rollup": "~2.16.0", "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-node-resolve": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index 8e13643dc9e2..1fb99c18e20f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6612,6 +6612,11 @@ mitt@^1.1.3: resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d" integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw== +mitt@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.0.1.tgz#9e8a075b4daae82dd91aac155a0ece40ca7cb393" + integrity sha512-FhuJY+tYHLnPcBHQhbUFzscD5512HumCPE4URXZUgPi3IvOJi4Xva5IIgy3xX56GqCmw++MAm5UURG6kDBYTdg== + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -8072,15 +8077,16 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -puppeteer@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7" - integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw== +puppeteer@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-4.0.0.tgz#96d647c3546119f8e670493bcebf9ddb044a2367" + integrity sha512-yNshT0M5DWfZ8DQoduZuGYpcwqXxKOZdgt5G0IF5VEKbydaDbWP/f5pQRfzQ4e+a4w0Rge3uzcogHeUPQM8nCA== dependencies: debug "^4.1.0" extract-zip "^2.0.0" https-proxy-agent "^4.0.0" mime "^2.0.3" + mitt "^2.0.1" progress "^2.0.1" proxy-from-env "^1.0.0" rimraf "^3.0.2"
7424b2efb1de24c2261e22cfeaadac7d1fed5cc9
2019-10-28 00:38:53
Charles Lyding
fix(@schematics/update): include prerelease peer dependencies with next option
false
include prerelease peer dependencies with next option
fix
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts index e5eeb1407deb..cb989c7d2c96 100644 --- a/packages/schematics/update/update/index.ts +++ b/packages/schematics/update/update/index.ts @@ -114,6 +114,7 @@ function _validateForwardPeerDependencies( infoMap: Map<string, PackageInfo>, peers: {[name: string]: string}, logger: logging.LoggerApi, + next: boolean, ): boolean { for (const [peer, range] of Object.entries(peers)) { logger.debug(`Checking forward peer ${peer}...`); @@ -132,7 +133,7 @@ function _validateForwardPeerDependencies( : maybePeerInfo.installed.version; logger.debug(` Range intersects(${range}, ${peerVersion})...`); - if (!semver.satisfies(peerVersion, range)) { + if (!semver.satisfies(peerVersion, range, { includePrerelease: next || undefined })) { logger.error([ `Package ${JSON.stringify(name)} has an incompatible peer dependency to`, `${JSON.stringify(peer)} (requires ${JSON.stringify(range)},`, @@ -152,6 +153,7 @@ function _validateReversePeerDependencies( version: string, infoMap: Map<string, PackageInfo>, logger: logging.LoggerApi, + next: boolean, ) { for (const [installed, installedInfo] of infoMap.entries()) { const installedLogger = logger.createChild(installed); @@ -168,7 +170,7 @@ function _validateReversePeerDependencies( // Override the peer version range if it's whitelisted. const extendedRange = _updatePeerVersion(infoMap, peer, range); - if (!semver.satisfies(version, extendedRange)) { + if (!semver.satisfies(version, extendedRange, { includePrerelease: next || undefined })) { logger.error([ `Package ${JSON.stringify(installed)} has an incompatible peer dependency to`, `${JSON.stringify(name)} (requires`, @@ -187,6 +189,7 @@ function _validateReversePeerDependencies( function _validateUpdatePackages( infoMap: Map<string, PackageInfo>, force: boolean, + next: boolean, logger: logging.LoggerApi, ): void { logger.debug('Updating the following packages:'); @@ -207,9 +210,9 @@ function _validateUpdatePackages( logger.debug(`${name}...`); const peers = target.packageJson.peerDependencies || {}; - peerErrors = _validateForwardPeerDependencies(name, infoMap, peers, pkgLogger) || peerErrors; + peerErrors = _validateForwardPeerDependencies(name, infoMap, peers, pkgLogger, next) || peerErrors; peerErrors - = _validateReversePeerDependencies(name, target.version, infoMap, pkgLogger) + = _validateReversePeerDependencies(name, target.version, infoMap, pkgLogger, next) || peerErrors; }); @@ -923,7 +926,7 @@ export default function(options: UpdateSchema): Rule { logger.createChild(''), 'warn', ); - _validateUpdatePackages(infoMap, !!options.force, sublog); + _validateUpdatePackages(infoMap, !!options.force, !!options.next, sublog); return _performUpdate(tree, context, infoMap, logger, !!options.migrateOnly, !!options.migrateExternal); } else {
9428493719c67674f94ffa7e82e51f64fa61ef3b
2019-12-18 15:25:09
Renovate Bot
build: update concurrently to version 5.0.2
false
update concurrently to version 5.0.2
build
diff --git a/integration/common/package.json b/integration/common/package.json index 7a373a76192f..ca3f97fd604c 100644 --- a/integration/common/package.json +++ b/integration/common/package.json @@ -29,7 +29,7 @@ "babel-core": "^6.23.1", "babel-loader": "^6.4.0", "babel-preset-es2015": "^6.22.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "protractor": "file:../../node_modules/protractor", "raw-loader": "^0.5.1", "webpack": "^2.2.1" diff --git a/integration/express-engine-ivy-prerender/package.json b/integration/express-engine-ivy-prerender/package.json index 90fd353a5c42..9f640ad1f321 100644 --- a/integration/express-engine-ivy-prerender/package.json +++ b/integration/express-engine-ivy-prerender/package.json @@ -45,7 +45,7 @@ "@types/jasmine": "file:../../node_modules/@types/jasmine", "@nguniversal/builders": "file:../../dist/modules-dist/builders", "codelyzer": "5.2.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "jasmine-core": "3.5.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.4.1", diff --git a/integration/express-engine-ivy/package.json b/integration/express-engine-ivy/package.json index 4c0815bcd008..ad6ace8adffa 100644 --- a/integration/express-engine-ivy/package.json +++ b/integration/express-engine-ivy/package.json @@ -43,7 +43,7 @@ "@types/jasmine": "file:../../node_modules/@types/jasmine", "@nguniversal/builders": "file:../../dist/modules-dist/builders", "codelyzer": "5.2.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "jasmine-core": "3.5.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.4.1", diff --git a/integration/express-engine-ve/package.json b/integration/express-engine-ve/package.json index 859085b474ec..a3f59bd13f55 100644 --- a/integration/express-engine-ve/package.json +++ b/integration/express-engine-ve/package.json @@ -43,7 +43,7 @@ "@types/jasmine": "file:../../node_modules/@types/jasmine", "@nguniversal/builders": "file:../../dist/modules-dist/builders", "codelyzer": "5.2.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "jasmine-core": "3.5.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.4.1", diff --git a/integration/hapi-engine-ivy/package.json b/integration/hapi-engine-ivy/package.json index 6874a99fed18..139c0b9c6559 100644 --- a/integration/hapi-engine-ivy/package.json +++ b/integration/hapi-engine-ivy/package.json @@ -45,7 +45,7 @@ "@types/jasmine": "file:../../node_modules/@types/jasmine", "@nguniversal/builders": "file:../../dist/modules-dist/builders", "codelyzer": "5.2.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "jasmine-core": "3.5.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.4.1", diff --git a/integration/hapi-engine-ve/package.json b/integration/hapi-engine-ve/package.json index 5e2e9a722f29..d1d85b396622 100644 --- a/integration/hapi-engine-ve/package.json +++ b/integration/hapi-engine-ve/package.json @@ -45,7 +45,7 @@ "@types/jasmine": "file:../../node_modules/@types/jasmine", "@nguniversal/builders": "file:../../dist/modules-dist/builders", "codelyzer": "5.2.0", - "concurrently": "5.0.1", + "concurrently": "5.0.2", "jasmine-core": "3.5.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.4.1",
dd6133178c0deee4da216bd6d2ec1a3865d30527
2018-06-04 07:03:42
Fabian Wiles
docs: refactor READMEs (#1006)
false
refactor READMEs (#1006)
docs
diff --git a/README.md b/README.md index 1b99d89b6628..b53fb3e70afd 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,17 @@ [![Join the chat at https://gitter.im/angular/universal](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/universal?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) # Angular Universal -> Universal (isomorphic) JavaScript support for Angular. +![Angular Universal](https://angular.io/assets/images/logos/concept-icons/universal.png) # Table of Contents * [Introduction](#introduction) -* [Packages](#packages) -* [Upgrading from Angular2-Universal](#upgrading-from-angular2-universal) -* [Roadmap](#roadmap) * [Getting Started with Universal](#getting-started) * w/ NodeJS Server * w/ ASP.NET Core Server +* [Packages](#packages) * [Universal "Gotchas"](#universal-gotchas) +* [Roadmap](#roadmap) +* [Upgrading from Angular2-Universal](#upgrading-from-angular2-universal) * [Preboot](#preboot) * [What's in a name?](#whats-in-a-name) * [Universal Team](#universal-team) @@ -21,24 +21,33 @@ --- # Introduction -The Angular Universal project consists of the base platform API and the surrounding tools that enables developer to do server side rendering (or pre-rendering) of Angular applications. The platform API part has been merged into Angular core as of 4.0. +The Angular Universal project is a community driven project to expand on the core APIs from Angular (platform-server) to enable developers to do server side rendering of Angular applications in a variety of scenarios. This repository will host the various tools like engines to integrate with various backends(NodeJS, ASP.NET etc.) and also extra modules and examples to help you started with server side rendering. -# Packages -The packages from this repo are published as scoped packages under [@nguniversal](https://www.npmjs.com/search?q=%40nguniversal) +The Universal project is driven by community contributions. Please send us your Pull Requests! + +# Getting Started -- [@nguniversal/express-engine](https://github.com/angular/universal/blob/master/modules/express-engine/README.md) -- [@nguniversal/aspnetcore-engine](https://github.com/angular/universal/blob/master/modules/aspnetcore-engine/README.md) -- [@nguniversal/hapi-engine](https://github.com/angular/universal/blob/master/modules/hapi-engine/README.md) -- [@nguniversal/module-map-ngfactory-loader](https://github.com/angular/universal/tree/master/modules/module-map-ngfactory-loader) (for handling lazy loaded modules on the server). +[* **NodeJS** :: Example repo](https://github.com/angular/universal-starter) + - Minimal universal example -# Upgrading from Angular2-Universal -> If you're coming from the original `angular2-universal` (2.x) here are some helpful steps for porting your application to Angular 4 & platform-server. +[* ASP.NET Core :: Universal Starter repo](https://github.com/MarkPieszak/aspnetcore-angular2-universal) + - **Installation**: Clone the above repo, `npm i && dotnet restore` *(VStudio will run these automatically when opening the project)* + - Launch files included for both VSCode & VStudio to run/debug automatically (press F5). + + +# Packages +The packages from this repo are published as scoped packages under [@nguniversal](https://www.npmjs.com/search?q=%40nguniversal) -[Go here to find the guide](https://github.com/angular/universal/blob/master/UPGRADE-GUIDE.md) +- [@nguniversal/common](/modules/common/README.md) +- [@nguniversal/express-engine](/modules/express-engine/README.md) +- [@nguniversal/aspnetcore-engine](/modules/aspnetcore-engine/README.md) +- [@nguniversal/hapi-engine](/modules/hapi-engine/README.md) +- [@nguniversal/module-map-ngfactory-loader](/master/modules/module-map-ngfactory-loader) ----- +# Universal "Gotchas" +Moved to [/docs/gotchas.md](/docs/gotchas.md) # Roadmap @@ -52,70 +61,25 @@ The packages from this repo are published as scoped packages under [@nguniversal - Generic state transfer API in the platform - Http Transfer State Module that uses HTTP interceptors and state transfer API - Material 2 works on Universal +- Write documentation for core API +- Support [AppShell](https://developers.google.com/web/updates/2015/11/app-shell) use cases ## In Progress -- Write documentation for core API - Better internal performance and stress tests - Make it easier to write unit tests for Universal components -- Support [AppShell](https://developers.google.com/web/updates/2015/11/app-shell) use cases - Make it easier to support other 3rd part libraries like jQuery/d3 that aren't Universal aware +- Node.js bridge protocol to communicate with different language backends - Django, Go, PHP etc. ## Planning - Full client rehydration strategy that reuses DOM elements/CSS rendered on the server -- Provide a solution for Java backends -- Node.js bridge protocol to communicate with different language backends - Django, Go, PHP etc. - -# Getting Started - -[* **NodeJS** :: Example repo](https://github.com/angular/universal-starter) - - Minimal webpack & universal example - -[* ASP.NET Core :: Universal Starter repo](https://github.com/MarkPieszak/aspnetcore-angular2-universal) - - **Installation**: Clone the above repo, `npm i && dotnet restore` *(VStudio will run these automatically when opening the project)* - - Launch files included for both VSCode & VStudio to run/debug automatically (press F5). ----- - -# Universal "Gotchas" +# Upgrading from Angular2-Universal +If you're coming from the original `angular2-universal` (2.x) here are some helpful steps for porting your application to Angular 4 & platform-server. -> When building Universal components in Angular there are a few things to keep in mind. - - - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: - - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. - - ```typescript - import { PLATFORM_ID } from '@angular/core'; - import { isPlatformBrowser, isPlatformServer } from '@angular/common'; - - constructor(@Inject(PLATFORM_ID) private platformId: Object) { ... } - - ngOnInit() { - if (isPlatformBrowser(this.platformId)) { - // Client only code. - ... - } - if (isPlatformServer(this.platformId)) { - // Server only code. - ... - } - } - ``` - - - Try to *limit or* **avoid** using **`setTimeout`**. It will slow down the server-side rendering process. Make sure to remove them in the [`ngOnDestroy`](https://angular.io/docs/ts/latest/api/core/index/OnDestroy-class.html) method of your Components. - - Also for RxJs timeouts, make sure to _cancel_ their stream on success, for they can slow down rendering as well. - - **Don't manipulate the nativeElement directly**. Use the _Renderer2_. We do this to ensure that in any environment we're able to change our view. -``` -constructor(element: ElementRef, renderer: Renderer2) { - renderer.setStyle(element.nativeElement, 'font-size', 'x-large'); -} -``` - - The application runs XHR requests on the server & once again on the Client-side (when the application bootstraps) - - Use a cache that's transferred from server to client (TODO: Point to the example) - - Know the difference between attributes and properties in relation to the DOM. - - Keep your directives stateless as much as possible. For stateful directives, you may need to provide an attribute that reflects the corresponding property with an initial string value such as url in img tag. For our native element the src attribute is reflected as the src property of the element type HTMLImageElement. +[Go here to find the guide](/docs/angular2-universal-migration.md) # Preboot -> Control server-rendered page and transfer state before client-side web app loads to the client-side-app. [Repo](https://github.com/angular/preboot) +Control server-rendered page and transfer state before client-side web app loads to the client-side-app. [Repo](https://github.com/angular/preboot) # What's in a name? We believe that using the word "universal" is correct when referring to a JavaScript Application that runs in more environments than the browser. (inspired by [Universal JavaScript](https://medium.com/@mjackson/universal-javascript-4761051b7ae9)) @@ -131,7 +95,5 @@ We believe that using the word "universal" is correct when referring to a JavaSc - [Jeff Cross](https://twitter.com/jeffbcross) - Evangelist and performance consultant - [Vikram Subramanian](https://twitter.com/vikerman) and [Alex Rickabaugh](https://github.com/alxhub) - Angular Core API -The Universal project is driven by community contributions. Please send us your Pull Requests! - # License [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](/LICENSE) diff --git a/UPGRADE-GUIDE.md b/UPGRADE-GUIDE.md index 33d91884874d..237c515e48c1 100644 --- a/UPGRADE-GUIDE.md +++ b/UPGRADE-GUIDE.md @@ -1,66 +1 @@ -# Upgrading from Angular2-Universal (2.x) to Angular v4 / platform-server - -In general, you're going to want to make sure you remove all references of `angular2-universal` from your project. If you're using `isBrowser / isNode`, use instead `isPlatformBrowser()` which you'll find information on [here](#universal-gotchas). - -Install platform-server into your application (and its dependency `@angular/animations` (this is due to NoOpAnimationsModule being needed for the Server)) - -```bash -npm i --S @angular/platform-server @angular/animations -``` - -As for your individual root files, there actually aren't many changes you'll need to do! - -## Server.ts - -When it comes the underlying express-engine, things will remain fairly similar except that now, you're going to be instead doing `import { ngExpressEngine } from '@nguniversal/express-engine';` [More detailed information on the express-engine here](https://github.com/angular/universal/tree/master/modules/express-engine) - -Make sure you remove `angular2-universal-polyfills` and any `__workaround.ts` files you may have been using (if you were using Universal with Angular > 2.1+). As for polyfills on the server, you'll instead need the following: - -```typescript -import 'zone.js/dist/zone-node'; -import 'reflect-metadata'; -``` - -As for your main NgModule's, one major thing you'll notice is that we no longer use `UniversalModule`. - -## Browser-app.module.ts -So UniversalModule has now been replaced with `BrowserModule`, and notice we pass in an `appId` that we want to make sure is the same name as the one included on the app.server.ts file. - -```typescript -import { BrowserModule } from '@angular/platform-browser'; - -@NgModule({ - bootstrap: [ AppComponent ], - imports: [ - BrowserModule.withServerTransition({ - appId: 'my-app-id' // <-- - }), - AppModule - ] -}) -export class BrowserAppModule {} -``` - -## Server-app.module.ts -Notice here we import not only a BrowserModule, but a ServerModule as well. - -```typescript -import { BrowserModule } from '@angular/platform-browser'; -import { ServerModule } from '@angular/platform-server'; - -@NgModule({ - bootstrap: [AppComponent], - imports: [ - BrowserModule.withServerTransition({ - appId: 'my-app-id' // <-- same name - }), - ServerModule, // <-- - AppModule - ] -}) -export class ServerAppModule { } -``` - -## Angular 4 / platform-server example - -An official starter can be found at [angular/universal-starter](https://github.com/angular/universal-starter) +## Move to [/docs/angular2-universal-migration.md](/docs/angular2-universal-migration.md) \ No newline at end of file diff --git a/docs/angular2-universal-migration.md b/docs/angular2-universal-migration.md new file mode 100644 index 000000000000..33d91884874d --- /dev/null +++ b/docs/angular2-universal-migration.md @@ -0,0 +1,66 @@ +# Upgrading from Angular2-Universal (2.x) to Angular v4 / platform-server + +In general, you're going to want to make sure you remove all references of `angular2-universal` from your project. If you're using `isBrowser / isNode`, use instead `isPlatformBrowser()` which you'll find information on [here](#universal-gotchas). + +Install platform-server into your application (and its dependency `@angular/animations` (this is due to NoOpAnimationsModule being needed for the Server)) + +```bash +npm i --S @angular/platform-server @angular/animations +``` + +As for your individual root files, there actually aren't many changes you'll need to do! + +## Server.ts + +When it comes the underlying express-engine, things will remain fairly similar except that now, you're going to be instead doing `import { ngExpressEngine } from '@nguniversal/express-engine';` [More detailed information on the express-engine here](https://github.com/angular/universal/tree/master/modules/express-engine) + +Make sure you remove `angular2-universal-polyfills` and any `__workaround.ts` files you may have been using (if you were using Universal with Angular > 2.1+). As for polyfills on the server, you'll instead need the following: + +```typescript +import 'zone.js/dist/zone-node'; +import 'reflect-metadata'; +``` + +As for your main NgModule's, one major thing you'll notice is that we no longer use `UniversalModule`. + +## Browser-app.module.ts +So UniversalModule has now been replaced with `BrowserModule`, and notice we pass in an `appId` that we want to make sure is the same name as the one included on the app.server.ts file. + +```typescript +import { BrowserModule } from '@angular/platform-browser'; + +@NgModule({ + bootstrap: [ AppComponent ], + imports: [ + BrowserModule.withServerTransition({ + appId: 'my-app-id' // <-- + }), + AppModule + ] +}) +export class BrowserAppModule {} +``` + +## Server-app.module.ts +Notice here we import not only a BrowserModule, but a ServerModule as well. + +```typescript +import { BrowserModule } from '@angular/platform-browser'; +import { ServerModule } from '@angular/platform-server'; + +@NgModule({ + bootstrap: [AppComponent], + imports: [ + BrowserModule.withServerTransition({ + appId: 'my-app-id' // <-- same name + }), + ServerModule, // <-- + AppModule + ] +}) +export class ServerAppModule { } +``` + +## Angular 4 / platform-server example + +An official starter can be found at [angular/universal-starter](https://github.com/angular/universal-starter) diff --git a/docs/gotchas.md b/docs/gotchas.md new file mode 100644 index 000000000000..ac5c507b7ea0 --- /dev/null +++ b/docs/gotchas.md @@ -0,0 +1,37 @@ +# Universal "Gotchas" + +When building Universal components in Angular there are a few things to keep in mind. + + - **`window`**, **`document`**, **`navigator`**, and other browser types - _do not exist on the server_ - so using them, or any library that uses them (jQuery for example) will not work. You do have some options, if you truly need some of this functionality: + - If you need to use them, consider limiting them to only your client and wrapping them situationally. You can use the Object injected using the PLATFORM_ID token to check whether the current platform is browser or server. + + ```typescript + import { PLATFORM_ID } from '@angular/core'; + import { isPlatformBrowser, isPlatformServer } from '@angular/common'; + + constructor(@Inject(PLATFORM_ID) private platformId: Object) { ... } + + ngOnInit() { + if (isPlatformBrowser(this.platformId)) { + // Client only code. + ... + } + if (isPlatformServer(this.platformId)) { + // Server only code. + ... + } + } + ``` + + - Try to *limit or* **avoid** using **`setTimeout`**. It will slow down the server-side rendering process. Make sure to remove them in the [`ngOnDestroy`](https://angular.io/docs/ts/latest/api/core/index/OnDestroy-class.html) method of your Components. + - Also for RxJs timeouts, make sure to _cancel_ their stream on success, for they can slow down rendering as well. + - **Don't manipulate the nativeElement directly**. Use the _Renderer2_. We do this to ensure that in any environment we're able to change our view. +``` +constructor(element: ElementRef, renderer: Renderer2) { + renderer.setStyle(element.nativeElement, 'font-size', 'x-large'); +} +``` + - The application runs XHR requests on the server & once again on the Client-side (when the application bootstraps) + - Use a cache that's transferred from server to client (TODO: Point to the example) + - Know the difference between attributes and properties in relation to the DOM. + - Keep your directives stateless as much as possible. For stateful directives, you may need to provide an attribute that reflects the corresponding property with an initial string value such as url in img tag. For our native element the src attribute is reflected as the src property of the element type HTMLImageElement. diff --git a/docs/transfer-http.md b/docs/transfer-http.md new file mode 100644 index 000000000000..52ac962a8d92 --- /dev/null +++ b/docs/transfer-http.md @@ -0,0 +1,66 @@ +## TransferHttpCacheModule + +`TransferHttpCacheModule` installs a Http interceptor that avoids duplicate `HttpClient` requests +on the client, for requests that were already made when the application was rendered on the server +side. + +When the module is installed in the application `NgModule`, it will intercept `HttpClient` requests +on the server and store the response in the `TransferState` key-value store. This is transferred to the client, which then uses it to respond to the same `HttpClient` requests on the client. + +### Usage + +To use the `TransferHttpCacheModule`, first install it as part of the top-level App module. + +```ts +import {TransferHttpCacheModule} from '@nguniversal/common'; + +@NgModule({ + imports: [ + BrowserModule.withServerTransition({appId: 'my-app'}), + TransferHttpCacheModule, + ], + bootstrap: [MyApp] +}) +export class AppBrowserModule() {} +``` +Then, import `ServerTransferStateModule` in your Server module. + +```ts +import { NgModule } from "@angular/core"; +import { + ServerModule, + ServerTransferStateModule +} from "@angular/platform-server"; + +import { AppModule } from "./app.module"; +import { AppComponent } from "./app.component"; + +@NgModule({ + imports: [ + AppModule, + ServerModule, + ServerTransferStateModule + ], + bootstrap: [AppComponent] +}) +export class AppServerModule {} + +``` +Finally, in `main.ts` change this: + +```ts +... + +platformBrowserDynamic().bootstrapModule(AppBrowserModule); +``` +To this: + +```ts +... + +document.addEventListener("DOMContentLoaded", () => { + platformBrowserDynamic() + .bootstrapModule(AppBrowserModule) + .catch(err => console.log(err)); +}); +``` diff --git a/modules/common/README.md b/modules/common/README.md index cfe15378ce47..bad5b3f2ff6d 100644 --- a/modules/common/README.md +++ b/modules/common/README.md @@ -9,67 +9,4 @@ The package can be installed using: ## TransferHttpCacheModule -`TransferHttpCacheModule` installs a Http interceptor that avoids duplicate `HttpClient` requests -on the client, for requests that were already made when the application was rendered on the server -side. - -When the module is installed in the application `NgModule`, it will intercept `HttpClient` requests -on the server and store the response in the `TransferState` key-value store. This is transferred to the client, which then uses it to respond to the same `HttpClient` requests on the client. - -### Usage - -To use the `TransferHttpCacheModule`, first install it as part of the top-level App module. - -```ts -import {TransferHttpCacheModule} from '@nguniversal/common'; - -@NgModule({ - imports: [ - BrowserModule.withServerTransition({appId: 'my-app'}), - TransferHttpCacheModule, - ], - bootstrap: [MyApp] -}) -export class AppBrowserModule() {} -``` -Then, import `ServerTransferStateModule` in your Server module. - -```ts -import { NgModule } from "@angular/core"; -import { - ServerModule, - ServerTransferStateModule -} from "@angular/platform-server"; - -import { AppModule } from "./app.module"; -import { AppComponent } from "./app.component"; - -@NgModule({ - imports: [ - AppModule, - ServerModule, - ServerTransferStateModule - ], - bootstrap: [AppComponent] -}) -export class AppServerModule {} - -``` -Finally, in `main.ts` change this: - -```ts -... - -platformBrowserDynamic().bootstrapModule(AppBrowserModule); -``` -To this: - -```ts -... - -document.addEventListener("DOMContentLoaded", () => { - platformBrowserDynamic() - .bootstrapModule(AppBrowserModule) - .catch(err => console.log(err)); -}); -``` +Moved to [/docs/transfer-http.md](https://github.com/angular/universal/tree/master/docs/transfer-http.md) \ No newline at end of file
96551365e2709f48ba8ef5cfb7820cb4a126e641
2022-10-14 19:17:02
Alan Agius
fix(@angular-devkit/build-angular): add `@angular/platform-server` as an optional peer dependency
false
add `@angular/platform-server` as an optional peer dependency
fix
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 309a6da31edd..60c9c4245e6f 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -73,6 +73,7 @@ "peerDependencies": { "@angular/compiler-cli": "^15.0.0-next", "@angular/localize": "^15.0.0-next", + "@angular/platform-server": "^15.0.0-next", "@angular/service-worker": "^15.0.0-next", "karma": "^6.3.0", "ng-packagr": "^15.0.0-next", @@ -84,6 +85,9 @@ "@angular/localize": { "optional": true }, + "@angular/platform-server": { + "optional": true + }, "@angular/service-worker": { "optional": true },