mirror/react-native-pushy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

兼容0.59的bundle命令

Browse Source
This commit is contained in:
sunnylqm 2019-04-14 13:31:26 +08:00
parent a17ce21718
commit 453a861302
1 changed files with 142 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
local-cli/src/bundle.js
View File

@ -5,30 +5,30 @@
import * as path from 'path'; import * as path from 'path';
import { mkdir as mkdirRecurisve } from 'mkdir-recursive'; import { mkdir as mkdirRecurisve } from 'mkdir-recursive';
import rmdirRecursive from 'rimraf'; import rmdirRecursive from 'rimraf';
import { import { getRNVersion, translateOptions } from './utils';
getRNVersion,
translateOptions,
} from './utils';
import * as fs from 'fs'; import * as fs from 'fs';
import {ZipFile} from 'yazl'; import { ZipFile } from 'yazl';
import {open as openZipFile} from 'yauzl'; import { open as openZipFile } from 'yauzl';
// import {diff} from 'node-bsdiff'; // import {diff} from 'node-bsdiff';
import { question } from './utils'; import { question } from './utils';
import {checkPlatform} from './app'; import { checkPlatform } from './app';
import crypto from 'crypto'; import crypto from 'crypto';
import minimist from 'minimist';
var diff; var diff;
try { try {
var bsdiff = require('node-bsdiff'); var bsdiff = require('node-bsdiff');
diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff; diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff;
} catch(e) { } catch (e) {
diff = function() { diff = function() {
console.warn('This function needs "node-bsdiff". Please run "npm i node-bsdiff -S" from your project directory first!'); console.warn(
throw new Error('This function needs module "node-bsdiff". Please install it first.') 'This function needs "node-bsdiff". Please run "npm i node-bsdiff -S" from your project directory first!',
} );
throw new Error('This function needs module "node-bsdiff". Please install it first.');
};
} }
function mkdir(dir){ function mkdir(dir) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
mkdirRecurisve(dir, err => { mkdirRecurisve(dir, err => {
if (err) { if (err) {
@ -52,28 +52,28 @@ function rmdir(dir) {
}); });
} }
async function pack(dir, output){ async function pack(dir, output) {
await mkdir(path.dirname(output)); await mkdir(path.dirname(output));
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
var zipfile = new ZipFile(); var zipfile = new ZipFile();
function addDirectory(root, rel){ function addDirectory(root, rel) {
if (rel) { if (rel) {
zipfile.addEmptyDirectory(rel); zipfile.addEmptyDirectory(rel);
} }
const childs = fs.readdirSync(root); const childs = fs.readdirSync(root);
for (const name of childs) { for (const name of childs) {
if (name === '.' || name === '..'){ if (name === '.' || name === '..') {
continue; continue;
} }
const fullPath = path.join(root, name); const fullPath = path.join(root, name);
const stat = fs.statSync(fullPath); const stat = fs.statSync(fullPath);
if (stat.isFile()) { if (stat.isFile()) {
//console.log('adding: ' + rel+name); //console.log('adding: ' + rel+name);
zipfile.addFile(fullPath, rel+name); zipfile.addFile(fullPath, rel + name);
} else if (stat.isDirectory()) { } else if (stat.isDirectory()) {
//console.log('adding: ' + rel+name+'/'); //console.log('adding: ' + rel+name+'/');
addDirectory(fullPath, rel+name+'/'); addDirectory(fullPath, rel + name + '/');
} }
} }
} }
@ -81,10 +81,9 @@ async function pack(dir, output){
addDirectory(dir, ''); addDirectory(dir, '');
zipfile.outputStream.on('error', err => reject(err)); zipfile.outputStream.on('error', err => reject(err));
zipfile.outputStream.pipe(fs.createWriteStream(output)) zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
.on("close", function() { resolve();
resolve(); });
});
zipfile.end(); zipfile.end();
}); });
console.log('Bundled saved to: ' + output); console.log('Bundled saved to: ' + output);
@ -101,18 +100,13 @@ function readEntire(entry, zipFile) {
end() { end() {
resolve(Buffer.concat(buffers)); resolve(Buffer.concat(buffers));
}, },
prependListener() { prependListener() {},
on() {},
}, once() {},
on() { emit() {},
}, });
once() {
},
emit() {
},
})
}); });
}) });
} }
function basename(fn) { function basename(fn) {
@ -136,7 +130,7 @@ async function diffFromPPK(origin, next, output) {
if (entry.fileName === 'index.bundlejs') { if (entry.fileName === 'index.bundlejs') {
// This is source. // This is source.
return readEntire(entry, zipFile).then(v=>originSource = v); return readEntire(entry, zipFile).then(v => (originSource = v));
} }
} }
}); });
@ -147,12 +141,13 @@ async function diffFromPPK(origin, next, output) {
var zipfile = new ZipFile(); var zipfile = new ZipFile();
const writePromise = new Promise((resolve, reject)=>{ const writePromise = new Promise((resolve, reject) => {
zipfile.outputStream.on('error', err => {throw err;}); zipfile.outputStream.on('error', err => {
zipfile.outputStream.pipe(fs.createWriteStream(output)) throw err;
.on("close", function() { });
resolve(); zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
}); resolve();
});
}); });
const addedEntry = {}; const addedEntry = {};
@ -181,7 +176,7 @@ async function diffFromPPK(origin, next, output) {
} }
} else if (entry.fileName === 'index.bundlejs') { } else if (entry.fileName === 'index.bundlejs') {
//console.log('Found bundle'); //console.log('Found bundle');
return readEntire(entry, nextZipfile).then( newSource => { return readEntire(entry, nextZipfile).then(newSource => {
//console.log('Begin diff'); //console.log('Begin diff');
zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch'); zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
//console.log('End diff'); //console.log('End diff');
@ -195,7 +190,7 @@ async function diffFromPPK(origin, next, output) {
} }
// If moved from other place // If moved from other place
if (originMap[entry.crc32]){ if (originMap[entry.crc32]) {
const base = basename(entry.fileName); const base = basename(entry.fileName);
if (!originEntries[base]) { if (!originEntries[base]) {
addEntry(base); addEntry(base);
@ -207,9 +202,9 @@ async function diffFromPPK(origin, next, output) {
// New file. // New file.
addEntry(basename(entry.fileName)); addEntry(basename(entry.fileName));
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject) => {
nextZipfile.openReadStream(entry, function(err, readStream) { nextZipfile.openReadStream(entry, function(err, readStream) {
if (err){ if (err) {
return reject(err); return reject(err);
} }
zipfile.addReadStream(readStream, entry.fileName); zipfile.addReadStream(readStream, entry.fileName);
@ -218,7 +213,7 @@ async function diffFromPPK(origin, next, output) {
resolve(); resolve();
}); });
}); });
}) });
} }
}); });
@ -226,18 +221,18 @@ async function diffFromPPK(origin, next, output) {
for (var k in originEntries) { for (var k in originEntries) {
if (!newEntries[k]) { if (!newEntries[k]) {
console.log('Delete '+k); console.log('Delete ' + k);
deletes[k] = 1; deletes[k] = 1;
} }
} }
//console.log({copies, deletes}); //console.log({copies, deletes});
zipfile.addBuffer(new Buffer(JSON.stringify({copies, deletes})), '__diff.json'); zipfile.addBuffer(new Buffer(JSON.stringify({ copies, deletes })), '__diff.json');
zipfile.end(); zipfile.end();
await writePromise; await writePromise;
} }
async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = v=>v) { async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = v => v) {
await mkdir(path.dirname(output)); await mkdir(path.dirname(output));
const originEntries = {}; const originEntries = {};
@ -259,7 +254,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
if (fn === originBundleName) { if (fn === originBundleName) {
// This is source. // This is source.
return readEntire(entry, zipFile).then(v=>originSource = v); return readEntire(entry, zipFile).then(v => (originSource = v));
} }
} }
}); });
@ -270,12 +265,13 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
var zipfile = new ZipFile(); var zipfile = new ZipFile();
const writePromise = new Promise((resolve, reject)=>{ const writePromise = new Promise((resolve, reject) => {
zipfile.outputStream.on('error', err => {throw err;}); zipfile.outputStream.on('error', err => {
zipfile.outputStream.pipe(fs.createWriteStream(output)) throw err;
.on("close", function() { });
resolve(); zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
}); resolve();
});
}); });
await enumZipEntries(next, (entry, nextZipfile) => { await enumZipEntries(next, (entry, nextZipfile) => {
@ -284,7 +280,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
zipfile.addEmptyDirectory(entry.fileName); zipfile.addEmptyDirectory(entry.fileName);
} else if (entry.fileName === 'index.bundlejs') { } else if (entry.fileName === 'index.bundlejs') {
//console.log('Found bundle'); //console.log('Found bundle');
return readEntire(entry, nextZipfile).then( newSource => { return readEntire(entry, nextZipfile).then(newSource => {
//console.log('Begin diff'); //console.log('Begin diff');
zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch'); zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
//console.log('End diff'); //console.log('End diff');
@ -296,14 +292,14 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
return; return;
} }
// If moved from other place // If moved from other place
if (originMap[entry.crc32]){ if (originMap[entry.crc32]) {
copies[entry.fileName] = originMap[entry.crc32]; copies[entry.fileName] = originMap[entry.crc32];
return; return;
} }
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject) => {
nextZipfile.openReadStream(entry, function(err, readStream) { nextZipfile.openReadStream(entry, function(err, readStream) {
if (err){ if (err) {
return reject(err); return reject(err);
} }
zipfile.addReadStream(readStream, entry.fileName); zipfile.addReadStream(readStream, entry.fileName);
@ -312,18 +308,18 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
resolve(); resolve();
}); });
}); });
}) });
} }
}); });
zipfile.addBuffer(new Buffer(JSON.stringify({copies})), '__diff.json'); zipfile.addBuffer(new Buffer(JSON.stringify({ copies })), '__diff.json');
zipfile.end(); zipfile.end();
await writePromise; await writePromise;
} }
function enumZipEntries(zipFn, callback) { function enumZipEntries(zipFn, callback) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
openZipFile(zipFn, {lazyEntries:true}, (err, zipfile) => { openZipFile(zipFn, { lazyEntries: true }, (err, zipfile) => {
if (err) { if (err) {
return reject(err); return reject(err);
} }
@ -331,7 +327,7 @@ function enumZipEntries(zipFn, callback) {
zipfile.on('error', reject); zipfile.on('error', reject);
zipfile.on('entry', entry => { zipfile.on('entry', entry => {
const result = callback(entry, zipfile); const result = callback(entry, zipfile);
if (result && typeof(result.then) === 'function') { if (result && typeof result.then === 'function') {
result.then(() => zipfile.readEntry()); result.then(() => zipfile.readEntry());
} else { } else {
zipfile.readEntry(); zipfile.readEntry();
@ -343,16 +339,13 @@ function enumZipEntries(zipFn, callback) {
} }
export const commands = { export const commands = {
bundle: async function({options}){ bundle: async function({ options }) {
const platform = checkPlatform(options.platform || await question('Platform(ios/android):')); const platform = checkPlatform(options.platform || (await question('Platform(ios/android):')));
let { let { entryFile, intermediaDir, output, dev, verbose } = translateOptions({
entryFile, ...options,
intermediaDir, platform,
output, });
dev,
verbose
} = translateOptions({...options, platform});
const realIntermedia = path.resolve(intermediaDir); const realIntermedia = path.resolve(intermediaDir);
@ -368,7 +361,7 @@ export const commands = {
await rmdir(realIntermedia); await rmdir(realIntermedia);
await mkdir(realIntermedia); await mkdir(realIntermedia);
if (major === 0) { if (major === 0) {
if (minor >= 56) { if (minor >= 56) {
require('metro-babel-register'); require('metro-babel-register');
@ -390,9 +383,7 @@ export const commands = {
// This line fix issue #11 // This line fix issue #11
require(path.resolve('node_modules/react-native/local-cli/cli')); require(path.resolve('node_modules/react-native/local-cli/cli'));
const Config = require(path.resolve('node_modules/react-native/local-cli/util/Config')); let Config, defaultConfig, bundle;
const bundle = require(path.resolve('node_modules/react-native/local-cli/bundle/bundle'));
let defaultConfig;
if (major === 0) { if (major === 0) {
if (minor >= 49) { if (minor >= 49) {
@ -403,7 +394,38 @@ export const commands = {
} }
if (major === 0) { if (major === 0) {
if (minor >= 57) { if (minor >= 0.59) {
Config = require(path.resolve('node_modules/@react-native-community/cli/build/tools/loadMetroConfig'));
bundle = require(path.resolve('node_modules/@react-native-community/cli/build/commands/bundle/bundle')).default;
} else {
Config = require(path.resolve('node_modules/react-native/local-cli/util/Config'));
bundle = require(path.resolve('node_modules/react-native/local-cli/bundle/bundle'));
}
if (minor >= 59) {
// https://github.com/react-native-community/cli/blob/1.x/packages/cli/src/cliEntry.js#L170-L202
const options = minimist(process.argv.slice(2));
const root = options.projectRoot ? path.resolve(options.projectRoot) : process.cwd();
const reactNativePath = options.reactNativePath
? path.resolve(options.reactNativePath)
: (() => {
try {
return path.dirname(
require.resolve('react-native/package.json', {
paths: [root],
}),
);
} catch (_ignored) {
throw new Error('Unable to find React Native files. Please use --reactNativePath to specify the path.');
}
})();
defaultConfig = {
reactNativePath,
root,
};
} else if (minor >= 57) {
// https://github.com/facebook/react-native/commit/a32620dc3b7a0ebd53feeaf7794051705d80f49e#diff-75692fe55c8b1a7c05f4264301342167L101 // https://github.com/facebook/react-native/commit/a32620dc3b7a0ebd53feeaf7794051705d80f49e#diff-75692fe55c8b1a7c05f4264301342167L101
// defaultConfig = Config.load(); // defaultConfig = Config.load();
const { configPromise } = require(path.resolve('node_modules/react-native/local-cli/core')); const { configPromise } = require(path.resolve('node_modules/react-native/local-cli/core'));
@ -411,26 +433,32 @@ export const commands = {
} else if (minor >= 45) { } else if (minor >= 45) {
defaultConfig = Config.findOptional(path.resolve('.')); defaultConfig = Config.findOptional(path.resolve('.'));
} else if (minor >= 42) { } else if (minor >= 42) {
defaultConfig= Config.get( defaultConfig = Config.get(
path.resolve('node_modules/react-native/local-cli'), path.resolve('node_modules/react-native/local-cli'),
require(path.resolve('node_modules/react-native/local-cli/core/default.config')), require(path.resolve('node_modules/react-native/local-cli/core/default.config')),
path.resolve('node_modules/react-native/packager/rn-cli.config.js')); path.resolve('node_modules/react-native/packager/rn-cli.config.js'),
);
} else if (minor >= 33) { } else if (minor >= 33) {
defaultConfig= Config.get( defaultConfig = Config.get(
path.resolve('node_modules/react-native/local-cli'), path.resolve('node_modules/react-native/local-cli'),
require(path.resolve('node_modules/react-native/local-cli/default.config')), require(path.resolve('node_modules/react-native/local-cli/default.config')),
path.resolve('node_modules/react-native/packager/rn-cli.config.js')); path.resolve('node_modules/react-native/packager/rn-cli.config.js'),
);
} else { } else {
defaultConfig= Config.get(path.resolve('node_modules/react-native/local-cli'), require(path.resolve('node_modules/react-native/local-cli/default.config'))); defaultConfig = Config.get(
path.resolve('node_modules/react-native/local-cli'),
require(path.resolve('node_modules/react-native/local-cli/default.config')),
);
} }
} else { } else {
defaultConfig = Config.findOptional(path.resolve('.')); defaultConfig = Config.findOptional(path.resolve('.'));
} }
console;
if (bundle.func) { if (bundle.func) {
// React native after 0.31.0 // React native >= 0.31.0
await bundle.func([], defaultConfig, { await bundle.func([], defaultConfig, {
entryFile : entryFile, entryFile: entryFile,
platform: platform, platform: platform,
dev: !!dev, dev: !!dev,
bundleOutput: `${realIntermedia}${path.sep}index.bundlejs`, bundleOutput: `${realIntermedia}${path.sep}index.bundlejs`,
@ -439,21 +467,24 @@ export const commands = {
bundleEncoding: 'utf8', bundleEncoding: 'utf8',
}); });
} else { } else {
// React native before 0.30.0 // React native < 0.31.0
await bundle([ await bundle(
'--entry-file', [
entryFile, '--entry-file',
'--platform', entryFile,
platform, '--platform',
'--dev', platform,
'' + !!dev, '--dev',
'--bundle-output', '' + !!dev,
`${realIntermedia}${path.sep}index.bundlejs`, '--bundle-output',
'--assets-dest', `${realIntermedia}${path.sep}index.bundlejs`,
`${realIntermedia}`, '--assets-dest',
'--verbose', `${realIntermedia}`,
'' + !!verbose, '--verbose',
], defaultConfig); '' + !!verbose,
],
defaultConfig,
);
} }
console.log('Packing'); console.log('Packing');
@ -462,15 +493,18 @@ export const commands = {
const v = await question('Would you like to publish it?(Y/N)'); const v = await question('Would you like to publish it?(Y/N)');
if (v.toLowerCase() === 'y') { if (v.toLowerCase() === 'y') {
await this.publish({args: [realOutput], options: { await this.publish({
platform, args: [realOutput],
}}) options: {
platform,
},
});
} }
}, },
async diff({args, options}) { async diff({ args, options }) {
const [origin, next] = args; const [origin, next] = args;
const {output} = options; const { output } = options;
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
@ -483,9 +517,9 @@ export const commands = {
console.log(`${realOutput} generated.`); console.log(`${realOutput} generated.`);
}, },
async diffFromApk({args, options}) { async diffFromApk({ args, options }) {
const [origin, next] = args; const [origin, next] = args;
const {output} = options; const { output } = options;
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
@ -498,9 +532,9 @@ export const commands = {
console.log(`${realOutput} generated.`); console.log(`${realOutput} generated.`);
}, },
async diffFromIpa({args, options}) { async diffFromIpa({ args, options }) {
const [origin, next] = args; const [origin, next] = args;
const {output} = options; const { output } = options;
const realOutput = output.replace(/\$\{time\}/g, '' + Date.now()); const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
@ -509,7 +543,7 @@ export const commands = {
process.exit(1); process.exit(1);
} }
await diffFromPackage(origin, next, realOutput, 'main.jsbundle', v=>{ await diffFromPackage(origin, next, realOutput, 'main.jsbundle', v => {
const m = /^Payload\/[^/]+\/(.+)$/.exec(v); const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
return m && m[1]; return m && m[1];
}); });