From 6a7b92ecffeefa747a98b46cfbeb9418721484f8 Mon Sep 17 00:00:00 2001 From: Andy G Date: Tue, 25 Jan 2022 18:34:59 -0700 Subject: [PATCH 1/5] Fix style type errors. --- src/commands/styles.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/styles.ts b/src/commands/styles.ts index 776ab7b..13d87c1 100644 --- a/src/commands/styles.ts +++ b/src/commands/styles.ts @@ -3,7 +3,7 @@ import { Argv } from 'yargs'; // yargs exports export const command = 'styles '; export const describe = 'Run subcommands to work with a custom CSS theme'; -export const builder = (yargs: Argv) => { +export const builder = (yargs: Argv): unknown => { /* eslint-disable @typescript-eslint/no-var-requires */ return yargs .command(require('./styles/create')) @@ -18,4 +18,4 @@ export const builder = (yargs: Argv) => { export const handler = noop; // internals -function noop() {} +function noop(): void {} From 8a4f2983a1bcc454ddd1c0032c4a2d8acfe18af6 Mon Sep 17 00:00:00 2001 From: Andy G Date: Tue, 25 Jan 2022 18:36:02 -0700 Subject: [PATCH 2/5] Remove trailing slash from preview copy --- src/commands/styles/scaffold.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/styles/scaffold.ts b/src/commands/styles/scaffold.ts index aea6eeb..3fb8b3c 100644 --- a/src/commands/styles/scaffold.ts +++ b/src/commands/styles/scaffold.ts @@ -57,7 +57,7 @@ export async function scaffold(workspacePath: string, force = false): Promise`, dirs), { + await cpy('preview', buildPath(`${workspacePath}/`, dirs), { cwd: buildPath(`/../../`, dirs), }); From f5bfa79e07ec798dc4a767a3f18293fd6b422aff Mon Sep 17 00:00:00 2001 From: Andy G Date: Tue, 25 Jan 2022 18:36:34 -0700 Subject: [PATCH 3/5] Remove copy commands from cleanDirectories --- src/lib/cleanDirectories.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/cleanDirectories.ts b/src/lib/cleanDirectories.ts index 7063663..fc0957c 100644 --- a/src/lib/cleanDirectories.ts +++ b/src/lib/cleanDirectories.ts @@ -22,8 +22,9 @@ const cleanDirectories = async (target: string, dest: string, tests: string, typ rimraf(`${target}/tests/unit/widgets/WidgetName/`, async () => { await del([`${target}/src/widgets/WidgetName.tsx`]); rimraf(`${target}/src/widgets/WidgetName/`, async () => { - await copy(`${target}/src/`, dest + '/'); - await copy(`${target}/tests/`, tests + '/'); + console.log('clean ', `${target}`); + // await copy(`${target}/src/`, dest + '/'); + // await copy(`${target}/tests/`, tests + '/'); rimraf(`${target}/**`, resolve); }); }); From 97e081305da5857f873e486cf8a58a1bcc81c4a6 Mon Sep 17 00:00:00 2001 From: Andy G Date: Wed, 26 Jan 2022 09:37:12 -0700 Subject: [PATCH 4/5] Clean up from testing --- src/lib/cleanDirectories.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/cleanDirectories.ts b/src/lib/cleanDirectories.ts index fc0957c..034a3f0 100644 --- a/src/lib/cleanDirectories.ts +++ b/src/lib/cleanDirectories.ts @@ -22,9 +22,6 @@ const cleanDirectories = async (target: string, dest: string, tests: string, typ rimraf(`${target}/tests/unit/widgets/WidgetName/`, async () => { await del([`${target}/src/widgets/WidgetName.tsx`]); rimraf(`${target}/src/widgets/WidgetName/`, async () => { - console.log('clean ', `${target}`); - // await copy(`${target}/src/`, dest + '/'); - // await copy(`${target}/tests/`, tests + '/'); rimraf(`${target}/**`, resolve); }); }); From d4233ee98534b6457c92c5fba3434f108af5527c Mon Sep 17 00:00:00 2001 From: Andy G Date: Wed, 26 Jan 2022 18:36:45 -0700 Subject: [PATCH 5/5] Swap in cpy to replace fs-extra and other misc cleanup --- src/lib/createWidget.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/createWidget.ts b/src/lib/createWidget.ts index f8e95ae..b020570 100644 --- a/src/lib/createWidget.ts +++ b/src/lib/createWidget.ts @@ -13,13 +13,13 @@ import path from 'path'; import fs from 'fs'; -import fse from 'fs-extra'; +import cpy from 'cpy'; import chalk from 'chalk'; import pkgDir from 'pkg-dir'; import camelCase from 'lodash.camelcase'; import startCase from 'lodash.startcase'; -import { compose, map, replace, toLower } from 'ramda'; +import { compose, replace } from 'ramda'; import cleanDirectories from './cleanDirectories'; import copyUpdateFiles from './copyUpdateFiles'; @@ -37,7 +37,7 @@ const createWidget = async ({ argv }: any) => { try { const data: any = await fs.promises.readFile(path.resolve(process.cwd(), 'package.json')); pkg = JSON.parse(data); - console.log(pkg); + if (!pkg || (pkg && pkg.arcgis.type !== 'jsapi' && pkg.arcgis.type !== 'exb')) { console.info( chalk.red.bold( @@ -63,13 +63,13 @@ const createWidget = async ({ argv }: any) => { try { const rootDir = await pkgDir(__dirname); - await fse.copy(`${rootDir}/${directory}`, target, { - filter: (s) => !s.includes('DS_Store'), + await cpy(`${rootDir}/${directory}`, target, { + filter: (s) => !s.path.includes('DS_Store'), }); await copyUpdateFiles(readDirR(target), name); await cleanDirectories(target, dest, tests, argv.type); } catch (error) { - console.info(chalk.red.bold(`Widget creation failed: ${error.message}\n`)); + console.error(chalk.red.bold(`Widget creation failed: ${error.message}\n`)); return Promise.reject(new Error(`Widget creation failed: ${error.message}`)); } };