diff --git a/broccoli/packages.js b/broccoli/packages.js index d6ce9ab0c10..5ced5e573a8 100644 --- a/broccoli/packages.js +++ b/broccoli/packages.js @@ -5,7 +5,7 @@ const path = require('path'); const Rollup = require('broccoli-rollup'); const Funnel = require('broccoli-funnel'); const MergeTrees = require('broccoli-merge-trees'); -const typescript = require('broccoli-typescript-compiler').typescript; +const typescript = require('broccoli-typescript-compiler').default; const BroccoliDebug = require('broccoli-debug'); const findLib = require('./find-lib'); const findPackage = require('./find-package'); diff --git a/package.json b/package.json index 5926db42cd6..d2fc2864039 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "broccoli-rollup": "^2.1.0", "broccoli-source": "^1.1.0", "broccoli-string-replace": "^0.1.2", - "broccoli-typescript-compiler": "^2.3.0", + "broccoli-typescript-compiler": "^4.0.1", "broccoli-uglify-js": "^0.2.0", "broccoli-uglify-sourcemap": "^2.0.2", "common-tags": "^1.7.2", @@ -145,7 +145,7 @@ "tslint": "^5.9.1", "tslint-config-prettier": "^1.10.0", "tslint-plugin-prettier": "^1.3.0", - "typescript-eslint-parser": "^15.0.0" + "typescript-eslint-parser": "^18.0.0" }, "engines": { "node": "^4.5 || 6.* || >= 8.*" diff --git a/packages/ember-metal/lib/property_get.ts b/packages/ember-metal/lib/property_get.ts index e6ced5144ba..23d142d985d 100644 --- a/packages/ember-metal/lib/property_get.ts +++ b/packages/ember-metal/lib/property_get.ts @@ -197,7 +197,7 @@ export function _getPath(root: T, path: string): any { @return {Object} The property value or the defaultValue. @public */ -export function getWithDefault( +export function getWithDefault>( root: T, key: K, defaultValue: T[K] diff --git a/packages/ember-metal/lib/property_set.ts b/packages/ember-metal/lib/property_set.ts index dcf62ac3582..7161af92216 100644 --- a/packages/ember-metal/lib/property_set.ts +++ b/packages/ember-metal/lib/property_set.ts @@ -14,7 +14,7 @@ interface ExtendedObject { setUnknownProperty?: (keyName: string, value: any) => any; } -let setWithMandatorySetter: ( +let setWithMandatorySetter: >( meta: Meta, obj: T, keyName: K, diff --git a/yarn.lock b/yarn.lock index 366c2f37fe8..074980753ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -317,10 +317,6 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" -array-binsearch@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-binsearch/-/array-binsearch-1.0.1.tgz#35586dca04ca9ab259c4c4708435acd1babb08ad" - array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -1419,6 +1415,13 @@ broccoli-merge-trees@^2.0.0: broccoli-plugin "^1.3.0" merge-trees "^1.0.1" +broccoli-merge-trees@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.1.tgz#545dfe9f695cec43372b3ee7e63c7203713ea554" + dependencies: + broccoli-plugin "^1.3.0" + merge-trees "^2.0.0" + broccoli-middleware@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436" @@ -1531,18 +1534,17 @@ broccoli-string-replace@^0.1.2: broccoli-persistent-filter "^1.1.5" minimatch "^3.0.3" -broccoli-typescript-compiler@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-2.3.0.tgz#7922a553b55055138ae0d8b76abec0580d254dd0" +broccoli-typescript-compiler@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-4.0.1.tgz#7a03e003b3032acf9a2feaae973ae2e257393d04" dependencies: - array-binsearch "^1.0.1" broccoli-funnel "^2.0.1" - broccoli-merge-trees "^2.0.0" + broccoli-merge-trees "^3.0.0" broccoli-plugin "^1.3.0" fs-tree-diff "^0.5.7" heimdalljs "0.3.3" md5-hex "^2.0.0" - typescript "~2.8.3" + typescript "~3.0.1" walk-sync "^0.3.2" broccoli-uglify-js@^0.2.0: @@ -1882,6 +1884,10 @@ clean-css@^3.4.5: commander "2.8.x" source-map "0.4.x" +clean-up-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5" + cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -3503,6 +3509,16 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5 path-posix "^1.0.0" symlink-or-copy "^1.1.8" +fs-updater@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b" + dependencies: + can-symlink "^1.0.0" + clean-up-path "^1.0.0" + heimdalljs "^0.2.5" + heimdalljs-logger "^0.1.9" + rimraf "^2.6.2" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -3907,6 +3923,12 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3: dependencies: rsvp "~3.2.1" +heimdalljs@^0.2.5: + version "0.2.6" + resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe" + dependencies: + rsvp "~3.2.1" + hoek@0.9.x: version "0.9.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505" @@ -5134,6 +5156,13 @@ merge-trees@^1.0.1: rimraf "^2.4.3" symlink-or-copy "^1.0.0" +merge-trees@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161" + dependencies: + fs-updater "^1.0.4" + heimdalljs "^0.2.5" + merge@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -7347,16 +7376,16 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript-eslint-parser@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-15.0.0.tgz#882fd3d7aabffbab0a7f98d2a59fb9a989c2b37f" +typescript-eslint-parser@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-18.0.0.tgz#3e5055a44980d69e4154350fc5d8b1ab4e2332a8" dependencies: lodash.unescape "4.0.1" semver "5.5.0" -typescript@~2.8.3: - version "2.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170" +typescript@~3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb" uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3"