diff --git a/packages/metro/src/JSTransformer/worker/__tests__/worker-test.js b/packages/metro/src/JSTransformer/worker/__tests__/worker-test.js index d1a4caae..696ec83d 100644 --- a/packages/metro/src/JSTransformer/worker/__tests__/worker-test.js +++ b/packages/metro/src/JSTransformer/worker/__tests__/worker-test.js @@ -30,7 +30,7 @@ describe('code transformation worker:', () => { 'arbitrary/file.js', `local/file.js`, 'someReallyArbitrary(code)', - require.resolve('metro/src/transformer.js'), + path.join(__dirname, '../../../transformer.js'), true, { dev: true, @@ -59,7 +59,7 @@ describe('code transformation worker:', () => { 'arbitrary/file.js', `local/file.js`, 'arbitrary(code)', - require.resolve('metro/src/transformer.js'), + path.join(__dirname, '../../../transformer.js'), false, { dev: true, @@ -94,7 +94,7 @@ describe('code transformation worker:', () => { 'const b = require("b");', 'import c from "./c";', ].join('\n'), - require.resolve('metro/src/transformer.js'), + path.join(__dirname, '../../../transformer.js'), false, { dev: true, diff --git a/packages/metro/src/lib/__tests__/getTransformCacheKeyFn-test.js b/packages/metro/src/lib/__tests__/getTransformCacheKeyFn-test.js index 83a8e8d7..609319df 100644 --- a/packages/metro/src/lib/__tests__/getTransformCacheKeyFn-test.js +++ b/packages/metro/src/lib/__tests__/getTransformCacheKeyFn-test.js @@ -16,6 +16,7 @@ jest.mock('../../../package.json', () => ({ })); const getTransformCacheKeyFn = require('../getTransformCacheKeyFn'); +const path = require('path'); describe('getTransformCacheKeyFn', () => { it('Should return always the same key for the same params', async () => { @@ -25,7 +26,10 @@ describe('getTransformCacheKeyFn', () => { cacheVersion: '1.0', dynamicDepsInPackages: 'arbitrary', projectRoots: [__dirname], - transformModulePath: require.resolve('metro/src/defaultTransform.js'), + transformModulePath: path.resolve( + __dirname, + '../../defaultTransform.js', + ), })(), ).toMatchSnapshot(); }); @@ -36,7 +40,7 @@ describe('getTransformCacheKeyFn', () => { cacheVersion: '1.0', dynamicDepsInPackages: 'arbitrary', projectRoots: [__dirname], - transformModulePath: require.resolve('metro/src/defaultTransform.js'), + transformModulePath: path.resolve(__dirname, '../../defaultTransform.js'), }; const changedParams = [ @@ -50,7 +54,10 @@ describe('getTransformCacheKeyFn', () => { }, { ...baseParams, - transformModulePath: require.resolve('metro/src/transformer.js'), + transformModulePath: path.resolve( + __dirname, + '../../../src/transformer.js', + ), }, ]; diff --git a/packages/metro/src/lib/getPreludeCode.js b/packages/metro/src/lib/getPreludeCode.js index 75d71da5..2b5e712f 100644 --- a/packages/metro/src/lib/getPreludeCode.js +++ b/packages/metro/src/lib/getPreludeCode.js @@ -29,7 +29,7 @@ function getPreludeCode({ } function formatExtraVars(extraVars) { - const assignments = []; + let assignments = []; for (const key in extraVars) { assignments.push(`${key}=${JSON.stringify(extraVars[key])}`); } diff --git a/packages/metro/src/transformer.js b/packages/metro/src/transformer.js index cdc52af3..2a09f2de 100644 --- a/packages/metro/src/transformer.js +++ b/packages/metro/src/transformer.js @@ -60,7 +60,7 @@ const getBabelRC = (function() { // use the Babel config provided with react-native. if (!projectBabelRCPath || !fs.existsSync(projectBabelRCPath)) { babelRC = json5.parse( - fs.readFileSync(require.resolve('metro/rn-babelrc.json')), + fs.readFileSync(path.resolve(__dirname, '..', 'rn-babelrc.json')), ); // Require the babel-preset's listed in the default babel config