Skip to content

Replace tsc compilation with transpile with babel on kbn plugin helpers for typescript #36769

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 16 commits into from
May 31, 2019
Merged

Replace tsc compilation with transpile with babel on kbn plugin helpers for typescript #36769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aa43ef3
chore(NA): add transpile with babel the typescript files on xpack whe…
mistic May 10, 2019
97714c3
chore(NA): merge and solve conflicts with master.
mistic May 21, 2019
370a6cc
chore(NA): fix the globs for public folders inside server paths
mistic May 21, 2019
a651377
docs(NA): add comments to explain globs.
mistic May 21, 2019
cd1fe8f
Merge branch 'master' into typescript-with-babel7-for-kbn-plugin-helpers
mistic May 21, 2019
b9ad51c
chore(NA): use pipeline instead of async pipeline promise from dev ut…
mistic May 21, 2019
878b695
chore(NA): merge and solve conflicts with master
mistic May 21, 2019
22f8278
chore(NA): apply documented way to use stream pipeline.
mistic May 21, 2019
f687d3f
Merge branch 'master' into typescript-with-babel7-for-kbn-plugin-helpers
mistic May 22, 2019
ce2b313
Merge branch 'master' into typescript-with-babel7-for-kbn-plugin-helpers
mistic May 22, 2019
202c812
chore(NA): exclude test files from the build transpilation.
mistic May 22, 2019
d5557d7
chore(NA): merge and solve conflicts with master.
mistic May 31, 2019
a2e1032
chore(NA): add ignore for eslint complexity warning
mistic May 31, 2019
5a0ab52
chore(na): fix bad added type files.
mistic May 31, 2019
1bb1d50
chore(NA): merge and solve conflicts with master.
mistic May 31, 2019
3512804
fix(NA): unused type exports
mistic May 31, 2019
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",
Copy link
Copy Markdown
Contributor

@azasypkin azasypkin May 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: with this change on the latest master I'm getting error Couldn't find package "@kbn/babel-preset@1.0.0" required by "@kbn/plugin-helpers@link:../../kibana/packages/kbn-plugin-helpers" on the "npm" registry. on yarn kbn bootstrap (right after yarn kbn clean). Am I doing something wrong? :)

Copy link
Copy Markdown
Contributor

@spalger spalger May 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That package is still at 1.0.0 locally, and it works for me, but we've been doing a fair amount of upgrades lately and I've had to wipe out my node_modules directory more frequently than desired because yarn isn't able to properly patch the directory correctly.

Copy link
Copy Markdown
Contributor

@azasypkin azasypkin May 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's weird, yarn kbn clean should remove node_modules, but that still doesn't help. Anyway, if it becomes annoying, I'll try to investigate and give you folks more details :)

"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