tailwindcss 0.0.0-insiders.d58d5b2 → 0.0.0-insiders.d593a21

package/scripts/generate-types.js

@@ -1,105 +0,0 @@
-import prettier from 'prettier'
-import { corePlugins } from '../src/corePlugins'
-import colors from '../src/public/colors'
-import defaultTheme from '../src/public/default-theme'
-import fs from 'fs'
-import path from 'path'
-import * as types from './type-utils'
-
-fs.writeFileSync(
-  path.join(process.cwd(), 'types', 'generated', 'corePluginList.d.ts'),
-  `export type CorePluginList = ${Object.keys(corePlugins)
-    .map((p) => `'${p}'`)
-    .join(' | ')}`
-)
-
-let colorsWithoutDeprecatedColors = Object.fromEntries(
-  Object.entries(Object.getOwnPropertyDescriptors(colors))
-    .filter(([_, { value }]) => {
-      return typeof value !== 'undefined'
-    })
-    .map(([name, definition]) => [name, definition.value])
-)
-
-let deprecatedColors = Object.entries(Object.getOwnPropertyDescriptors(colors))
-  .filter(([_, { value }]) => {
-    return typeof value === 'undefined'
-  })
-  .map(([name, definition]) => {
-    let warn = console.warn
-    let messages = []
-    console.warn = (...args) => messages.push(args.pop())
-    definition.get()
-    console.warn = warn
-    let message = messages.join(' ').trim()
-    let newColor = message.match(/renamed to `(.*)`/)[1]
-    return `/** @deprecated ${message} */${name}: DefaultColors['${newColor}'],`
-  })
-  .join('\n')
-
-fs.writeFileSync(
-  path.join(process.cwd(), 'types', 'generated', 'colors.d.ts'),
-  prettier.format(
-    `export interface DefaultColors { ${JSON.stringify(colorsWithoutDeprecatedColors).slice(
-      1,
-      -1
-    )}\n${deprecatedColors}\n}`,
-    {
-      semi: false,
-      singleQuote: true,
-      printWidth: 100,
-      parser: 'typescript',
-    }
-  )
-)
-
-const defaultThemeTypes = Object.entries(defaultTheme)
-  .map(([name, value]) => {
-    // Special cases for slightly more accurate types
-    if (name === 'keyframes') {
-      return [name, `Record<${types.forKeys(value)}, Record<string, CSSDeclarationList>>`]
-    }
-
-    if (name === 'fontSize') {
-      return [name, `Record<${types.forKeys(value)}, [string, { lineHeight: string }]>`]
-    }
-
-    // General cases
-    if (typeof value === 'string') {
-      return [name, `string`]
-    }
-
-    if (typeof value === 'function') {
-      return [name, null]
-    }
-
-    if (typeof value === 'object') {
-      if (Object.keys(value).length === 0) {
-        return [name, null]
-      }
-
-      return [name, types.forValue(value)]
-    }
-
-    return [name, `unknown`]
-  })
-  .filter(([, type]) => type !== null)
-  .map(([name, type]) => `${name}: ${type}`)
-  .join('\n')
-
-fs.writeFileSync(
-  path.join(process.cwd(), 'types', 'generated', 'default-theme.d.ts'),
-  prettier.format(
-    `
-    import { Config } from '../../types'
-    type CSSDeclarationList = Record<string, string>
-    export type DefaultTheme = Config['theme'] & { ${defaultThemeTypes} }
-  `,
-    {
-      semi: false,
-      singleQuote: true,
-      printWidth: 100,
-      parser: 'typescript',
-    }
-  )
-)

package/scripts/release-channel.js

@@ -1,18 +0,0 @@
-// Given a version, figure out what the release channel is so that we can publish to the correct
-// channel on npm.
-//
-// E.g.:
-//
-//   1.2.3                  -> latest (default)
-//   0.0.0-insiders.ffaa88  -> insiders
-//   4.1.0-alpha.4          -> alpha
-
-let version =
-  process.argv[2] || process.env.npm_package_version || require('../package.json').version
-
-let match = /\d+\.\d+\.\d+-(.*)\.\d+/g.exec(version)
-if (match) {
-  console.log(match[1])
-} else {
-  console.log('latest')
-}

package/scripts/release-notes.js

@@ -1,21 +0,0 @@
-// Given a version, figure out what the release notes are so that we can use this to pre-fill the
-// release notes on a GitHub release for the current version.
-
-let path = require('path')
-let fs = require('fs')
-
-let version =
-  process.argv[2] || process.env.npm_package_version || require('../package.json').version
-
-let changelog = fs.readFileSync(path.resolve(__dirname, '..', 'CHANGELOG.md'), 'utf8')
-let match = new RegExp(
-  `## \\[${version}\\] - (.*)\\n\\n([\\s\\S]*?)\\n(?:(?:##\\s)|(?:\\[))`,
-  'g'
-).exec(changelog)
-
-if (match) {
-  let [, , notes] = match
-  console.log(notes.trim())
-} else {
-  console.log(`Placeholder release notes for version: v${version}`)
-}

package/scripts/type-utils.js

@@ -1,27 +0,0 @@
-export function union(types) {
-  return [...new Set(types)].join(' | ')
-}
-
-export function unionValues(values) {
-  return union(values.map(forValue))
-}
-
-export function forKeys(value) {
-  return union(Object.keys(value).map((key) => `'${key}'`))
-}
-
-export function forValue(value) {
-  if (Array.isArray(value)) {
-    return `(${unionValues(value)})[]`
-  }
-
-  if (typeof value === 'object') {
-    return `Record<${forKeys(value)}, ${unionValues(Object.values(value))}>`
-  }
-
-  if (typeof value === 'string') {
-    return `string`
-  }
-
-  return `any`
-}

package/src/cli/build/index.js

@@ -1,53 +0,0 @@
-// @ts-check
-
-import fs from 'fs'
-import path from 'path'
-import { resolveDefaultConfigPath } from '../../util/resolveConfigPath.js'
-import { createProcessor } from './plugin.js'
-
-export async function build(args) {
-  let input = args['--input']
-  let shouldWatch = args['--watch']
-
-  // TODO: Deprecate this in future versions
-  if (!input && args['_'][1]) {
-    console.error('[deprecation] Running tailwindcss without -i, please provide an input file.')
-    input = args['--input'] = args['_'][1]
-  }
-
-  if (input && input !== '-' && !fs.existsSync((input = path.resolve(input)))) {
-    console.error(`Specified input file ${args['--input']} does not exist.`)
-    process.exit(9)
-  }
-
-  if (args['--config'] && !fs.existsSync((args['--config'] = path.resolve(args['--config'])))) {
-    console.error(`Specified config file ${args['--config']} does not exist.`)
-    process.exit(9)
-  }
-
-  if (args['--no-autoprefixer']) {
-    console.error('[deprecation] The --no-autoprefixer flag is deprecated and has no effect.')
-  }
-
-  // TODO: Reference the @config path here if exists
-  let configPath = args['--config'] ? args['--config'] : resolveDefaultConfigPath()
-
-  let processor = await createProcessor(args, configPath)
-
-  if (shouldWatch) {
-    // Abort the watcher if stdin is closed to avoid zombie processes
-    // You can disable this behavior with --watch=always
-    if (args['--watch'] !== 'always') {
-      process.stdin.on('end', () => process.exit(0))
-    }
-
-    process.stdin.resume()
-
-    await processor.watch()
-  } else {
-    await processor.build().catch((e) => {
-      console.error(e)
-      process.exit(1)
-    })
-  }
-}

package/src/cli/build/plugin.js

@@ -1,469 +0,0 @@
-// @ts-check
-
-import pkg from '../../../package.json'
-import path from 'path'
-import fs from 'fs'
-import postcss from 'postcss'
-import postcssrc from 'postcss-load-config'
-import browserslist from 'browserslist'
-import lightning, { Features } from 'lightningcss'
-import { lilconfig } from 'lilconfig'
-import loadPlugins from 'postcss-load-config/src/plugins' // Little bit scary, looking at private/internal API
-import loadOptions from 'postcss-load-config/src/options' // Little bit scary, looking at private/internal API
-
-import tailwind from '../../processTailwindFeatures'
-import { formatNodes, drainStdin, outputFile } from './utils'
-import { env } from '../../lib/sharedState'
-import resolveConfig from '../../../resolveConfig.js'
-import { parseCandidateFiles } from '../../lib/content.js'
-import { createWatcher } from './watching.js'
-import fastGlob from 'fast-glob'
-import { findAtConfigPath } from '../../lib/findAtConfigPath.js'
-import log from '../../util/log'
-import { loadConfig } from '../../lib/load-config'
-import getModuleDependencies from '../../lib/getModuleDependencies'
-import { validateConfig } from '../../util/validateConfig'
-import { handleImportAtRules } from '../../lib/handleImportAtRules'
-import { flagEnabled } from '../../featureFlags'
-
-function license() {
-  return `/* ! tailwindcss v${pkg.version} | MIT License | https://tailwindcss.com */\n`
-}
-
-async function lightningcss(result, { map = true, minify = true } = {}) {
-  try {
-    let resolvedBrowsersListConfig = browserslist.findConfig(
-      result.opts.from ?? process.cwd()
-    )?.defaults
-    let defaultBrowsersListConfig = pkg.browserslist
-    let browsersListConfig = resolvedBrowsersListConfig ?? defaultBrowsersListConfig
-
-    let transformed = lightning.transform({
-      filename: result.opts.from || 'input.css',
-      code: Buffer.from(result.css, 'utf-8'),
-      minify,
-      sourceMap: result.map === undefined ? map : !!result.map,
-      inputSourceMap: result.map ? result.map.toString() : undefined,
-      targets: lightning.browserslistToTargets(browserslist(browsersListConfig)),
-      drafts: {
-        nesting: true,
-      },
-      include: Features.Nesting,
-      exclude: Features.LogicalProperties,
-    })
-
-    return Object.assign(result, {
-      css: transformed.code.toString('utf8'),
-      map: result.map
-        ? Object.assign(result.map, {
-            toString() {
-              return transformed.map?.toString()
-            },
-          })
-        : result.map,
-    })
-  } catch (err) {
-    console.error('Unable to use Lightning CSS. Using raw version instead.')
-    console.error(err)
-
-    return result
-  }
-}
-
-/**
- *
- * @param {string} [customPostCssPath ]
- * @returns
- */
-async function loadPostCssPlugins(customPostCssPath) {
-  let config = customPostCssPath
-    ? await (async () => {
-        let file = path.resolve(customPostCssPath)
-
-        // Implementation, see: https://unpkg.com/browse/postcss-load-config@3.1.0/src/index.js
-        // @ts-ignore
-        let { config = {} } = await lilconfig('postcss').load(file)
-        if (typeof config === 'function') {
-          config = config()
-        } else {
-          config = Object.assign({}, config)
-        }
-
-        if (!config.plugins) {
-          config.plugins = []
-        }
-
-        return {
-          file,
-          plugins: loadPlugins(config, file),
-          options: loadOptions(config, file),
-        }
-      })()
-    : await postcssrc()
-
-  let configPlugins = config.plugins
-
-  let configPluginTailwindIdx = configPlugins.findIndex((plugin) => {
-    if (typeof plugin === 'function' && plugin.name === 'tailwindcss') {
-      return true
-    }
-
-    if (typeof plugin === 'object' && plugin !== null && plugin.postcssPlugin === 'tailwindcss') {
-      return true
-    }
-
-    return false
-  })
-
-  let beforePlugins =
-    configPluginTailwindIdx === -1 ? [] : configPlugins.slice(0, configPluginTailwindIdx)
-  let afterPlugins =
-    configPluginTailwindIdx === -1
-      ? configPlugins
-      : configPlugins.slice(configPluginTailwindIdx + 1)
-
-  return [beforePlugins, afterPlugins, config.options]
-}
-
-let state = {
-  /** @type {any} */
-  context: null,
-
-  /** @type {ReturnType<typeof createWatcher> | null} */
-  watcher: null,
-
-  /** @type {{content: string, extension: string}[]} */
-  changedContent: [],
-
-  /** @type {{config: import('../../../types').Config, dependencies: Set<string>, dispose: Function } | null} */
-  configBag: null,
-
-  contextDependencies: new Set(),
-
-  /** @type {import('../../lib/content.js').ContentPath[]} */
-  contentPaths: [],
-
-  refreshContentPaths() {
-    this.contentPaths = parseCandidateFiles(this.context, this.context?.tailwindConfig)
-  },
-
-  get config() {
-    return this.context.tailwindConfig
-  },
-
-  get contentPatterns() {
-    return {
-      all: this.contentPaths.map((contentPath) => contentPath.pattern),
-      dynamic: this.contentPaths
-        .filter((contentPath) => contentPath.glob !== undefined)
-        .map((contentPath) => contentPath.pattern),
-    }
-  },
-
-  loadConfig(configPath, content) {
-    if (this.watcher && configPath) {
-      this.refreshConfigDependencies()
-    }
-
-    let config = loadConfig(configPath)
-    let dependencies = getModuleDependencies(configPath)
-    this.configBag = {
-      config,
-      dependencies,
-      dispose() {
-        for (let file of dependencies) {
-          delete require.cache[require.resolve(file)]
-        }
-      },
-    }
-
-    this.configBag.config = validateConfig(resolveConfig(this.configBag.config))
-
-    // Override content files if `--content` has been passed explicitly
-    if (content?.length > 0) {
-      this.configBag.config.content.files = content
-    }
-
-    return this.configBag.config
-  },
-
-  refreshConfigDependencies() {
-    env.DEBUG && console.time('Module dependencies')
-    this.configBag?.dispose()
-    env.DEBUG && console.timeEnd('Module dependencies')
-  },
-
-  readContentPaths() {
-    let content = []
-
-    // Resolve globs from the content config
-    // TODO: When we make the postcss plugin async-capable this can become async
-    let files = fastGlob.sync(this.contentPatterns.all)
-
-    for (let file of files) {
-      if (flagEnabled(this.config, 'oxideParser')) {
-        content.push({
-          file,
-          extension: path.extname(file).slice(1),
-        })
-      } else {
-        content.push({
-          content: fs.readFileSync(path.resolve(file), 'utf8'),
-          extension: path.extname(file).slice(1),
-        })
-      }
-    }
-
-    // Resolve raw content in the tailwind config
-    let rawContent = this.config.content.files.filter((file) => {
-      return file !== null && typeof file === 'object'
-    })
-
-    for (let { raw: htmlContent, extension = 'html' } of rawContent) {
-      content.push({ content: htmlContent, extension })
-    }
-
-    return content
-  },
-
-  getContext({ createContext, cliConfigPath, root, result, content }) {
-    if (this.context) {
-      this.context.changedContent = this.changedContent.splice(0)
-
-      return this.context
-    }
-
-    env.DEBUG && console.time('Searching for config')
-    let configPath = findAtConfigPath(root, result) ?? cliConfigPath
-    env.DEBUG && console.timeEnd('Searching for config')
-
-    env.DEBUG && console.time('Loading config')
-    let config = this.loadConfig(configPath, content)
-    env.DEBUG && console.timeEnd('Loading config')
-
-    env.DEBUG && console.time('Creating context')
-    this.context = createContext(config, [])
-    Object.assign(this.context, {
-      userConfigPath: configPath,
-    })
-    env.DEBUG && console.timeEnd('Creating context')
-
-    env.DEBUG && console.time('Resolving content paths')
-    this.refreshContentPaths()
-    env.DEBUG && console.timeEnd('Resolving content paths')
-
-    if (this.watcher) {
-      env.DEBUG && console.time('Watch new files')
-      this.watcher.refreshWatchedFiles()
-      env.DEBUG && console.timeEnd('Watch new files')
-    }
-
-    for (let file of this.readContentPaths()) {
-      this.context.changedContent.push(file)
-    }
-
-    return this.context
-  },
-}
-
-export async function createProcessor(args, cliConfigPath) {
-  let input = args['--input']
-  let output = args['--output']
-  let includePostCss = args['--postcss']
-  let customPostCssPath = typeof args['--postcss'] === 'string' ? args['--postcss'] : undefined
-
-  let [beforePlugins, afterPlugins, postcssOptions] = includePostCss
-    ? await loadPostCssPlugins(customPostCssPath)
-    : [[], [], {}]
-
-  beforePlugins.unshift(...handleImportAtRules())
-
-  if (args['--purge']) {
-    log.warn('purge-flag-deprecated', [
-      'The `--purge` flag has been deprecated.',
-      'Please use `--content` instead.',
-    ])
-
-    if (!args['--content']) {
-      args['--content'] = args['--purge']
-    }
-  }
-
-  let content = args['--content']?.split(/(?<!{[^}]+),/) ?? []
-
-  let tailwindPlugin = () => {
-    return {
-      postcssPlugin: 'tailwindcss',
-      async Once(root, { result }) {
-        env.DEBUG && console.time('Compiling CSS')
-        await tailwind(({ createContext }) => {
-          console.error()
-          console.error('Rebuilding...')
-
-          return () => {
-            return state.getContext({
-              createContext,
-              cliConfigPath,
-              root,
-              result,
-              content,
-            })
-          }
-        })(root, result)
-        env.DEBUG && console.timeEnd('Compiling CSS')
-      },
-    }
-  }
-
-  tailwindPlugin.postcss = true
-
-  let plugins = [
-    ...beforePlugins,
-    tailwindPlugin,
-    !args['--minify'] && formatNodes,
-    ...afterPlugins,
-  ].filter(Boolean)
-
-  /** @type {import('postcss').Processor} */
-  // @ts-ignore
-  let processor = postcss(plugins)
-
-  async function readInput() {
-    // Piping in data, let's drain the stdin
-    if (input === '-') {
-      return drainStdin()
-    }
-
-    // Input file has been provided
-    if (input) {
-      return fs.promises.readFile(path.resolve(input), 'utf8')
-    }
-
-    // No input file provided, fallback to default atrules
-    return '@tailwind base; @tailwind components; @tailwind utilities'
-  }
-
-  async function build() {
-    let start = process.hrtime.bigint()
-    let options = {
-      ...postcssOptions,
-      from: input,
-      to: output,
-    }
-
-    return readInput()
-      .then((css) => processor.process(css, options))
-      .then((result) =>
-        lightningcss(result, {
-          ...options,
-          minify: !!args['--minify'],
-        })
-      )
-      .then((result) => {
-        if (!state.watcher) {
-          return result
-        }
-
-        env.DEBUG && console.time('Recording PostCSS dependencies')
-        for (let message of result.messages) {
-          if (message.type === 'dependency') {
-            state.contextDependencies.add(message.file)
-          }
-        }
-        env.DEBUG && console.timeEnd('Recording PostCSS dependencies')
-
-        // TODO: This needs to be in a different spot
-        env.DEBUG && console.time('Watch new files')
-        state.watcher.refreshWatchedFiles()
-        env.DEBUG && console.timeEnd('Watch new files')
-
-        return result
-      })
-      .then((result) => {
-        if (!output) {
-          process.stdout.write(license() + result.css)
-          return
-        }
-
-        return Promise.all([
-          outputFile(result.opts.to, license() + result.css),
-          result.map && outputFile(result.opts.to + '.map', result.map.toString()),
-        ])
-      })
-      .then(() => {
-        let end = process.hrtime.bigint()
-        console.error()
-        console.error('Done in', (end - start) / BigInt(1e6) + 'ms.')
-      })
-      .then(
-        () => {},
-        (err) => {
-          // TODO: If an initial build fails we can't easily pick up any PostCSS dependencies
-          // that were collected before the error occurred
-          // The result is not stored on the error so we have to store it externally
-          // and pull the messages off of it here somehow
-
-          // This results in a less than ideal DX because the watcher will not pick up
-          // changes to imported CSS if one of them caused an error during the initial build
-          // If you fix it and then save the main CSS file so there's no error
-          // The watcher will start watching the imported CSS files and will be
-          // resilient to future errors.
-
-          if (state.watcher) {
-            console.error(err)
-          } else {
-            return Promise.reject(err)
-          }
-        }
-      )
-  }
-
-  /**
-   * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
-   */
-  async function parseChanges(changes) {
-    return Promise.all(
-      changes.map(async (change) => ({
-        content: await change.content(),
-        extension: change.extension,
-      }))
-    )
-  }
-
-  if (input !== undefined && input !== '-') {
-    state.contextDependencies.add(path.resolve(input))
-  }
-
-  return {
-    build,
-    watch: async () => {
-      state.watcher = createWatcher(args, {
-        state,
-
-        /**
-         * @param {{file: string, content(): Promise<string>, extension: string}[]} changes
-         */
-        async rebuild(changes) {
-          let needsNewContext = changes.some((change) => {
-            return (
-              state.configBag?.dependencies.has(change.file) ||
-              state.contextDependencies.has(change.file)
-            )
-          })
-
-          if (needsNewContext) {
-            state.context = null
-          } else {
-            for (let change of await parseChanges(changes)) {
-              state.changedContent.push(change)
-            }
-          }
-
-          return build()
-        },
-      })
-
-      await build()
-    },
-  }
-}