Skip to content

[v12.x backport] deps: update to cjs-module-lexer@1.2.2 #39422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guybedford wants to merge 15 commits into from
Closed

[v12.x backport] deps: update to cjs-module-lexer@1.2.2 #39422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f186283
[v12.x] deps: update to cjs-module-lexer@1.1.1
guybedford Mar 30, 2021
daab721
build: label PRs with GitHub Action instead of nodejs-github-bot
phillipj Mar 6, 2021
be1fbc2
build: fix label-pr workflow
targos Apr 25, 2021
ca90848
deps: V8: cherry-pick 530080c44af2
May 3, 2021
f1f3949
deps: V8: backport 1b1eda0876aa
targos Jul 3, 2021
e60c91c
deps: V8: cherry-pick 92e6d3317082
targos Jul 3, 2021
1f5f768
deps: V8: cherry-pick e6f62a41f5ee
targos Jul 3, 2021
4a678dd
deps: V8: cherry-pick 7b3332844212
targos Jul 3, 2021
a223078
deps: V8: cherry-pick cc641f6be756
targos Jul 3, 2021
366db63
deps: V8: cherry-pick 7c182bd65f42
targos Jul 3, 2021
c683f6e
deps: V8: cherry-pick 0b3a4ecf7083
targos Jul 7, 2021
5627e37
deps: V8: backport 895949419186
targos Jul 7, 2021
61c274b
deps: V8: update build dependencies
targos Jul 3, 2021
da140d3
deps: update to cjs-module-lexer@1.2.1
guybedford Apr 28, 2021
295ec0d
deps: update to cjs-module-lexer@1.2.2
guybedford Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: V8: cherry-pick 92e6d3317082 
Original commit message:

    build: Remove no-op calls to set_sources_assignment_filter

    Chromiun no longer use set_sources_assignment_filter() anywhere in the
    build, so these are no longer needed.

    Bug: chromium:1018739
    Change-Id: I7b33612d925563ebca0d93a7d3c9183d7305b7b0
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2456988
    Reviewed-by: Nico Weber <thakis@chromium.org>
    Commit-Queue: Nico Weber <thakis@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#70405}

Refs: v8/v8@92e6d33

PR-URL: #39245
Refs: nodejs/build#2696
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
@targos
targos committed Jul 11, 2021
commit e60c91cea4aabadcb789b76ef76a8c52dd900dca
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.48',
'v8_embedder_string': '-node.49',

##### V8 defaults for Node.js #####

Expand Down
18 changes: 4 additions & 14 deletions deps/v8/testing/gtest/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import("//build_overrides/gtest.gni")
if (is_ios) {
import("//build/buildflag_header.gni")
import("//build/config/coverage/coverage.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/buildflag_header.gni")
}

config("gtest_direct_config") {
Expand Down Expand Up @@ -40,9 +40,7 @@ static_library("gtest") {
# Android. https://codereview.chromium.org/2852613002/#ps20001
"empty.cc",
]
public_deps = [
"//third_party/googletest:gtest",
]
public_deps = [ "//third_party/googletest:gtest" ]

public_configs = [ ":gtest_direct_config" ]

Expand All @@ -58,27 +56,21 @@ static_library("gtest") {
}

if ((is_mac || is_ios) && gtest_include_objc_support) {
if (is_ios) {
set_sources_assignment_filter([])
}
sources += [
"../gtest_mac.h",
"../gtest_mac.mm",
]
if (gtest_include_platform_test) {
sources += [ "../platform_test_mac.mm" ]
}
set_sources_assignment_filter(sources_assignment_filter)
}

if (is_ios && gtest_include_ios_coverage) {
sources += [
"../coverage_util_ios.h",
"../coverage_util_ios.mm",
]
deps = [
":ios_enable_coverage",
]
deps = [ ":ios_enable_coverage" ]
}
}

Expand All @@ -87,9 +79,7 @@ static_library("gtest") {
# into //third_party/googletest.
source_set("gtest_main") {
testonly = true
deps = [
"//third_party/googletest:gtest_main",
]
deps = [ "//third_party/googletest:gtest_main" ]
}

if (is_ios) {
Expand Down