Handle peer dependency warnings (#794)

Handle peer dependency warnings
2018-10-25 12:00:49 -07:00 · 2018-10-25 12:00:49 -07:00 · 9b3d1f56fd
parent 8c20892290
commit 9b3d1f56fd
8 changed files with 89 additions and 103 deletions
--- a/scripts/Run-Angular-Locally.ps1
+++ b/scripts/Run-Angular-Locally.ps1
@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'

-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1

 Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true
--- a/scripts/Run-Razor-Locally.ps1
+++ b/scripts/Run-Razor-Locally.ps1
@ -4,6 +4,6 @@
 [CmdletBinding(PositionalBinding = $false)]
 param()

-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1

 Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-rtm-t000.nupkg" $false
--- a/scripts/Run-React-Locally.ps1
+++ b/scripts/Run-React-Locally.ps1
@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'

-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1

 Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true
--- a/scripts/Run-ReactRedux-Locally.ps1
+++ b/scripts/Run-ReactRedux-Locally.ps1
@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'

-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1

 Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2.0-rtm-t000.nupkg" $true
--- a/scripts/Run-Starterweb-Locally.ps1
+++ b/scripts/Run-Starterweb-Locally.ps1
@ -7,6 +7,6 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'

-. $PSScriptRoot\Custom-Hive.ps1
+. $PSScriptRoot\Test-Template.ps1

 Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.2.2.2.2.0-rtm-t000.nupkg" $false
--- a/scripts/Test-Template.ps1
+++ b/scripts/Test-Template.ps1
@ -1,11 +1,7 @@
-$customHive = "$PSScriptRoot/CustomHive"
-
 function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
    $tmpDir = "$PSScriptRoot/$templateName"
    Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore

-    Create-Hive
-
    & "$PSScriptRoot/../build.cmd" /t:Package
    Run-DotnetNew "--install", "$PSScriptRoot/../artifacts/build/$templateNupkg"

@ -35,31 +31,11 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) {
    }
    finally {
        Pop-Location
+        Run-DotnetNew "--debug:reinit"
    }
 }

-function Create-Hive {
-    Write-Host "Creating custom hive"
-    Remove-Item -Path $customHive -Force -Recurse -ErrorAction Ignore
-    New-Item -Path $customHive -ItemType Directory | out-null
-    Clean-Hive
-}
-
-function Clean-Hive() {
-    $packageArray = Run-DotnetNew "--uninstall"
-    $packageStr = $packageArray -join [Environment]::NewLine
-    $packagesStr = ($packageStr -split "Currently installed items:")[1]
-    $packagesStr = $packagesStr.Trim()
-    $packages = $packagesStr -split [Environment]::NewLine
-
-    foreach ($package in $packages) {
-        $package = $package.Trim()
-        Run-DotnetNew "--uninstall", "$package" | out-null
-    }
-    Run-DotnetNew "--uninstall" | out-null
-}
-
 function Run-DotnetNew($arguments) {
-    $expression = "dotnet new $arguments --debug:custom-hive $customHive"
+    $expression = "dotnet new $arguments"
    Invoke-Expression $expression
 }
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json
@ -183,9 +183,9 @@
      }
    },
    "@angular/animations": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.5.tgz",
-      "integrity": "sha512-zW/qX3CvsuRDOcTNFFSf7uXktvq1jRrfKR8LdGQ/DER1GU3o8pR3z3H8gHy8lAFc3PESfETtzXinKUNzvTDfpA==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.10.tgz",
+      "integrity": "sha512-dd/lq7kw3uwfHPICan8psu2nthuUpp7PvMLuNIm0XxObZ4oNs0ls6uxKEDPnEkRKoGdiJpvmsyzZZN9ACMPEAA==",
      "requires": {
        "tslib": "^1.9.0"
      }
@ -228,31 +228,31 @@
      }
    },
    "@angular/common": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.5.tgz",
-      "integrity": "sha512-xL4Aq+uGQcmHYs90WSKsS9vBC1XO042hM5lSVz+zyYtYzYHdt/Qg1CIuR3zkP+8DG+mf1QZqbg5YtQx5XykmgA==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.10.tgz",
+      "integrity": "sha512-73xxTSYJNKfiJ7C1Ajg+sz5l8y+blb/vNgHYg7O3yem5zLBnfPpidJ1UGg4W4d2Y+jwUVJbZKh8SKJarqAJVUQ==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/compiler": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.5.tgz",
-      "integrity": "sha512-Oe0VRCyKfHLatalRuXjCdgaY6hhiMXEL/ueknMJFC0+xA73mEchmLYXj64/1ed753cjnLOM2qbVVwqhc26tmEg==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.10.tgz",
+      "integrity": "sha512-FPIb2j3zfoBwb6vo/u0gQeu70h8InGlSisBr3xMACs/35/pwB6kbQR+JQiUr0D7k6QApg7AuMkvq8aFNelg0aw==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/compiler-cli": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.5.tgz",
-      "integrity": "sha512-onRlVLWo1mTdyxLMRtW4iPntTUglJl9T0hacRlscKKlAUT8jaSfqIyknCF3jEXJrTnfKdypen053U7g2ajifrA==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.10.tgz",
+      "integrity": "sha512-GCWdyeNQSnF4RfzO4A0+WHsNEgxKpl5arg4ldLSWMNkj/DrhMD4TnmxhR+IVY+7ieMkUBwpcuWRnjdOdnbmV+w==",
      "dev": true,
      "requires": {
        "chokidar": "^1.4.2",
        "minimist": "^1.2.0",
        "reflect-metadata": "^0.1.2",
-        "tsickle": "^0.29.0"
+        "tsickle": "^0.32.1"
      },
      "dependencies": {
        "anymatch": {
@ -383,25 +383,25 @@
      }
    },
    "@angular/core": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.5.tgz",
-      "integrity": "sha512-yG4Qz5wHWgFYOCtX62F8MmJ1wZwZA1ALbyQC+WAZfi7Y8Asx8TShJ+3QKUDYwO1jj530pqNbfauDTCmPzzPvaQ==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.10.tgz",
+      "integrity": "sha512-61l3rIQTVdT45eOf6/fBJIeVmV10mcrxqS4N/1OWkuDT29YSJTZSxGcv8QjAyyutuhcqWWpO6gVRkN07rWmkPg==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/forms": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.5.tgz",
-      "integrity": "sha512-d1SdhAQ/W1n3vtm1lp5y16EaUylcZ2wftLUj6MSne3bH/2MJ6JsxJKwX+MfPcQCo+DCfG5bF0UMCa1KAwUQthQ==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.10.tgz",
+      "integrity": "sha512-zAPx2kMV1/FbP5DrY472Sd/ze1m+GS6T5ullZCtP392r62p2RkwzDCXieR51YiRJjZj3M6c3AcRND7PWBdXT7A==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/http": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.5.tgz",
-      "integrity": "sha512-N9lx1s1h4wki1ob4qne3FdyAWG3TcCAGnUAjDmZ1+c/hhxtcv0iEJ22nBrGkPIsUxIPXg0JgsD1hKhu5DGEbWg==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.10.tgz",
+      "integrity": "sha512-LDsSqyexh8fj23y+G2oSGLWSZVhbxBBo2ehYHnRgH/jlp0pmZVLRaGgUMNSCVtZc1rxLzpEjZjtw+P+qlutAtw==",
      "requires": {
        "tslib": "^1.9.0"
      }
@ -413,44 +413,35 @@
      "dev": true
    },
    "@angular/platform-browser": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.5.tgz",
-      "integrity": "sha512-FSsA9C3cJa7S4SPUAhypKlTQf4uA4hiqx/h65v7frDiyRVHv22oWKX7aKmyyb9oP5FHN/TDeQiRn4m8XNqG6AQ==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.10.tgz",
+      "integrity": "sha512-CB7pqMwtgb7KjdHDAJlsXcs0rrU+2xQVaoOaqEfJtUrKhtGMLaZh8Qoic5l92SoGattkOw7SYarAOsWlAsVfvw==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/platform-browser-dynamic": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.5.tgz",
-      "integrity": "sha512-TTSLOMVrgRXI29xmBWsnSp8187vbWnbj0YEehuyup2FmltUl+H5Vms7poWV9/6fI3RnW3Yg9Ziv3T5iKqsiADQ==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.10.tgz",
+      "integrity": "sha512-DmBSUyFPoyKqkmBXyJ2CrP1oXDioeoBlPA8lmWUDUv2yBuoHIzIkdY/OkTZbdyu/QYa1hK2Jl9OlfoeoenKddg==",
      "requires": {
        "tslib": "^1.9.0"
      }
    },
    "@angular/platform-server": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-6.0.0.tgz",
-      "integrity": "sha512-1dmaM3xpayBdZrkpmhPfpJ1CDNntxlizL1td2DMRUfFqMNyE7acbc7vRuV9BOgniPGsMKphYQXczERNfoVeuSw==",
-      "dev": true,
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-6.1.10.tgz",
+      "integrity": "sha512-OKcbDJOCYrk+z5BaTbAsunLazlvFZZqOtYKU8zSCVuTGnGRINchO2RxHezS2+npzY1oO1zl1AA47RR59Nxutww==",
      "requires": {
        "domino": "^2.0.1",
        "tslib": "^1.9.0",
        "xhr2": "^0.1.4"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
-          "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==",
-          "dev": true
-        }
      }
    },
    "@angular/router": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.5.tgz",
-      "integrity": "sha512-M3cb5CDX+WvkM2xmFeP64zPwLJ6by6cyzl5OCfEQjoTGKOFY7N2B4kHAOw5KJN3nIEd0PersSBgf11Y9g7GPwA==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.10.tgz",
+      "integrity": "sha512-tekI3dkdvd65oMoxjjgRA+16uDgPUBWHhYxids6pgO8vobZNtCo8VaVlcDyLUhdmtS5kONELx0iL5E2M0Y2Bag==",
      "requires": {
        "tslib": "^1.9.0"
      }
@ -2527,8 +2518,7 @@
    "diff": {
      "version": "3.5.0",
      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "optional": true
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
    },
    "diffie-hellman": {
      "version": "5.0.3",
@ -2677,10 +2667,9 @@
      }
    },
    "domino": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.2.tgz",
-      "integrity": "sha512-vzykUakUw5s1p0RrN/vI2sShYo3pLRy/z7PM1PuOIZIlMOJ0XfOnrckGE5f4MxIQVe5XcrH7yG9mR+l77mgLVA==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.0.tgz",
+      "integrity": "sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ=="
    },
    "domutils": {
      "version": "1.5.1",
@ -5474,6 +5463,15 @@
      "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
      "dev": true
    },
+    "jasmine-diff": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/jasmine-diff/-/jasmine-diff-0.1.3.tgz",
+      "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=",
+      "dev": true,
+      "requires": {
+        "diff": "^3.2.0"
+      }
+    },
    "jasmine-spec-reporter": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
@ -5489,6 +5487,11 @@
      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
      "optional": true
    },
+    "jquery": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+    },
    "js-base64": {
      "version": "2.4.9",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
@ -7217,6 +7220,11 @@
        }
      }
    },
+    "popper.js": {
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz",
+      "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY="
+    },
    "portfinder": {
      "version": "1.0.13",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
@ -7558,9 +7566,9 @@
      "dev": true
    },
    "randomatic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
-      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
      "dev": true,
      "requires": {
        "is-number": "^4.0.0",
@ -9236,11 +9244,12 @@
      }
    },
    "tsickle": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.29.0.tgz",
-      "integrity": "sha512-JpID0Lv8/irRtPmqJJxb5fCwfZhjZeKmav9Zna7UjqVuJoSbI49Wue/c2PPybX1SbRrjl7bbI/JsCl0dSUJygA==",
+      "version": "0.32.1",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.32.1.tgz",
+      "integrity": "sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==",
      "dev": true,
      "requires": {
+        "jasmine-diff": "^0.1.3",
        "minimist": "^1.2.0",
        "mkdirp": "^0.5.1",
        "source-map": "^0.6.0",
@ -9254,9 +9263,9 @@
          "dev": true
        },
        "source-map-support": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
-          "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+          "version": "0.5.9",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+          "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
          "dev": true,
          "requires": {
            "buffer-from": "^1.0.0",
@ -10233,8 +10242,7 @@
    "xhr2": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
-      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=",
-      "dev": true
+      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8="
    },
    "xml2js": {
      "version": "0.4.19",
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json
@ -12,28 +12,30 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^6.0.0",
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/forms": "^6.0.0",
-    "@angular/http": "^6.0.0",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
-    "@angular/router": "^6.0.0",
+    "@angular/animations": "6.1.10",
+    "@angular/common": "6.1.10",
+    "@angular/compiler": "6.1.10",
+    "@angular/core": "6.1.10",
+    "@angular/forms": "6.1.10",
+    "@angular/http": "6.1.10",
+    "@angular/platform-browser": "6.1.10",
+    "@angular/platform-browser-dynamic": "6.1.10",
+    "@angular/platform-server": "6.1.10",
+    "@angular/router": "6.1.10",
    "@nguniversal/module-map-ngfactory-loader": "6.0.0",
    "core-js": "^2.5.4",
    "rxjs": "^6.0.0",
    "zone.js": "^0.8.26",
    "aspnet-prerendering": "^3.0.1",
-    "bootstrap": "^4.1.3"
+    "bootstrap": "^4.1.3",
+    "jquery": "3.3.1",
+    "popper.js": "^1.14.3"
  },
  "devDependencies": {
    "@angular-devkit/build-angular": "~0.6.0",
    "@angular/cli": "~6.0.0",
-    "@angular/compiler-cli": "^6.0.0",
+    "@angular/compiler-cli": "6.1.10",
    "@angular/language-service": "^6.0.0",
-    "@angular/platform-server": "6.0.0",
    "@types/jasmine": "~2.8.6",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "~8.9.4",