Skip to content
Open
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
13 changes: 5 additions & 8 deletions packages/metro/src/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ export default class Server {
processModuleFilter: this._config.serializer.processModuleFilter,
assetPlugins: this._config.transformer.assetPlugins,
platform,
projectRoot: this._getServerRootDir(),
projectRoot: this._config.projectRoot,
publicPath: this._config.transformer.publicPath,
});
}
Expand Down Expand Up @@ -1369,13 +1369,10 @@ export default class Server {
{onProgress, shallow: false, lazy: false},
);

return await getAssets(dependencies, {
processModuleFilter: this._config.serializer.processModuleFilter,
assetPlugins: this._config.transformer.assetPlugins,
platform: transformOptions.platform,
publicPath: this._config.transformer.publicPath,
projectRoot: this._config.projectRoot,
});
return await this._getAssetsFromDependencies(
dependencies,
transformOptions.platform,
);
Comment on lines +1372 to +1375

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is behaviour preserving - this _processAssetsRequest path (which serves *.assets requests - whole-bundle asset manifests - this is not the /assets server) already passed projectRoot: this._config.projectRoot and so was already correct.

The change here just reuses _getAssetsFromDependencies now that that has been changed to match.

},
finish({mres, result}) {
mres.setHeader('Content-Type', 'application/json');
Expand Down
25 changes: 25 additions & 0 deletions packages/metro/src/Server/__tests__/Server-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ describe('processRequest', () => {
let getTransformFn;
let getResolveDependencyFn;
let getAsset;
let getAssetsSerializer;

beforeEach(() => {
jest.resetModules();
Expand All @@ -76,6 +77,7 @@ describe('processRequest', () => {
getTransformFn = jest.fn();
getResolveDependencyFn = jest.fn();
getAsset = jest.fn();
getAssetsSerializer = jest.fn().mockResolvedValue([]);

let i = 0;
jest.doMock('node:crypto', () => ({
Expand Down Expand Up @@ -114,6 +116,11 @@ describe('processRequest', () => {
.mockImplementation(buildGraph);
jest.spyOn(DeltaBundler.prototype, 'getDelta').mockImplementation(getDelta);

jest.doMock('../../DeltaBundler/Serializers/getAssets', () => ({
__esModule: true,
default: getAssetsSerializer,
}));

Server = require('../../Server').default;
});

Expand Down Expand Up @@ -1521,6 +1528,24 @@ describe('processRequest', () => {
);
});

describe('asset URL roots', () => {
test('anchors asset URLs on projectRoot, not unstable_serverRoot', async () => {
// $FlowFixMe[unclear-type] - reaching for a private method under test.
const serverRootServer: any = new Server(
mergeConfig(config, {
server: {unstable_serverRoot: '/'},
} as InputConfigT),
);

await serverRootServer._getAssetsFromDependencies(new Map(), 'ios');

expect(getAssetsSerializer).toBeCalledWith(
expect.anything(),
expect.objectContaining({projectRoot: '/root'}),
);
});
});

describe('watchFolder prefix resolution', () => {
let watchFolderServer: $FlowFixMe;

Expand Down
Loading