Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Use babel instead of metro to resolve lib from example app by mfazekas · Pull Request #1981 · rnmapbox/maps · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,11 @@ module.exports = {
files: ['**/*.{ts,tsx}'],

parserOptions: {
project: './tsconfig.json',
project: [
'./tsconfig.json',
'./example/tsconfig.json',
'./plugin/src/__tests__/tsconfig.eslint.json',
],
},
plugins: ['@typescript-eslint'],
extends: [
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-push.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Type check
run: yarn type:check

- name: Test
run: yarn unittest

Expand Down
49 changes: 43 additions & 6 deletions example/babel.config.js
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [
'@babel/plugin-transform-modules-commonjs',
['module-resolver'],
].filter(Boolean),
module.exports = (api) => {
const isWeb = api.caller(isTargetWeb);

return {
presets: [
'@babel/preset-typescript',
'module:metro-react-native-babel-preset',
],
plugins: [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-transform-modules-commonjs',
isWeb
? [
'module-resolver',
{
alias: {
'@rnmapbox/maps': './maps/',
},
},
]
: [
'module-resolver',
{
alias: {
'@rnmapbox/maps': '../javascript',
react: './node_modules/react',
'react-native': './node_modules/react-native',
'@babel': './node_modules/@babel',
'@turf': './node_modules/@turf',
'@mapbox': './node_modules/@mapbox',
debounce: './node_modules/debounce',
'prop-types': './node_modules/prop-types',
'deprecated-react-native-prop-types':
'./node_modules/deprecated-react-native-prop-types',
},
},
],
].filter(Boolean),
};
};

function isTargetWeb(caller) {
return caller && caller.name === 'babel-loader';
}
54 changes: 26 additions & 28 deletions example/metro.config.js
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
/**
* Metro configuration for React Native
* https://github.com/facebook/react-native
*
* @format
*/
const path = require('path');
const fs = require('fs');

/*
See

https://medium.com/@dushyant_db/how-to-import-files-from-outside-of-root-directory-with-react-native-metro-bundler-18207a348427
*/

// exclusionList is a function that takes an array of regexes and combines
// them with the default exclusions to return a single regex.
const exclusionList = require('metro-config/src/defaults/exclusionList');
const blacklist = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};
const assetRegistryPath = fs
.realpathSync(require.resolve('react-native/Libraries/Image/AssetRegistry'))
.replace('.js', '');

const inlineRequireBlockList = new Proxy(
{},
{
has: (target, name) => {
if (
name.endsWith('.js') &&
name.includes('/react-navigation-stack/lib/module/vendor/views/')
) {
return true;
}
return false;
},
},
);

function getBlacklist() {
const nodeModuleDirs = [
glob(`${path.resolve(__dirname, '..')}/node_modules/*`),
glob(`${path.resolve(__dirname, '..')}/docs/*`),
glob(`${path.resolve(__dirname, '..')}/e2e/*`),
glob(`${path.resolve(__dirname)}/node_modules/*/node_modules/fbjs/*`),
glob(
`${path.resolve(__dirname)}/node_modules/*/node_modules/lodash.isequal/*`,
),
glob(
`${path.resolve(
__dirname,
Expand All@@ -38,26 +42,20 @@ function getBlacklist() {
)}/node_modules/react-native/node_modules/@babel/*`,
),
];
return exclusionList(nodeModuleDirs);
return blacklist(nodeModuleDirs);
}

module.exports = {
resolver: {
blacklistRE: getBlacklist(),
extraNodeModules: new Proxy(extraNodeModules, {
get: (target, name) => {
return name in target
? target[name]
: path.join(process.cwd(), `node_modules/${name}`);
},
}),
},
watchFolders: [path.resolve(__dirname, '..')],
transformer: {
assetRegistryPath: assetRegistryPath,
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: true,
inlineRequires: { blockList: inlineRequireBlockList },
},
}),
},
Expand Down
5 changes: 3 additions & 2 deletions example/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,11 +37,12 @@
"react-native-screens": "^3.0.0",
"react-native-svg": "^12.1.0",
"react-native-vector-icons": "9.0.0",
"react-navigation": "^4.3.7",
"react-navigation-stack": "^2.3.11"
"react-navigation": "^4.4.4",
"react-navigation-stack": "^2.10.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-typescript": "^7.12.17",
"@babel/runtime": "^7.12.5",
"babel-plugin-module-resolver": "^4.1.0",
"detox": "^19.1.0 <19.5.2 || >19.5.2",
Expand Down
11 changes: 11 additions & 0 deletions example/tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@rnmapbox/maps": ["../"],
"react": ["./node_modules/@types/react"],
}
},
"include": ["index.js", "src/**/*", "../index.ts", "../javascript/**/*"]
}
5 changes: 4 additions & 1 deletion index.d.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import {
FeatureCollection,
} from '@turf/helpers';

import type { requestAndroidLocationPermissions as _requestAndroidLocationPermissions } from './javascript/requestAndroidLocationPermissions';

// prettier-ignore
type ExpressionName =
// Types
Expand DownExpand Up@@ -108,7 +110,8 @@ declare namespace MapboxGL {
function getAccessToken(): Promise<string>;
function setTelemetryEnabled(telemetryEnabled: boolean): void;
function setConnected(connected: boolean): void;
function requestAndroidLocationPermissions(): Promise<boolean>;

const requestAndroidLocationPermissions = _requestAndroidLocationPermissions;

const offlineManager: OfflineManager;
const snapshotManager: SnapshotManager;
Expand Down
Loading