tailwindcss 0.0.0-oxide-insiders.694aea0 → 0.0.0-oxide-insiders.ac1738e

package/src/oxide/cli/init/index.ts

@@ -1,22 +1,49 @@
 import fs from 'fs'
 import path from 'path'
 
-export function init(args, configs) {
-  let messages = []
+function isESM() {
+  const pkgPath = path.resolve('./package.json')
+
+  try {
+    let pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+    return pkg.type && pkg.type === 'module'
+  } catch (err) {
+    return false
+  }
+}
+
+export function init(args) {
+  let messages: string[] = []
+
+  let isProjectESM = args['--ts'] || args['--esm'] || isESM()
+  let syntax = args['--ts'] ? 'ts' : isProjectESM ? 'js' : 'cjs'
+  let extension = args['--ts'] ? 'ts' : 'js'
+
+  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./tailwind.config.${extension}`)
 
-  let tailwindConfigLocation = path.resolve(args['_'][1] ?? `./${configs.tailwind}`)
   if (fs.existsSync(tailwindConfigLocation)) {
     messages.push(`${path.basename(tailwindConfigLocation)} already exists.`)
   } else {
-    let stubFile = fs.readFileSync(
+    let stubContentsFile = fs.readFileSync(
       args['--full']
-        ? path.resolve(__dirname, '../../../../stubs/defaultConfig.stub.js')
-        : path.resolve(__dirname, '../../../../stubs/simpleConfig.stub.js'),
+        ? path.resolve(__dirname, '../../../../stubs/config.full.js')
+        : path.resolve(__dirname, '../../../../stubs/config.simple.js'),
+      'utf8'
+    )
+
+    let stubFile = fs.readFileSync(
+      path.resolve(__dirname, `../../../../stubs/tailwind.config.${syntax}`),
       'utf8'
     )
 
     // Change colors import
-    stubFile = stubFile.replace('../colors', 'tailwindcss/colors')
+    stubContentsFile = stubContentsFile.replace('../colors', 'tailwindcss/colors')
+
+    // Replace contents of {ts,js,cjs} file with the stub {simple,full}.
+    stubFile =
+      stubFile
+        .replace('__CONFIG__', stubContentsFile.replace('module.exports =', '').trim())
+        .trim() + '\n\n'
 
     fs.writeFileSync(tailwindConfigLocation, stubFile, 'utf8')
 

package/src/public/default-config.js

@@ -1,4 +1,4 @@
 import { cloneDeep } from '../util/cloneDeep'
-import defaultConfig from '../../stubs/defaultConfig.stub'
+import defaultConfig from '../../stubs/config.full'
 
 export default cloneDeep(defaultConfig)

package/src/public/default-theme.js

@@ -1,4 +1,4 @@
 import { cloneDeep } from '../util/cloneDeep'
-import defaultConfig from '../../stubs/defaultConfig.stub'
+import defaultFullConfig from '../../stubs/config.full'
 
-export default cloneDeep(defaultConfig.theme)
+export default cloneDeep(defaultFullConfig.theme)

package/src/public/load-config.js

@@ -0,0 +1,2 @@
+import { loadConfig } from '../lib/load-config'
+export default loadConfig

package/src/util/getAllConfigs.js

@@ -1,8 +1,8 @@
-import defaultConfig from '../../stubs/defaultConfig.stub.js'
+import defaultFullConfig from '../../stubs/config.full.js'
 import { flagEnabled } from '../featureFlags'
 
 export default function getAllConfigs(config) {
-  const configs = (config?.presets ?? [defaultConfig])
+  const configs = (config?.presets ?? [defaultFullConfig])
     .slice()
     .reverse()
     .flatMap((preset) => getAllConfigs(preset instanceof Function ? preset() : preset))

package/src/util/resolveConfigPath.js

@@ -1,6 +1,13 @@
 import fs from 'fs'
 import path from 'path'
 
+const defaultConfigFiles = [
+  './tailwind.config.js',
+  './tailwind.config.cjs',
+  './tailwind.config.mjs',
+  './tailwind.config.ts',
+]
+
 function isObject(value) {
   return typeof value === 'object' && value !== null
 }
@@ -43,7 +50,11 @@ export default function resolveConfigPath(pathOrConfig) {
   }
 
   // require('tailwindcss')
-  for (const configFile of ['./tailwind.config.js', './tailwind.config.cjs']) {
+  return resolveDefaultConfigPath()
+}
+
+export function resolveDefaultConfigPath() {
+  for (const configFile of defaultConfigFiles) {
     try {
       const configPath = path.resolve(configFile)
       fs.accessSync(configPath)

package/stubs/.gitignore

@@ -0,0 +1 @@
+!*

package/stubs/.prettierrc.json

@@ -0,0 +1,6 @@
+{
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5"
+}

package/stubs/{defaultConfig.stub.js → config.full.js}

@@ -1,4 +1,3 @@
-/** @type {import('tailwindcss').Config} */
 module.exports = {
   content: [],
   presets: [],

package/stubs/{simpleConfig.stub.js → config.simple.js}

@@ -1,4 +1,3 @@
-/** @type {import('tailwindcss').Config} */
 module.exports = {
   content: [],
   theme: {

package/stubs/postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

package/stubs/tailwind.config.cjs

@@ -0,0 +1,2 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = __CONFIG__

package/stubs/tailwind.config.js

@@ -0,0 +1,2 @@
+/** @type {import('tailwindcss').Config} */
+export default __CONFIG__

package/stubs/tailwind.config.ts

@@ -0,0 +1,3 @@
+import type { Config } from 'tailwindcss'
+
+export default __CONFIG__ satisfies Config

package/lib/constants.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    cli: ()=>cli,
-    defaultConfigFile: ()=>defaultConfigFile,
-    defaultPostCssConfigFile: ()=>defaultPostCssConfigFile,
-    cjsConfigFile: ()=>cjsConfigFile,
-    cjsPostCssConfigFile: ()=>cjsPostCssConfigFile,
-    supportedConfigFiles: ()=>supportedConfigFiles,
-    supportedPostCssConfigFile: ()=>supportedPostCssConfigFile,
-    defaultConfigStubFile: ()=>defaultConfigStubFile,
-    simpleConfigStubFile: ()=>simpleConfigStubFile,
-    defaultPostCssConfigStubFile: ()=>defaultPostCssConfigStubFile
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const cli = "tailwind";
-const defaultConfigFile = "./tailwind.config.js";
-const defaultPostCssConfigFile = "./postcss.config.js";
-const cjsConfigFile = "./tailwind.config.cjs";
-const cjsPostCssConfigFile = "./postcss.config.cjs";
-const supportedConfigFiles = [
-    cjsConfigFile,
-    defaultConfigFile
-];
-const supportedPostCssConfigFile = [
-    cjsPostCssConfigFile,
-    defaultPostCssConfigFile
-];
-const defaultConfigStubFile = _path.default.resolve(__dirname, "../stubs/defaultConfig.stub.js");
-const simpleConfigStubFile = _path.default.resolve(__dirname, "../stubs/simpleConfig.stub.js");
-const defaultPostCssConfigStubFile = _path.default.resolve(__dirname, "../stubs/defaultPostCssConfig.stub.js");

package/src/constants.js

@@ -1,17 +0,0 @@
-import path from 'path'
-
-export const cli = 'tailwind'
-export const defaultConfigFile = './tailwind.config.js'
-export const defaultPostCssConfigFile = './postcss.config.js'
-export const cjsConfigFile = './tailwind.config.cjs'
-export const cjsPostCssConfigFile = './postcss.config.cjs'
-
-export const supportedConfigFiles = [cjsConfigFile, defaultConfigFile]
-export const supportedPostCssConfigFile = [cjsPostCssConfigFile, defaultPostCssConfigFile]
-
-export const defaultConfigStubFile = path.resolve(__dirname, '../stubs/defaultConfig.stub.js')
-export const simpleConfigStubFile = path.resolve(__dirname, '../stubs/simpleConfig.stub.js')
-export const defaultPostCssConfigStubFile = path.resolve(
-  __dirname,
-  '../stubs/defaultPostCssConfig.stub.js'
-)