From b1dae3bb5e895c20b6877ec2a8ebfc460fbbec47 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Thu, 1 Dec 2022 17:01:55 +0100 Subject: [PATCH] make CLI files TypeScript files --- src/oxide/cli.ts | 2 +- src/oxide/cli/build/{deps.js => deps.ts} | 4 +--- src/oxide/cli/build/{index.js => index.ts} | 4 +--- src/oxide/cli/build/{plugin.js => plugin.ts} | 12 +++++------- src/oxide/cli/build/{utils.js => utils.ts} | 2 -- src/oxide/cli/build/{watching.js => watching.ts} | 4 +--- src/oxide/cli/help/{index.js => index.ts} | 1 - src/oxide/cli/{index.js => index.ts} | 2 -- src/oxide/cli/init/{index.js => index.ts} | 8 +++----- src/oxide/cli/{shared.js => shared.ts} | 2 -- 10 files changed, 12 insertions(+), 29 deletions(-) rename src/oxide/cli/build/{deps.js => deps.ts} (95%) rename src/oxide/cli/build/{index.js => index.ts} (95%) rename src/oxide/cli/build/{plugin.js => plugin.ts} (97%) rename src/oxide/cli/build/{utils.js => utils.ts} (99%) rename src/oxide/cli/build/{watching.js => watching.ts} (99%) rename src/oxide/cli/help/{index.js => index.ts} (99%) rename src/oxide/cli/{index.js => index.ts} (99%) rename src/oxide/cli/init/{index.js => index.ts} (83%) rename src/oxide/cli/{shared.js => shared.ts} (89%) diff --git a/src/oxide/cli.ts b/src/oxide/cli.ts index 455aa8b3d..17552ecb1 100644 --- a/src/oxide/cli.ts +++ b/src/oxide/cli.ts @@ -1 +1 @@ -require('./cli/index') +import './cli/index' diff --git a/src/oxide/cli/build/deps.js b/src/oxide/cli/build/deps.ts similarity index 95% rename from src/oxide/cli/build/deps.js rename to src/oxide/cli/build/deps.ts index 0e381e937..fe5f57f2a 100644 --- a/src/oxide/cli/build/deps.js +++ b/src/oxide/cli/build/deps.ts @@ -1,5 +1,3 @@ -// @ts-check - import { // @ts-ignore lazyPostcss, @@ -12,7 +10,7 @@ import { // @ts-ignore lazyAutoprefixer, -} from '../../../../peers/index.js' +} from '../../../../peers/index' /** * @returns {import('postcss')} diff --git a/src/oxide/cli/build/index.js b/src/oxide/cli/build/index.ts similarity index 95% rename from src/oxide/cli/build/index.js rename to src/oxide/cli/build/index.ts index c75b719da..79a5463a8 100644 --- a/src/oxide/cli/build/index.js +++ b/src/oxide/cli/build/index.ts @@ -1,8 +1,6 @@ -// @ts-check - import fs from 'fs' import path from 'path' -import { createProcessor } from './plugin.js' +import { createProcessor } from './plugin' export async function build(args, configs) { let input = args['--input'] diff --git a/src/oxide/cli/build/plugin.js b/src/oxide/cli/build/plugin.ts similarity index 97% rename from src/oxide/cli/build/plugin.js rename to src/oxide/cli/build/plugin.ts index 64aef5746..cd3fbbd26 100644 --- a/src/oxide/cli/build/plugin.js +++ b/src/oxide/cli/build/plugin.ts @@ -1,5 +1,3 @@ -// @ts-check - import path from 'path' import fs from 'fs' import postcssrc from 'postcss-load-config' @@ -11,12 +9,12 @@ import tailwind from '../../../processTailwindFeatures' import { loadAutoprefixer, loadCssNano, loadPostcss, loadPostcssImport } from './deps' import { formatNodes, drainStdin, outputFile } from './utils' import { env } from '../shared' -import resolveConfig from '../../../../resolveConfig.js' -import getModuleDependencies from '../../../lib/getModuleDependencies.js' -import { parseCandidateFiles } from '../../../lib/content.js' -import { createWatcher } from './watching.js' +import resolveConfig from '../../../../resolveConfig' +import getModuleDependencies from '../../../lib/getModuleDependencies' +import { parseCandidateFiles } from '../../../lib/content' +import { createWatcher } from './watching' import fastGlob from 'fast-glob' -import { findAtConfigPath } from '../../../lib/findAtConfigPath.js' +import { findAtConfigPath } from '../../../lib/findAtConfigPath' import log from '../../../util/log' /** diff --git a/src/oxide/cli/build/utils.js b/src/oxide/cli/build/utils.ts similarity index 99% rename from src/oxide/cli/build/utils.js rename to src/oxide/cli/build/utils.ts index 3462a9793..001857a91 100644 --- a/src/oxide/cli/build/utils.js +++ b/src/oxide/cli/build/utils.ts @@ -1,5 +1,3 @@ -// @ts-check - import fs from 'fs' import path from 'path' diff --git a/src/oxide/cli/build/watching.js b/src/oxide/cli/build/watching.ts similarity index 99% rename from src/oxide/cli/build/watching.js rename to src/oxide/cli/build/watching.ts index ffbfd1ac0..2d7b12a08 100644 --- a/src/oxide/cli/build/watching.js +++ b/src/oxide/cli/build/watching.ts @@ -1,12 +1,10 @@ -// @ts-check - import chokidar from 'chokidar' import fs from 'fs' import micromatch from 'micromatch' import normalizePath from 'normalize-path' import path from 'path' -import { readFileWithRetries } from './utils.js' +import { readFileWithRetries } from './utils' /** * The core idea of this watcher is: diff --git a/src/oxide/cli/help/index.js b/src/oxide/cli/help/index.ts similarity index 99% rename from src/oxide/cli/help/index.js rename to src/oxide/cli/help/index.ts index 4cf600a06..c36042a65 100644 --- a/src/oxide/cli/help/index.js +++ b/src/oxide/cli/help/index.ts @@ -1,4 +1,3 @@ -// @ts-check import packageJson from '../../../../package.json' export function help({ message, usage, commands, options }) { diff --git a/src/oxide/cli/index.js b/src/oxide/cli/index.ts similarity index 99% rename from src/oxide/cli/index.js rename to src/oxide/cli/index.ts index dcdd02855..14e387250 100644 --- a/src/oxide/cli/index.js +++ b/src/oxide/cli/index.ts @@ -8,8 +8,6 @@ import { build } from './build' import { help } from './help' import { init } from './init' -console.log('HELLO FROM OXIDE') - function isESM() { const pkgPath = path.resolve('./package.json') diff --git a/src/oxide/cli/init/index.js b/src/oxide/cli/init/index.ts similarity index 83% rename from src/oxide/cli/init/index.js rename to src/oxide/cli/init/index.ts index 470680318..560caaa0f 100644 --- a/src/oxide/cli/init/index.js +++ b/src/oxide/cli/init/index.ts @@ -1,5 +1,3 @@ -// @ts-check - import fs from 'fs' import path from 'path' @@ -12,8 +10,8 @@ export function init(args, configs) { } else { let stubFile = fs.readFileSync( args['--full'] - ? path.resolve(__dirname, '../../../stubs/defaultConfig.stub.js') - : path.resolve(__dirname, '../../../stubs/simpleConfig.stub.js'), + ? path.resolve(__dirname, '../../../../stubs/defaultConfig.stub.js') + : path.resolve(__dirname, '../../../../stubs/simpleConfig.stub.js'), 'utf8' ) @@ -31,7 +29,7 @@ export function init(args, configs) { messages.push(`${path.basename(postcssConfigLocation)} already exists.`) } else { let stubFile = fs.readFileSync( - path.resolve(__dirname, '../../../stubs/defaultPostCssConfig.stub.js'), + path.resolve(__dirname, '../../../../stubs/defaultPostCssConfig.stub.js'), 'utf8' ) diff --git a/src/oxide/cli/shared.js b/src/oxide/cli/shared.ts similarity index 89% rename from src/oxide/cli/shared.js rename to src/oxide/cli/shared.ts index 9466657f5..48dbaf9b2 100644 --- a/src/oxide/cli/shared.js +++ b/src/oxide/cli/shared.ts @@ -1,5 +1,3 @@ -// @ts-check - export const env = { DEBUG: process.env.DEBUG !== undefined && process.env.DEBUG !== '0', OXIDE: process.env.OXIDE,