IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

grafana-toolkit: avoid path.resolve with globby in moveStaticFiles (#27670)

Browse Source
This commit is contained in:
kennytm
2020-09-23 16:48:13 +08:00
committed by GitHub
parent 52a501c205
commit ed054c205d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/grafana-toolkit/src/cli/tasks/package.build.ts
View File

@@ -3,7 +3,6 @@ import execa = require('execa');
import * as fs from 'fs'; import * as fs from 'fs';
// @ts-ignore // @ts-ignore
import * as path from 'path'; import * as path from 'path';
import { resolve as resolvePath } from 'path';
import chalk from 'chalk'; import chalk from 'chalk';
import { useSpinner } from '../utils/useSpinner'; import { useSpinner } from '../utils/useSpinner';
import { Task, TaskRunner } from './task'; import { Task, TaskRunner } from './task';
@@ -89,13 +88,13 @@ const moveFiles = () => {
})(); })();
}; };
const moveStaticFiles = async (pkg: any, cwd: string) => { const moveStaticFiles = async (pkg: any) => {
if (pkg.name.endsWith('/ui')) { if (pkg.name.endsWith('/ui')) {
const staticFiles = await globby(resolvePath(process.cwd(), 'src/**/*.+(png|svg|gif|jpg)')); const staticFiles = await globby('src/**/*.{png,svg,gif,jpg}');
return useSpinner<void>(`Moving static files`, async () => { return useSpinner<void>(`Moving static files`, async () => {
const promises = staticFiles.map(file => { const promises = staticFiles.map(file => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fs.copyFile(file, `${cwd}/compiled/${file.replace(`${cwd}/src`, '')}`, (err: any) => { fs.copyFile(file, file.replace(/^src/, 'compiled'), (err: any) => {
if (err) { if (err) {
reject(err); reject(err);
return; return;
@@ -130,7 +129,7 @@ const buildTaskRunner: TaskRunner<PackageBuildOptions> = async ({ scope }) => {
await clean(); await clean();
await compile(); await compile();
await moveStaticFiles(pkg, cwd); await moveStaticFiles(pkg);
await rollup(); await rollup();
await preparePackage(pkg); await preparePackage(pkg);
await moveFiles(); await moveFiles();