Skip to content

Commit

Permalink
fix(build): don't use ng-annotate-loader before tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikmunson
Erik Munson authored and erikmunson committed Oct 31, 2019
1 parent 97f6704 commit af2381b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 113 deletions.
2 changes: 0 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@
"license-checker": "^15.0.0",
"loader-utils": "^1.1.0",
"luxon": "^1.11.3",
"ng-annotate-loader": "^0.6.0",
"ng-annotate-webpack-plugin": "^0.2.1-pre",
"ngtemplate-loader": "^1.3.1",
"node-libs-browser": "^2.0.0",
"prettier": "^1.14.3",
Expand Down
4 changes: 2 additions & 2 deletions webpack.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function configure(IS_TEST, IS_INSTRUMENTED) {
{ test: require.resolve('jquery'), use: ['expose-loader?$', 'expose-loader?jQuery'] },
{
test: /\.js$/,
use: ['cache-loader', 'ng-annotate-loader', 'eslint-loader'],
use: ['cache-loader', 'eslint-loader'],
include: inclusionPattern.concat(path.resolve(__dirname, 'settings.js')),
},
{
Expand Down Expand Up @@ -182,7 +182,7 @@ function configure(IS_TEST, IS_INSTRUMENTED) {
} else {
config.module.rules.push({
test: /\.tsx?$/,
use: ['cache-loader', 'ng-annotate-loader', 'awesome-typescript-loader'],
use: ['cache-loader', 'awesome-typescript-loader'],
include: inclusionPattern.concat(path.join(__dirname, 'test')),
});
}
Expand Down
115 changes: 6 additions & 109 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,6 @@ acorn@^5.4.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
integrity sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==

acorn@~2.6.4:
version "2.6.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.6.4.tgz#eb1f45b4a43fa31d03701a5ec46f3b52673e90ee"
integrity sha1-6x9FtKQ/ox0DcBpexG87Umc+kO4=

[email protected]:
version "1.0.1"
resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
Expand Down Expand Up @@ -534,13 +529,6 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=

alter@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd"
integrity sha1-x1iICGF1cgNKrmJICvJrHU0cs80=
dependencies:
stable "~0.1.3"

amdefine@>=0.0.4, amdefine@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
Expand Down Expand Up @@ -2105,7 +2093,7 @@ convert-source-map@^1.5.0:
dependencies:
safe-buffer "~5.1.1"

convert-source-map@~1.1.0, convert-source-map@~1.1.2:
convert-source-map@~1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
Expand Down Expand Up @@ -5832,7 +5820,7 @@ [email protected], loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@~0
json5 "^0.5.0"
object-assign "^4.0.1"

loader-utils@1.1.0, loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
Expand Down Expand Up @@ -6461,42 +6449,6 @@ netmask@~1.0.4:
resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=

ng-annotate-loader@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/ng-annotate-loader/-/ng-annotate-loader-0.6.0.tgz#ae0638f10594371321dcbc7a893e33095f8440ba"
integrity sha1-rgY48QWUNxMh3Lx6iT4zCV+EQLo=
dependencies:
loader-utils "1.1.0"
ng-annotate "1.2.1"
normalize-path "2.0.1"
source-map "0.5.6"

ng-annotate-webpack-plugin@^0.2.1-pre:
version "0.2.1-pre"
resolved "https://registry.yarnpkg.com/ng-annotate-webpack-plugin/-/ng-annotate-webpack-plugin-0.2.1-pre.tgz#40d9aa8cd214e30e3125a8481634ab0dd9b3dd68"
integrity sha1-QNmqjNIU4w4xJahIFjSrDdmz3Wg=
dependencies:
ng-annotate "^1.2.1"
webpack-core "^0.6.5"

[email protected], ng-annotate@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/ng-annotate/-/ng-annotate-1.2.1.tgz#eb8bc1a6731c70d08af6b02c3eaf1a6e3fb9e6bb"
integrity sha1-64vBpnMccNCK9rAsPq8abj+55rs=
dependencies:
acorn "~2.6.4"
alter "~0.2.0"
convert-source-map "~1.1.2"
optimist "~0.6.1"
ordered-ast-traverse "~1.1.1"
simple-fmt "~0.1.0"
simple-is "~0.2.0"
source-map "~0.5.3"
stable "~0.1.5"
stringmap "~0.2.2"
stringset "~0.2.1"
tryor "~0.1.2"

ngcomponent@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ngcomponent/-/ngcomponent-4.1.0.tgz#793e379138f552ea0cd2c767ad0aa7057678e228"
Expand Down Expand Up @@ -6709,7 +6661,7 @@ normalize-package-data@^2.3.2:
semver "2 || 3 || 4 || 5"
validate-npm-package-license "^3.0.1"

normalize-path@2.0.1, normalize-path@^2.0.1:
normalize-path@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
integrity sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=
Expand Down Expand Up @@ -6949,7 +6901,7 @@ [email protected]:
object-assign "^4.0.1"
pinkie-promise "^2.0.0"

optimist@^0.6.1, optimist@~0.6.1:
optimist@^0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
Expand All @@ -6969,18 +6921,6 @@ optionator@^0.8.1, optionator@^0.8.2:
type-check "~0.3.2"
wordwrap "~1.0.0"

ordered-ast-traverse@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz#6843a170bc0eee8b520cc8ddc1ddd3aa30fa057c"
integrity sha1-aEOhcLwO7otSDMjdwd3TqjD6BXw=
dependencies:
ordered-esprima-props "~1.1.0"

ordered-esprima-props@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz#a9827086df5f010aa60e9bd02b6e0335cea2ffcb"
integrity sha1-qYJwht9fAQqmDpvQK24DNc6i/8s=

original@>=0.0.5:
version "1.0.0"
resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
Expand Down Expand Up @@ -9194,16 +9134,6 @@ signal-exit@^3.0.0:
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=

simple-fmt@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
integrity sha1-GRv1ZqWeZTBILLJatTtKjchcOms=

simple-is@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0"
integrity sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=

slack-node@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
Expand Down Expand Up @@ -9385,7 +9315,7 @@ sort-keys@^1.0.0:
dependencies:
is-plain-obj "^1.0.0"

source-list-map@^0.1.7, source-list-map@~0.1.7:
source-list-map@^0.1.7:
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
Expand Down Expand Up @@ -9433,17 +9363,12 @@ source-map-url@^0.4.0:
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=

[email protected]:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=

[email protected], source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=

source-map@^0.4.4, source-map@~0.4.1:
source-map@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
Expand Down Expand Up @@ -9607,11 +9532,6 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2"
tweetnacl "~0.14.0"

stable@~0.1.3, stable@~0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10"
integrity sha1-kQ9dKu17Ugxud3SZwfMuE5/eyxA=

static-extend@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
Expand Down Expand Up @@ -9736,16 +9656,6 @@ string_decoder@~1.0.3:
dependencies:
safe-buffer "~5.1.0"

stringmap@~0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
integrity sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=

stringset@~0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5"
integrity sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=

stringstream@~0.0.4, stringstream@~0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
Expand Down Expand Up @@ -10082,11 +9992,6 @@ tryit@^1.0.1:
resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
integrity sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=

tryor@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
integrity sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=

ts-loader@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0"
Expand Down Expand Up @@ -10560,14 +10465,6 @@ wbuf@^1.1.0, wbuf@^1.4.0:
dependencies:
minimalistic-assert "^1.0.0"

webpack-core@^0.6.5:
version "0.6.9"
resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
dependencies:
source-list-map "~0.1.7"
source-map "~0.4.1"

webpack-dev-middleware@^1.10.2:
version "1.10.2"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
Expand Down

0 comments on commit af2381b

Please sign in to comment.