Skip to content
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.

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

Add --check option #89

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 44 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@
"chalk": "4.1.0",
"chokidar": "3.4.0",
"css-color-function": "1.3.3",
"csso": "^4.0.3",
"deepmerge": "4.2.2",
"fast-glob": "3.2.2",
"fs-extra": "8.1.0",
"fs-monkey": "^1.0.1",
"memfs": "^3.2.0",
"normalize-path": "3.0.0",
"read-pkg-up": "7.0.1",
"style-dictionary": "2.10.0",
"unionfs": "^4.4.0",
"yaml": "1.10.0"
},
"devDependencies": {
Expand Down
68 changes: 65 additions & 3 deletions src/cli/build.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import { dirname, relative } from 'path'
import { Union } from 'unionfs'
import { Volume } from 'memfs'
import * as fs from 'fs-extra'
import { resolve } from 'path'
import { Command, flags } from '@oclif/command'
import { watch } from 'chokidar'
import chalk from 'chalk'

import { loadConfig } from '../core/config'
import { Config, loadConfig } from '../core/config'
import { build } from '../core/build'
import { loadTheme } from '../core/load-theme'
import { debounce, flatten } from '../core/utils'
import { debounce, flatten, normalizeCss } from '../core/utils'

type Flags = {
config: string
watch: boolean
entry: string[]
output: string[]
check: boolean
}

export default class Build extends Command {
Expand All @@ -38,6 +43,10 @@ export default class Build extends Command {
multiple: true,
description: 'Builds selected outputs.',
}),
check: flags.boolean({
description: 'Checks existent output files satisfy the config file.',
default: false,
}),
}

async run() {
Expand All @@ -47,6 +56,10 @@ export default class Build extends Command {
outputs: flags.output,
})

if (flags.check) {
return this.check(config)
}

await this.build(config)

if (flags.watch) {
Expand Down Expand Up @@ -85,12 +98,61 @@ export default class Build extends Command {
}
}

private async build(config: any) {
private async build(config: Config) {
console.log(`----------------- ${chalk.yellow('Build started')} -----------------`)
await build(config)
console.log(`\n---------------- ${chalk.green('Build completed')} ----------------`)
}

private async check(config: Config) {
const memfs = Volume.fromJSON({})
const ufs = new Union().use(fs as any).use(memfs as any)

// workaround https://github.com/streamich/unionfs/issues/425
const { openSync } = ufs
ufs.openSync = function(this, path) {
if (typeof path === 'string') {
memfs.mkdirpSync(dirname(path))
}
return openSync.apply(this, arguments as any)
}

const unpatchFsExtra = require('fs-monkey').patchFs(ufs, require('fs-extra'))
const unpatchFs = require('fs-monkey').patchFs(ufs)
try {
await build(config)
} finally {
unpatchFsExtra()
unpatchFs()
}

let failed = false
const files = memfs.toJSON()

for (const [fileName, fileContent] of Object.entries(files)) {
if (fileContent) {
if (!fs.existsSync(fileName)) {
console.log(chalk.red(`${relative(process.cwd(), fileName)} doesn't exist`))
continue
}
const fileOldContent = fs.readFileSync(fileName, 'utf8')
if (fileName.endsWith('.css')) {
if (normalizeCss(fileContent) !== normalizeCss(fileOldContent)) {
failed = true
console.log(chalk.red(`${relative(process.cwd(), fileName)} (CSS file) is outdated`))
}
} else if (fileContent !== fileOldContent) {
failed = true
console.log(chalk.red(`${relative(process.cwd(), fileName)} (text file) is outdated`))
}
}
}

if (failed) {
throw 'failed'
}
}

private emitWatching() {
console.log('\nWatching for changes...')
}
Expand Down
6 changes: 6 additions & 0 deletions src/core/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,9 @@ export function flatten<T extends any[]>(arrays: T[]): ArrayType<T>[] {
export function normalizePaths(paths: string[]): string[] {
return paths.map((path) => normalize(path))
}

export function normalizeCss(text: string): string {
const csso = require('csso')
// workaround https://github.com/css/csso/issues/422
return csso.minify(text.replace(/--/g, '____')).css.replace(/____/g, '--')
}
64 changes: 8 additions & 56 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,14 @@
{
"compilerOptions": {
/* Basic Options */
"target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"declaration": true /* Generates corresponding '.d.ts' file. */,
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./lib" /* Redirect output structure to the directory. */,
"rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
"target": "es6",
"module": "commonjs",
"declaration": true,
"outDir": "./lib",
"rootDir": "./src",
"stripInternal": true,

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
"strict": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true
},
"include": ["src"]
}