Skip to content

[7.x] Replace tsc compilation with transpile with babel on kbn plugin helpers for typescript (#36769) #37642

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
mistic merged 1 commit into from
May 31, 2019
Merged

[7.x] Replace tsc compilation with transpile with babel on kbn plugin helpers for typescript (#36769) #37642

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
5 changes: 4 additions & 1 deletion packages/kbn-plugin-helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
"author": "Spencer Alger <email@spalger.com>",
"license": "Apache-2.0",
"dependencies": {
"@babel/core": "^7.4.4",
"@kbn/babel-preset": "1.0.0",
"argv-split": "^2.0.1",
"commander": "^2.9.0",
"del": "^4.0.0",
"execa": "^1.0.0",
"gulp-rename": "1.4.0",
"globby": "^8.0.1",
"gulp-babel": "^8.0.0",
"gulp-rename": "1.4.0",
"gulp-zip": "4.1.0",
"inquirer": "^1.2.2",
"minimatch": "^3.0.4",
Expand Down
56 changes: 44 additions & 12 deletions packages/kbn-plugin-helpers/tasks/build/create_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ const vfs = require('vinyl-fs');
const rename = require('gulp-rename');
const through = require('through2');
const minimatch = require('minimatch');
const gulpBabel = require('gulp-babel');
const { promisify } = require('util');
const { pipeline } = require('stream');

const rewritePackageJson = require('./rewrite_package_json');
const winCmd = require('../../lib/win_cmd');

const asyncPipeline = promisify(pipeline);

// `link:` dependencies create symlinks, but we don't want to include symlinks
// in the built zip file. Therefore we remove all symlinked dependencies, so we
// can re-create them when installing the plugin.
Expand Down Expand Up @@ -65,6 +70,31 @@ function parseTsconfig(pluginSourcePath, configPath) {
return config;
}

// transpile with babel
async function transpileWithBabel(srcGlobs, buildRoot, presets) {
await asyncPipeline(
vfs.src(
srcGlobs.concat([
'!**/*.d.ts',
'!**/*.{test,test.mocks,mock,mocks}.{ts,tsx}',
'!**/node_modules/**',
'!**/bower_components/**',
'!**/__tests__/**',
]),
{
cwd: buildRoot,
}
),

gulpBabel({
babelrc: false,
presets,
}),

vfs.dest(buildRoot)
);
}

module.exports = function createBuild(plugin, buildTarget, buildVersion, kibanaVersion, files) {
const buildSource = plugin.root;
const buildRoot = path.join(buildTarget, 'kibana', plugin.id);
Expand Down Expand Up @@ -122,19 +152,13 @@ module.exports = function createBuild(plugin, buildTarget, buildVersion, kibanaV

del.sync([path.join(buildRoot, '**', '*.s{a,c}ss')]);
})
.then(function() {
.then(async function() {
const buildConfigPath = path.join(buildRoot, 'tsconfig.json');

if (!existsSync(buildConfigPath)) {
return;
}

if (!plugin.pkg.devDependencies.typescript) {
throw new Error(
'Found tsconfig.json file in plugin but typescript is not a devDependency.'
);
}

// attempt to patch the extends path in the tsconfig file
const buildConfig = parseTsconfig(buildSource, buildConfigPath);

Expand All @@ -144,11 +168,19 @@ module.exports = function createBuild(plugin, buildTarget, buildVersion, kibanaV
writeFileSync(buildConfigPath, JSON.stringify(buildConfig));
}

execa.sync(
path.join(buildSource, 'node_modules', '.bin', winCmd('tsc')),
['--pretty', 'true'],
{ cwd: buildRoot }
);
// Transpile ts server code
//
// Include everything except content from public folders
await transpileWithBabel(['**/*.{ts,tsx}', '!**/public/**'], buildRoot, [
require.resolve('@kbn/babel-preset/node_preset'),
]);

// Transpile ts client code
//
// Include everything inside a public directory
await transpileWithBabel(['**/public/**/*.{ts,tsx}'], buildRoot, [
require.resolve('@kbn/babel-preset/webpack_preset'),
]);

del.sync([
path.join(buildRoot, '**', '*.{ts,tsx,d.ts}'),
Expand Down
Loading