Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Commit

Permalink
dep bump & correction
Browse files Browse the repository at this point in the history
  • Loading branch information
@StephenFluin
StephenFluin committed Oct 30, 2017
1 parent bbbea2e commit 3b91a23
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 71 deletions.
26 changes: 13 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@
},
"private": true,
"dependencies": {
"@angular/animations": "5.0.0-rc.6",
"@angular/animations": "^5.0.0-rc.8",
"@angular/cdk": "^2.0.0-beta.12",
"@angular/common": "5.0.0-rc.6",
"@angular/compiler": "5.0.0-rc.6",
"@angular/compiler-cli": "5.0.0-rc.6",
"@angular/core": "5.0.0-rc.6",
"@angular/forms": "5.0.0-rc.6",
"@angular/http": "5.0.0-rc.6",
"@angular/common": "^5.0.0-rc.8",
"@angular/compiler": "^5.0.0-rc.8",
"@angular/compiler-cli": "^5.0.0-rc.8",
"@angular/core": "^5.0.0-rc.8",
"@angular/forms": "^5.0.0-rc.8",
"@angular/http": "^5.0.0-rc.8",
"@angular/material": "^2.0.0-beta.12",
"@angular/platform-browser": "5.0.0-rc.6",
"@angular/platform-browser-dynamic": "5.0.0-rc.6",
"@angular/platform-server": "5.0.0-rc.6",
"@angular/router": "5.0.0-rc.6",
"@angular/platform-browser": "^5.0.0-rc.8",
"@angular/platform-browser-dynamic": "^5.0.0-rc.8",
"@angular/platform-server": "^5.0.0-rc.8",
"@angular/router": "^5.0.0-rc.8",
"@angular/service-worker": "^1.0.0-beta.16",
"@types/showdown": "^1.4.32",
"core-js": "^2.4.1",
"rxjs": "^5.5.2",
"showdown": "^1.6.4",
"typescript": "2.5",
"typescript": "2.4.2",
"zone.js": "^0.8.9"
},
"devDependencies": {
"@angular/cli": "^1.5.0-rc.3",
"@angular/cli": "^1.5.0-rc.7",
"@angular/compiler-cli": "^2.4.0",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
Expand Down
18 changes: 10 additions & 8 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ export class AppComponent {

if (isWindows) {
const packages = angularPackages.map(packageName => `@angular/${packageName}@${angularVersion}`).join(' ') + ' ' + additionalDeps;

upgradeStep = {
step: "General Update",
action:
`${actionMessage}
If you are using Windows, you can use:
If you are using Windows, you can use:
\`${this.packageManager} ${packages}\``
};
} else {
Expand All @@ -113,8 +113,8 @@ export class AppComponent {
step: "General update",
action:
`${actionMessage}
If you are using Linux/Mac, you can use:
If you are using Linux/Mac, you can use:
\`${this.packageManager} ${packages}\``
};
}
Expand All @@ -125,18 +125,20 @@ export class AppComponent {

getAdditionalDependencies(version: number) {
if (version < 400) {
return "typescript@'>=2.1.0 <2.4.0'";
return `typescript@'>=2.1.0 <2.4.0'`;
} else {
return "typescript@2.4.2 rxjs@'^5.5.2'";
return `typescript@2.4.2 rxjs@'^5.5.2'`;
}
}
getAngularVersion(version: number) {
if (version < 400) {
return `'^2.0.0'`;
} else if (version < 500) {
return `'^4.0.0'`;
} else if (version < 600) {
return `next`;
} else {
return `'5.0.0-rc.6'`;
return `'^${Math.floor(version / 100)}.0.0'`;
}
}
}
107 changes: 57 additions & 50 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# yarn lockfile v1


"@angular-devkit/build-optimizer@~0.0.28":
"@angular-devkit/build-optimizer@~0.0.31":
version "0.0.31"
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.31.tgz#511bc00e18c787a6cd4efe37b8cdb9f1bc6d4472"
dependencies:
Expand All @@ -26,9 +26,9 @@
minimist "^1.2.0"
rxjs "^5.4.2"

"@angular/animations@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.0.0-rc.6.tgz#1504dee4a09713a73bfa9b3339a5002ef43f10fb"
"@angular/animations@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.0.0-rc.8.tgz#d80cf0dac3d800178d23d4e5a4b1c61c1682ce99"
dependencies:
tslib "^1.7.1"

Expand All @@ -38,17 +38,17 @@
dependencies:
tslib "^1.7.1"

"@angular/cli@^1.5.0-rc.3":
version "1.5.0-rc.3"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.5.0-rc.3.tgz#26666c849332c23834c39611220753f36b3787ed"
"@angular/cli@^1.5.0-rc.7":
version "1.5.0-rc.7"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.5.0-rc.7.tgz#36737ed7147f433e4f998c642f8eb71588b9028a"
dependencies:
"@angular-devkit/build-optimizer" "~0.0.28"
"@angular-devkit/build-optimizer" "~0.0.31"
"@angular-devkit/schematics" "~0.0.34"
"@ngtools/json-schema" "1.1.0"
"@ngtools/webpack" "1.8.0-rc.3"
"@ngtools/webpack" "1.8.0-rc.7"
"@schematics/angular" "~0.0.48"
autoprefixer "^6.5.3"
chalk "^2.0.1"
chalk "~2.2.0"
circular-dependency-plugin "^3.0.0"
common-tags "^1.3.1"
copy-webpack-plugin "^4.1.1"
Expand Down Expand Up @@ -88,7 +88,6 @@
style-loader "^0.13.1"
stylus "^0.54.5"
stylus-loader "^3.0.1"
typescript ">=2.0.0 <2.6.0"
uglifyjs-webpack-plugin "1.0.0"
url-loader "^0.6.2"
webpack "~3.8.1"
Expand All @@ -102,42 +101,42 @@
optionalDependencies:
node-sass "^4.3.0"

"@angular/common@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.0.0-rc.6.tgz#05be66cf52ec54da812326d3019407353186684f"
"@angular/common@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.0.0-rc.8.tgz#a0c1f8e81d21f5ea29f301b59cd625a1c0b7ba96"
dependencies:
tslib "^1.7.1"

"@angular/compiler-cli@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.0.0-rc.6.tgz#d7a1f51044a1fc5c78fb700f4e1b3524d9951aa8"
"@angular/compiler-cli@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.0.0-rc.8.tgz#74ef8e0130aa9af49225ab742577dcd228dc736c"
dependencies:
chokidar "^1.4.2"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
tsickle "^0.24.0"

"@angular/compiler@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.0.0-rc.6.tgz#43a865b5097878e6df1c59ca72661afca012d171"
"@angular/compiler@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.0.0-rc.8.tgz#4883e80554a86b9bbac687b4a436ccc64962aea0"
dependencies:
tslib "^1.7.1"

"@angular/core@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.0.0-rc.6.tgz#be949192fb878b3e95fc2650be1eef214375a467"
"@angular/core@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.0.0-rc.8.tgz#368d91327d9e15aed602aa85caa22e89330e68bb"
dependencies:
tslib "^1.7.1"

"@angular/forms@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.0.0-rc.6.tgz#beacd51c3ca775670580468bfc9ea2763aabfb4c"
"@angular/forms@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.0.0-rc.8.tgz#238911333febf9c288e1df0d45928fcf6c58bb6e"
dependencies:
tslib "^1.7.1"

"@angular/http@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.0.0-rc.6.tgz#778690ea8dead50e2197d68a7dd55899c54b5e77"
"@angular/http@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.0.0-rc.8.tgz#4e406b83341e1e6da7de2f97c6f2458b3fffeaf8"
dependencies:
tslib "^1.7.1"

Expand All @@ -147,29 +146,29 @@
dependencies:
tslib "^1.7.1"

"@angular/platform-browser-dynamic@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0-rc.6.tgz#2438f1919341962ee8e2b1de5a7ad01c88d5b9a0"
"@angular/platform-browser-dynamic@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0-rc.8.tgz#1e58cd8bd92d1109c1bc7bba7914c79990b4b096"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.0.0-rc.6.tgz#bae2bbdbed6fd6bdd7d07b28f56fc914a8127bac"
"@angular/platform-browser@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.0.0-rc.8.tgz#69dc39810ec4469af0fb28192ad263a3224c51cb"
dependencies:
tslib "^1.7.1"

"@angular/platform-server@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.0.0-rc.6.tgz#ddcb0f559face182f898418f3c4d2ba2d75819e8"
"@angular/platform-server@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.0.0-rc.8.tgz#535f80cd951b640d9ba0035d302ba1dd1b61b65d"
dependencies:
domino "^1.0.29"
tslib "^1.7.1"
xhr2 "^0.1.4"

"@angular/router@5.0.0-rc.6":
version "5.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.0.0-rc.6.tgz#725e4285ff09ca935da671a2f8ca726e4dd3164d"
"@angular/router@^5.0.0-rc.8":
version "5.0.0-rc.8"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.0.0-rc.8.tgz#5ef9cbfd61aeee078397da78e60b0af153c5c5b6"
dependencies:
tslib "^1.7.1"

Expand All @@ -184,11 +183,11 @@
version "1.1.0"
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"

"@ngtools/webpack@1.8.0-rc.3":
version "1.8.0-rc.3"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.8.0-rc.3.tgz#08d673b5b305a2ca18e71a35b3a8cf009e390a28"
"@ngtools/webpack@1.8.0-rc.7":
version "1.8.0-rc.7"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.8.0-rc.7.tgz#063d5c0aab4c559943b82575ac87aea340ce974f"
dependencies:
chalk "^2.0.1"
chalk "~2.2.0"
enhanced-resolve "^3.1.0"
loader-utils "^1.0.2"
magic-string "^0.22.3"
Expand Down Expand Up @@ -915,14 +914,22 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"

chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
chalk@^2.0.0, chalk@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

chalk@~2.2.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.2.2.tgz#4403f5cf18f35c05f51fbdf152bf588f956cf7cb"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

charenc@~0.0.1:
version "0.0.2"
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
Expand Down Expand Up @@ -5654,11 +5661,11 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

typescript@2.5:
version "2.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
typescript@2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"

"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
typescript@^2.3.3:
version "2.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"

Expand Down

0 comments on commit 3b91a23

Please sign in to comment.