Skip to content

chore: make hook args backwards and forwards compatible with the NativeScript 6.0.0 release #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2019
Merged

chore: make hook args backwards and forwards compatible with the NativeScript 6.0.0 release #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions lib/after-prepare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ var fs = require('fs');
var glob = require('glob');
var minimatch = require('minimatch');

module.exports = function (logger, platformsData, projectData, hookArgs) {
module.exports = function ($logger, $projectData, $injector, hookArgs) {
var logsPrefix = "nativescript-dev-babel: ";
var platformData = platformsData.getPlatformData(hookArgs.platform.toLowerCase());
var platform = (hookArgs && (hookArgs.platform || (hookArgs.prepareData && hookArgs.prepareData.platform)) || '').toLowerCase();
var platformData = getPlatformData($injector, $projectData, platform);
var outDir = platformData.appDestinationDirectoryPath;

var babelOptions = {
sourceMaps: 'inline'
};

var babelrcFilePath = path.join(projectData.projectDir, '.babelrc');
var babelrcFilePath = path.join($projectData.projectDir, '.babelrc');
if (fs.existsSync(babelrcFilePath)) {
babelOptions = JSON.parse(fs.readFileSync(babelrcFilePath));
} else {
var packageOpts = JSON.parse(fs.readFileSync(path.join(projectData.projectDir, 'package.json')));
var packageOpts = JSON.parse(fs.readFileSync(path.join($projectData.projectDir, 'package.json')));
if (packageOpts.babel) {
babelOptions = packageOpts.babel;
}
Expand All @@ -30,7 +31,7 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
var transformations = [];
for (var includePattern of includedPatterns) {
transformations.push(new Promise(function (resolve, reject) {
logger.info(`${logsPrefix}Processing '${path.join(outDir, includePattern)}.'`);
$logger.info(`${logsPrefix}Processing '${path.join(outDir, includePattern)}.'`);
glob(path.join(outDir, includePattern), {}, function (err, files) {
if (err) {
reject(err);
Expand All @@ -43,15 +44,15 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {
return;
}

logger.trace(`${logsPrefix}Processing '${jsFile}'.`);
$logger.trace(`${logsPrefix}Processing '${jsFile}'.`);
try {
var result = babel.transformFileSync(jsFile, babelOptions);
fs.writeFileSync(jsFile, result.code);
} catch (err) {
error = err;
}
});
logger.info(`${logsPrefix}Processing '${path.join(outDir, includePattern)}' complete.`);
$logger.info(`${logsPrefix}Processing '${path.join(outDir, includePattern)}' complete.`);
if (error) {
error.errorAsWarning = true;
}
Expand All @@ -63,3 +64,18 @@ module.exports = function (logger, platformsData, projectData, hookArgs) {

return Promise.all(transformations);
}

function getPlatformData($injector, $projectData, platform) {
let platformData;
try {
// used in CLI 6+
const platformsDataService = $injector.resolve("platformsDataService");
platformData = platformsDataService.getPlatformData(platform, $projectData);
} catch (err) {
// Used in CLI 5.4.x and below:
const platformsData = $injector.resolve("platformsData");
platformData = platformsData.getPlatformData(platform, $projectData);
}

return platformData;
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-dev-babel",
"version": "0.2.0",
"version": "0.2.1",
"description": "",
"main": "index.js",
"scripts": {
Expand Down