diff --git a/WORKSPACE b/WORKSPACE index 9afe827395..bebdde2429 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,13 +15,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"], + sha256 = "251a023b6c5c5c97db1bfe24652dc19dad05f4da68f8e1821d92d911fa3f4ef4", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.4/rules_nodejs-0.27.4.tar.gz"], ) # Check the bazel version and download npm dependencies -load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install") -load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version") +load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "check_rules_nodejs_version", "node_repositories", "yarn_install") # Bazel version must be at least v0.21.0 because: # - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel` diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE index f5d449ee76..719938acea 100644 --- a/integration/bazel/WORKSPACE +++ b/integration/bazel/WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Fetch rules_nodejs so we can install our npm dependencies http_archive( name = "build_bazel_rules_nodejs", - sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"], + sha256 = "251a023b6c5c5c97db1bfe24652dc19dad05f4da68f8e1821d92d911fa3f4ef4", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.4/rules_nodejs-0.27.4.tar.gz"], ) # Fetch sass rules for compiling sass files diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json index cbc9b7b875..42b8a0aa7a 100644 --- a/integration/bazel/src/package.json +++ b/integration/bazel/src/package.json @@ -18,7 +18,7 @@ "@angular/bazel": "packages-dist:bazel", "@angular/compiler": "packages-dist:compiler", "@angular/compiler-cli": "packages-dist:compiler-cli", - "@bazel/karma": "0.26.0", + "@bazel/karma": "0.27.4", "@types/jasmine": "2.8.8", "@types/source-map": "0.5.1", "protractor": "5.1.2", diff --git a/package.json b/package.json index a802231409..01cebc7c1f 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ "@angular-devkit/core": "^7.3.2", "@angular-devkit/schematics": "^7.3.2", "@angular/bazel": "file:./tools/npm/@angular_bazel", - "@bazel/jasmine": "0.26.0", - "@bazel/karma": "0.26.0", - "@bazel/typescript": "0.26.0", + "@bazel/jasmine": "0.27.4", + "@bazel/karma": "0.27.4", + "@bazel/typescript": "0.27.4", "@microsoft/api-extractor": "^7.0.21", "@schematics/angular": "^7.3.5", "@types/angular": "^1.6.47", @@ -86,6 +86,7 @@ "protractor": "^5.4.2", "reflect-metadata": "^0.1.3", "rollup": "^1.1.0", + "rollup-plugin-commonjs": "^9.2.1", "rollup-plugin-node-resolve": "^4.0.0", "rollup-plugin-sourcemaps": "^0.4.2", "rxjs": "^6.4.0", @@ -142,7 +143,6 @@ "madge": "0.5.0", "mutation-observer": "^1.0.3", "rewire": "2.5.2", - "rollup-plugin-commonjs": "8.1.0", "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz", "semver": "5.4.1", "tslint-eslint-rules": "4.1.1", diff --git a/packages/bazel/package.json b/packages/bazel/package.json index 6f086b2ee9..3122871b88 100644 --- a/packages/bazel/package.json +++ b/packages/bazel/package.json @@ -22,7 +22,7 @@ "@angular-devkit/architect": "^0.13.4", "@angular-devkit/core": "^7.0.4", "@angular-devkit/schematics": "^7.3.0-rc.0", - "@bazel/typescript": "^0.26.0", + "@bazel/typescript": "^0.27.4", "@microsoft/api-extractor": "^7.0.21", "@schematics/angular": "^7.3.5", "@types/node": "6.0.84", diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel index c7cd30b973..9be8244bc0 100644 --- a/packages/bazel/src/BUILD.bazel +++ b/packages/bazel/src/BUILD.bazel @@ -16,6 +16,7 @@ nodejs_binary( "@npm//@angular-devkit/build-optimizer", "@npm//is-builtin-module", "@npm//rollup", + "@npm//rollup-plugin-commonjs", "@npm//rollup-plugin-node-resolve", "@npm//rollup-plugin-sourcemaps", ], diff --git a/packages/bazel/src/builders/files/WORKSPACE.template b/packages/bazel/src/builders/files/WORKSPACE.template index 3d1fc71a93..c6ddd11b4a 100644 --- a/packages/bazel/src/builders/files/WORKSPACE.template +++ b/packages/bazel/src/builders/files/WORKSPACE.template @@ -12,10 +12,10 @@ workspace(name = "project") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -RULES_NODEJS_VERSION = "0.26.0" +RULES_NODEJS_VERSION = "0.27.4" http_archive( name = "build_bazel_rules_nodejs", - sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", + sha256 = "251a023b6c5c5c97db1bfe24652dc19dad05f4da68f8e1821d92d911fa3f4ef4", url = "https://github.com/bazelbuild/rules_nodejs/releases/download/%s/rules_nodejs-%s.tar.gz" % (RULES_NODEJS_VERSION, RULES_NODEJS_VERSION), ) diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl index 33bcf26085..1171d008b2 100644 --- a/packages/bazel/src/ng_package/ng_package.bzl +++ b/packages/bazel/src/ng_package/ng_package.bzl @@ -20,7 +20,7 @@ load( "@build_bazel_rules_nodejs//:internal/rollup/rollup_bundle.bzl", "ROLLUP_ATTRS", "ROLLUP_DEPS_ASPECTS", - "run_uglify", + "run_terser", "write_rollup_config", ) load( @@ -309,13 +309,13 @@ def _ng_package_impl(ctx): include_tslib = True, ), ) - uglify_sourcemap = run_uglify( + terser_sourcemap = run_terser( ctx, umd_output, min_output, config_name = entry_point.replace("/", "_"), ) - bundles.append(struct(js = min_output, map = uglify_sourcemap)) + bundles.append(struct(js = min_output, map = terser_sourcemap)) packager_inputs = ( ctx.files.srcs + @@ -433,11 +433,6 @@ NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **dict(ROLLUP_ATTRS, **{ default = Label("@build_bazel_rules_nodejs//internal/rollup:rollup.config.js"), allow_single_file = True, ), - "_uglify": attr.label( - default = Label("@build_bazel_rules_nodejs//internal/rollup:uglify"), - executable = True, - cfg = "host", - ), })) # Angular wants these named after the entry_point, diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl index 502697390f..0aadf42a6b 100644 --- a/packages/bazel/src/ng_rollup_bundle.bzl +++ b/packages/bazel/src/ng_rollup_bundle.bzl @@ -21,7 +21,7 @@ load( "ROLLUP_OUTPUTS", "run_rollup", "run_sourcemapexplorer", - "run_uglify", + "run_terser", "write_rollup_config", ) load("@build_bazel_rules_nodejs//internal/common:collect_es6_sources.bzl", collect_es2015_sources = "collect_es6_sources") @@ -101,10 +101,12 @@ def _run_tsc(ctx, input, output): # Borrowed from bazelbuild/rules_nodejs, with the addition of brotli compression output def _plain_rollup_bundle(ctx): rollup_config = write_rollup_config(ctx) - run_rollup(ctx, collect_es2015_sources(ctx), rollup_config, ctx.outputs.build_es6) - _run_tsc(ctx, ctx.outputs.build_es6, ctx.outputs.build_es5) - source_map = run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min) - run_uglify(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True) + run_rollup(ctx, collect_es2015_sources(ctx), rollup_config, ctx.outputs.build_es2015) + run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min, config_name = ctx.label.name + "es2015_min") + run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min_debug, debug = True, config_name = ctx.label.name + "es2015_min_debug") + _run_tsc(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es5) + source_map = run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min) + run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True) umd_rollup_config = write_rollup_config(ctx, filename = "_%s_umd.rollup.conf.js", output_format = "umd") run_rollup(ctx, collect_es2015_sources(ctx), umd_rollup_config, ctx.outputs.build_umd) cjs_rollup_config = write_rollup_config(ctx, filename = "_%s_cjs.rollup.conf.js", output_format = "cjs") @@ -123,25 +125,44 @@ def _ng_rollup_bundle(ctx): # We don't expect anyone to make use of this bundle yet, but it makes this rule # compatible with rollup_bundle which allows them to be easily swapped back and # forth. - esm2015_rollup_config = write_rollup_config(ctx, filename = "_%s.rollup_es6.conf.js") - run_rollup(ctx, collect_es2015_sources(ctx), esm2015_rollup_config, ctx.outputs.build_es6) + esm2015_rollup_config = write_rollup_config(ctx, filename = "_%s.rollup_es2015.conf.js") + esm2015_rollup_sourcemap = run_rollup(ctx, collect_es2015_sources(ctx), esm2015_rollup_config, ctx.outputs.build_es2015) + + run_terser( + ctx, + ctx.outputs.build_es2015, + ctx.outputs.build_es2015_min, + config_name = ctx.label.name + "es2015_min", + comments = False, + in_source_map = esm2015_rollup_sourcemap, + ) + run_terser( + ctx, + ctx.outputs.build_es2015, + ctx.outputs.build_es2015_min_debug, + config_name = ctx.label.name + "es2015_min_debug", + debug = True, + comments = False, + ) esm5_sources = flatten_esm5(ctx) rollup_config = write_rollup_config(ctx, [BO_PLUGIN], "/".join([ctx.bin_dir.path, ctx.label.package, esm5_root_dir(ctx)])) rollup_sourcemap = run_rollup(ctx, esm5_sources, rollup_config, ctx.outputs.build_es5) - sourcemap = run_uglify( + sourcemap = run_terser( ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min, + config_name = ctx.label.name + "es5_min", comments = False, in_source_map = rollup_sourcemap, ) - run_uglify( + run_terser( ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, + config_name = ctx.label.name + "es5_min_debug", debug = True, comments = False, ) diff --git a/packages/bazel/src/schematics/ng-add/index.ts b/packages/bazel/src/schematics/ng-add/index.ts index 7cd3c7d69b..e8a0d3dd3d 100755 --- a/packages/bazel/src/schematics/ng-add/index.ts +++ b/packages/bazel/src/schematics/ng-add/index.ts @@ -46,7 +46,7 @@ function addDevDependenciesToPackageJson(options: Schema) { '@angular/upgrade': angularCoreVersion, '@bazel/bazel': '^0.23.0', '@bazel/ibazel': '^0.9.0', - '@bazel/karma': '^0.26.0', + '@bazel/karma': '^0.27.4', }; const recorder = host.beginUpdate(packageJson); diff --git a/packages/language-service/bundles/rollup.bzl b/packages/language-service/bundles/rollup.bzl index ffc53d28ae..9e0801d7db 100644 --- a/packages/language-service/bundles/rollup.bzl +++ b/packages/language-service/bundles/rollup.bzl @@ -14,7 +14,7 @@ load( "ROLLUP_ATTRS", "ROLLUP_DEPS_ASPECTS", "run_rollup", - "run_uglify", + "run_terser", "write_rollup_config", ) load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "esm5_root_dir", "flatten_esm5") @@ -41,7 +41,7 @@ def _ls_rollup_bundle(ctx): output_format = "amd", ) run_rollup(ctx, esm5_sources, rollup_config, ctx.outputs.build_umd) - source_map = run_uglify(ctx, ctx.outputs.build_umd, ctx.outputs.build_umd_min) + source_map = run_terser(ctx, ctx.outputs.build_umd, ctx.outputs.build_umd_min) return DefaultInfo(files = depset([ctx.outputs.build_umd, ctx.outputs.build_umd_min, source_map])) ls_rollup_bundle = rule( diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel index 7d7d095512..267f9a9dd0 100644 --- a/packages/service-worker/BUILD.bazel +++ b/packages/service-worker/BUILD.bazel @@ -26,7 +26,7 @@ genrule( genrule( name = "ngsw_worker_renamed", - srcs = ["//packages/service-worker/worker:ngsw_worker.es6.js"], + srcs = ["//packages/service-worker/worker:ngsw_worker.es2015.js"], outs = ["ngsw-worker.js"], # Remove sourcemap since this file will be served in production site # See https://github.com/angular/angular/issues/23596 diff --git a/yarn.lock b/yarn.lock index c0a62eb814..703a9a433c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -127,17 +127,17 @@ resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd" integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow== -"@bazel/jasmine@0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0.tgz#f7aed169b057b5af547d2573657b394ecbda0b5d" - integrity sha512-lkvzPHdbSEe1zitnV1hIBwodriXqp/ClHSZQJ5Y486UaLQ6Sm7k7gV2phOwtg7LqLVZnElZDmFLSI0/O1UYYyQ== +"@bazel/jasmine@0.27.4": + version "0.27.4" + resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.27.4.tgz#1b6548def3d35ed14799681cab27a01d776d2835" + integrity sha512-rFNZTFYWVSYqK5CqfBtbC7TL2FofIEYfM5Q8gWol8Lc6ChLjI5574jtmqWyJDMjRskKmJUDz4m5gaiE+BoKHeA== dependencies: jasmine "~3.3.1" -"@bazel/karma@0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2" - integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg== +"@bazel/karma@0.27.4": + version "0.27.4" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.27.4.tgz#06c36515740f9d2cbcacb2783dd2f9b5c50ed386" + integrity sha512-6dIKxsktWaLMj1G7rV/6GCi4O6z75t57O+alD+WVThsKdqGdQ9PH6qRcw7VnUo+J9d6GA5Kr922b6XAE8m1q2g== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -151,12 +151,11 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82" - integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A== +"@bazel/typescript@0.27.4": + version "0.27.4" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.27.4.tgz#412e438338675aeab34dcf5e57ed5e0705e8fed4" + integrity sha512-DvonqvUyiwgADRUMO4hpJlk/24LbBjPsNevPyHDKF3x2hH0IGH0NQ0MrulNHCY7xkg7vfMF4lLaHoCnuXhrVzA== dependencies: - jasmine-core "2.8.0" protobufjs "5.0.3" semver "5.6.0" source-map-support "0.5.9" @@ -548,11 +547,6 @@ acorn@^1.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014" integrity sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ= -acorn@^4.0.1: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c= - acorn@^5.2.1: version "5.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" @@ -3305,16 +3299,16 @@ esprima@~3.1.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= -estree-walker@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" - integrity sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao= - estree-walker@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig== +estree-walker@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae" + integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw== + esutils@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375" @@ -6617,13 +6611,6 @@ madge@0.5.0: uglify-js "1.2.6" walkdir "0.0.5" -magic-string@^0.19.0: - version "0.19.1" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201" - integrity sha1-FNdoATyvLsj96hakmvgvw3fnUgE= - dependencies: - vlq "^0.2.1" - magic-string@^0.25.0: version "0.25.0" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b" @@ -6631,6 +6618,13 @@ magic-string@^0.25.0: dependencies: sourcemap-codec "^1.4.1" +magic-string@^0.25.1: + version "0.25.2" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9" + integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg== + dependencies: + sourcemap-codec "^1.4.4" + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -8809,10 +8803,10 @@ resolve@^0.7.1: resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.7.4.tgz#395a9ef9e873fbfe12bd14408bd91bb936003d69" integrity sha1-OVqe+ehz+/4SvRRAi9kbuTYAPWk= -resolve@^1.8.1: - version "1.9.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" - integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== +resolve@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== dependencies: path-parse "^1.0.6" @@ -8916,25 +8910,24 @@ rndm@1.2.0: resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c" integrity sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w= -rollup-plugin-commonjs@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0" - integrity sha512-mxLU0oCZPakY+o1P9OeVG+yT7bGOFyRQf6pk3xden2+sEG2NP40CrKWw1h/BHZuK7yegRcOJMCfr/uzLmodrGQ== +rollup-plugin-commonjs@^9.2.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.1.tgz#bb151ca8fa23600c7a03e25f9f0a45b1ee922dac" + integrity sha512-X0A/Cp/t+zbONFinBhiTZrfuUaVwRIp4xsbKq/2ohA2CDULa/7ONSJTelqxon+Vds2R2t2qJTqJQucKUC8GKkw== dependencies: - acorn "^4.0.1" - estree-walker "^0.3.0" - magic-string "^0.19.0" - resolve "^1.1.7" - rollup-pluginutils "^2.0.1" + estree-walker "^0.5.2" + magic-string "^0.25.1" + resolve "^1.10.0" + rollup-pluginutils "^2.3.3" rollup-plugin-node-resolve@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz#9bc6b8205e9936cc0e26bba2415f1ecf1e64d9b2" - integrity sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw== + version "4.0.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422" + integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg== dependencies: builtin-modules "^3.0.0" is-module "^1.0.0" - resolve "^1.8.1" + resolve "^1.10.0" rollup-plugin-sourcemaps@^0.4.2: version "0.4.2" @@ -8952,6 +8945,14 @@ rollup-pluginutils@^2.0.1: estree-walker "^0.5.2" micromatch "^2.3.11" +rollup-pluginutils@^2.3.3: + version "2.4.1" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz#de43ab54965bbf47843599a7f3adceb723de38db" + integrity sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw== + dependencies: + estree-walker "^0.6.0" + micromatch "^3.1.10" + rollup@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.1.0.tgz#461a7534b55be48aa4a6e6810a1543a5769e75d1" @@ -9548,6 +9549,11 @@ sourcemap-codec@^1.4.1: resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2" integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA== +sourcemap-codec@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" + integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== + sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" @@ -10797,11 +10803,6 @@ vlq@0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1" integrity sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE= -vlq@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" - integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== - vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"