-
-
Notifications
You must be signed in to change notification settings - Fork 342
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into capture-app-start-errors
- Loading branch information
Showing
36 changed files
with
331 additions
and
375 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,7 +44,7 @@ jobs: | |
|
|
||
| # Initializes the CodeQL tools for scanning. | ||
| - name: Initialize CodeQL | ||
| uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # [email protected].1 | ||
| uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # [email protected].8 | ||
| with: | ||
| languages: ${{ matrix.language }} | ||
| # If you wish to specify custom queries, you can do so here or in a config file. | ||
|
|
@@ -55,7 +55,7 @@ jobs: | |
| # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). | ||
| # If this step fails, then you should remove it and run the build manually (see below) | ||
| - name: Autobuild | ||
| uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # [email protected].1 | ||
| uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # [email protected].8 | ||
|
|
||
| # ℹ️ Command-line programs to run using the OS shell. | ||
| # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions | ||
|
|
@@ -66,4 +66,4 @@ jobs: | |
| # make bootstrap | ||
| # make release | ||
| - name: Perform CodeQL Analysis | ||
| uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # [email protected].1 | ||
| uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # [email protected].8 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| module.exports = {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| const path = require('path'); | ||
| const exclusionList = require('metro-config/src/defaults/exclusionList'); | ||
|
|
||
| /** | ||
| * Packages used by the sample apps | ||
| */ | ||
| const getMonorepoPackages = monorepoRoot => { | ||
| return { | ||
| '@sentry/react-native': path.resolve(monorepoRoot, 'packages/core'), | ||
| }; | ||
| }; | ||
|
|
||
| /** | ||
| * Block given packages present in the monorepo packages to avoid conflicts with the sample apps | ||
| */ | ||
| const getBlockList = (monorepoPackages, excludedPackages) => { | ||
| return Object.values(monorepoPackages) | ||
| .map(p => excludedPackages.map(e => new RegExp(`${p}/node_modules/${e}/.*`))) | ||
| .flat(); | ||
| }; | ||
|
|
||
| const withMonorepo = config => { | ||
| const projectRoot = config.projectRoot; | ||
| if (!projectRoot) { | ||
| throw new Error('projectRoot is required'); | ||
| } | ||
|
|
||
| const monorepoRoot = path.resolve(projectRoot, '../..'); | ||
| const monorepoPackages = getMonorepoPackages(monorepoRoot); | ||
|
|
||
| config.resolver = config.resolver || {}; | ||
|
|
||
| const blockList = [ | ||
| ...((Array.isArray(config.resolver.blockList) && config.resolver.blockList) || | ||
| (!!config.resolver.blockList && [config.resolver.blockList]) || | ||
| []), | ||
| ...getBlockList(monorepoPackages, ['react-native', 'react']), | ||
| new RegExp('.*\\android\\.*'), // Required for Windows in order to run the Sample. | ||
| ]; | ||
| config.resolver.blockList = exclusionList(blockList); | ||
|
|
||
| config.watchFolders = [...(config.watchFolders || []), projectRoot, ...Object.values(monorepoPackages)]; | ||
|
|
||
| config.resolver.extraNodeModules = { | ||
| ...config.resolver.extraNodeModules, | ||
| ...monorepoPackages, | ||
| 'react-native': path.resolve(projectRoot, 'node_modules/react-native'), | ||
| react: path.resolve(projectRoot, 'node_modules/react'), | ||
| }; | ||
|
|
||
| config.resolver.nodeModulesPaths = [ | ||
| ...(config.resolver.nodeModulesPaths || []), | ||
| path.resolve(projectRoot, 'node_modules'), | ||
| ...Object.values(monorepoPackages).map(p => path.resolve(p, 'node_modules')), | ||
| ]; | ||
|
|
||
| return config; | ||
| }; | ||
|
|
||
| module.exports = { | ||
| withMonorepo, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "name": "sentry-react-native-samples-utils", | ||
| "version": "6.6.0", | ||
| "description": "Internal Samples Utils", | ||
| "main": "index.js", | ||
| "license": "MIT", | ||
| "private": true, | ||
| "dependencies": { | ||
| "metro-config": "^0.81.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| extern NSString *const NATIVE_SDK_NAME; | ||
| extern NSString *const REACT_NATIVE_SDK_NAME; | ||
| extern NSString *const REACT_NATIVE_SDK_PACKAGE_NAME; | ||
| extern NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| #import "RNSentryVersion.h" | ||
|
|
||
| NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native"; | ||
| NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native"; | ||
| NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native"; | ||
| NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.5.0"; | ||
| NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.6.0"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native'; | ||
| export const SDK_NAME = 'sentry.javascript.react-native'; | ||
| export const SDK_VERSION = '6.5.0'; | ||
| export const SDK_VERSION = '6.6.0'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.