status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-26 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Android package name validator consistent with docs

Browse Source 
Summary:
I removed `$` and `_` (only from the starting substring) as they
cannot be used in creating Android package name according to official
android documentation. Also removed a duplicate function (there is the
same one in `react-native-cli/index.js`). This fixes #7115.
Closes https://github.com/facebook/react-native/pull/7127

Differential Revision: D3841253

Pulled By: mkonicek

fbshipit-source-id: 677c7e4277c783180b04dee57d3ccd509e2b99d3
This commit is contained in:
Radek Czemerys 2016-09-09 04:09:20 -07:00 committed by Facebook Github Bot 9
parent cc30d2f46d
commit 9289e4f7b2
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local-cli/generator-android/index.js
View File

@ -14,7 +14,7 @@ var path = require('path');
var yeoman = require('yeoman-generator'); var yeoman = require('yeoman-generator');
function validatePackageName(name) { function validatePackageName(name) {
if (!name.match(/^([a-zA-Z_$][a-zA-Z\d_$]*\.)+([a-zA-Z_$][a-zA-Z\d_$]*)$/)) { if (!name.match(/^([a-zA-Z][a-zA-Z\d_]*\.)+([a-zA-Z_][a-zA-Z\d_]*)$/)) {
return false; return false;
} }
return true; return true;

14
local-cli/generator-utils.js
View File

@ -37,19 +37,7 @@ function walk(current) {
return [].concat.apply([current], files); return [].concat.apply([current], files);
} }
function validatePackageName(name) {
if (!name.match(/^[$A-Z_][0-9A-Z_$]*$/i)) {
console.error(
'"%s" is not a valid name for a project. Please use a valid identifier ' +
'name (alphanumeric).',
name
);
process.exit(1);
}
}
module.exports = { module.exports = {
copyAndReplace: copyAndReplace, copyAndReplace: copyAndReplace,
walk: walk, walk: walk
validatePackageName: validatePackageName
}; };