kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 20:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prettify remaining unprettified files (#21327)

Browse Source 
Summary:
This PR is the result of running `yarn prettify` on the codebase - which caught a few files that were not prettified. This will make instructing people to run prettify a bit less complicated, since unrelated files will not show up in diffs.
Pull Request resolved: https://github.com/facebook/react-native/pull/21327

Differential Revision: D10046057

Pulled By: TheSavior

fbshipit-source-id: 2c771a3c758c72816c707e32ee2f4587e466f277
This commit is contained in:
empyrical
2018-09-25 19:37:32 -07:00
committed by Facebook Github Bot
parent ae1817fdb9
commit 2da60a8f45
9 changed files with 418 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
View File

@@ -68,6 +68,8 @@ describe('getAssetDestPathAndroid', () => {
httpServerLocation: '/assets/app/test',
};
expect(getAssetDestPathAndroid(asset, 1)).toBe(path.normalize('raw/app_test_video.mp4'));
expect(getAssetDestPathAndroid(asset, 1)).toBe(
path.normalize('raw/app_test_video.mp4'),
);
});
});

12
local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
View File

@@ -23,7 +23,9 @@ describe('getAssetDestPathIOS', () => {
httpServerLocation: '/assets/test',
};
expect(getAssetDestPathIOS(asset, 1)).toBe(path.normalize('assets/test/icon.png'));
expect(getAssetDestPathIOS(asset, 1)).toBe(
path.normalize('assets/test/icon.png'),
);
});
it('should consider scale', () => {
@@ -33,7 +35,11 @@ describe('getAssetDestPathIOS', () => {
httpServerLocation: '/assets/test',
};
expect(getAssetDestPathIOS(asset, 2)).toBe(path.normalize('assets/test/icon@2x.png'));
expect(getAssetDestPathIOS(asset, 3)).toBe(path.normalize('assets/test/icon@3x.png'));
expect(getAssetDestPathIOS(asset, 2)).toBe(
path.normalize('assets/test/icon@2x.png'),
);
expect(getAssetDestPathIOS(asset, 3)).toBe(
path.normalize('assets/test/icon@3x.png'),
);
});
});

6
local-cli/generator/templates.js
View File

@@ -98,7 +98,11 @@ function createFromRemoteTemplate(
// only for publishing the template to npm.
// We want to ignore this dummy file, otherwise it would overwrite
// our project's package.json file.
ignorePaths: ['package.json', 'dependencies.json','devDependencies.json'],
ignorePaths: [
'package.json',
'dependencies.json',
'devDependencies.json',
],
});
installTemplateDependencies(templatePath, yarnVersion);
installTemplateDevDependencies(templatePath, yarnVersion);

4
local-cli/init/init.js
View File

@@ -9,9 +9,7 @@
'use strict';
const {
createProjectFromTemplate,
} = require('../generator/templates');
const {createProjectFromTemplate} = require('../generator/templates');
const execSync = require('child_process').execSync;
const fs = require('fs');
const minimist = require('minimist');