tailwindcss 0.0.0-oxide-insiders.6a2c58a → 0.0.0-oxide-insiders.e046a37

package/lib/cli/build/watching.js

@@ -64,7 +64,9 @@ function createWatcher(args, { state , rebuild  }) {
         // Clear all pending rebuilds for the about-to-be-built files
         changes.forEach((change)=>pendingRebuilds.delete(change.file));
         // Resolve the promise even when the rebuild fails
-        return rebuild(changes).then(()=>{}, ()=>{});
+        return rebuild(changes).then(()=>{}, (e)=>{
+            console.error(e.toString());
+        });
     }
     /**
    *

package/lib/lib/getModuleDependencies.js

@@ -8,56 +8,89 @@ Object.defineProperty(exports, "default", {
 });
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _resolve = /*#__PURE__*/ _interopRequireDefault(require("resolve"));
-const _detectiveTypescript = /*#__PURE__*/ _interopRequireDefault(require("detective-typescript"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function createModule(file) {
-    let source = _fs.default.readFileSync(file, "utf-8");
-    return {
-        file,
-        requires: (0, _detectiveTypescript.default)(source, {
-            mixedImports: true
-        })
-    };
-}
-function* _getModuleDependencies(entryFile) {
-    yield entryFile;
-    let mod = createModule(entryFile);
-    let ext = _path.default.extname(entryFile);
-    let isTypeScript = ext === ".ts" || ext === ".cts" || ext === ".mts";
-    let extensions = [
-        ...isTypeScript ? [
-            ".ts",
-            ".cts",
-            ".mts"
-        ] : [],
-        ".js",
-        ".cjs",
-        ".mjs"
-    ];
-    // Iterate over the modules, even when new
-    // ones are being added
-    for (let dep of mod.requires){
-        // Only track local modules, not node_modules
-        if (!dep.startsWith("./") && !dep.startsWith("../")) {
-            continue;
+let jsExtensions = [
+    ".js",
+    ".cjs",
+    ".mjs"
+];
+// Given the current file `a.ts`, we want to make sure that when importing `b` that we resolve
+// `b.ts` before `b.js`
+//
+// E.g.:
+//
+// a.ts
+//   b // .ts
+//   c // .ts
+// a.js
+//   b // .js or .ts
+let jsResolutionOrder = [
+    "",
+    ".js",
+    ".cjs",
+    ".mjs",
+    ".ts",
+    ".cts",
+    ".mts",
+    ".jsx",
+    ".tsx"
+];
+let tsResolutionOrder = [
+    "",
+    ".ts",
+    ".cts",
+    ".mts",
+    ".tsx",
+    ".js",
+    ".cjs",
+    ".mjs",
+    ".jsx"
+];
+function resolveWithExtension(file, extensions) {
+    // Try to find `./a.ts`, `./a.ts`, ... from `./a`
+    for (let ext of extensions){
+        let full = `${file}${ext}`;
+        if (_fs.default.existsSync(full) && _fs.default.statSync(full).isFile()) {
+            return full;
         }
-        try {
-            let basedir = _path.default.dirname(mod.file);
-            let depPath = _resolve.default.sync(dep, {
-                basedir,
-                extensions
-            });
-            yield* _getModuleDependencies(depPath);
-        } catch (_err) {
-        // eslint-disable-next-line no-empty
+    }
+    // Try to find `./a/index.js` from `./a`
+    for (let ext of extensions){
+        let full = `${file}/index${ext}`;
+        if (_fs.default.existsSync(full)) {
+            return full;
         }
     }
+    return null;
+}
+function* _getModuleDependencies(filename, base, seen) {
+    let ext = _path.default.extname(filename);
+    // Try to find the file
+    let absoluteFile = resolveWithExtension(_path.default.resolve(base, filename), jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder);
+    if (absoluteFile === null) return; // File doesn't exist
+    // Prevent infinite loops when there are circular dependencies
+    if (seen.has(absoluteFile)) return; // Already seen
+    seen.add(absoluteFile);
+    // Mark the file as a dependency
+    yield absoluteFile;
+    // Resolve new base for new imports/requires
+    base = _path.default.dirname(absoluteFile);
+    let contents = _fs.default.readFileSync(absoluteFile, "utf-8");
+    // Find imports/requires
+    for (let match of [
+        ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
+        ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
+        ...contents.matchAll(/require\(['"`](.{3,})['"`]\)/gi)
+    ]){
+        // Bail out if it's not a relative file
+        if (!match[1].startsWith(".")) continue;
+        yield* _getModuleDependencies(match[1], base, seen);
+    }
 }
-function getModuleDependencies(entryFile) {
-    return new Set(_getModuleDependencies(entryFile));
+function getModuleDependencies(absoluteFilePath) {
+    return new Set(_getModuleDependencies(absoluteFilePath, _path.default.dirname(absoluteFilePath), new Set()));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide-insiders.6a2c58a",
+  "version": "0.0.0-oxide-insiders.e046a37",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -70,12 +70,11 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "@tailwindcss/oxide": "0.0.0-oxide-insiders.6a2c58a",
+    "@tailwindcss/oxide": "0.0.0-oxide-insiders.e046a37",
     "arg": "^5.0.2",
     "browserslist": "^4.21.5",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
-    "detective-typescript": "^9.0.0",
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.12",

package/src/cli/build/watching.js

@@ -89,7 +89,9 @@ export function createWatcher(args, { state, rebuild }) {
     // Resolve the promise even when the rebuild fails
     return rebuild(changes).then(
       () => {},
-      () => {}
+      (e) => {
+        console.error(e.toString())
+      }
     )
   }
 

package/src/lib/getModuleDependencies.js

@@ -1,40 +1,79 @@
 import fs from 'fs'
 import path from 'path'
-import resolve from 'resolve'
-import detective from 'detective-typescript'
 
-function createModule(file) {
-  let source = fs.readFileSync(file, 'utf-8')
-  return { file, requires: detective(source, { mixedImports: true }) }
-}
-
-function* _getModuleDependencies(entryFile) {
-  yield entryFile
+let jsExtensions = ['.js', '.cjs', '.mjs']
 
-  let mod = createModule(entryFile)
+// Given the current file `a.ts`, we want to make sure that when importing `b` that we resolve
+// `b.ts` before `b.js`
+//
+// E.g.:
+//
+// a.ts
+//   b // .ts
+//   c // .ts
+// a.js
+//   b // .js or .ts
 
-  let ext = path.extname(entryFile)
-  let isTypeScript = ext === '.ts' || ext === '.cts' || ext === '.mts'
-  let extensions = [...(isTypeScript ? ['.ts', '.cts', '.mts'] : []), '.js', '.cjs', '.mjs']
+let jsResolutionOrder = ['', '.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.jsx', '.tsx']
+let tsResolutionOrder = ['', '.ts', '.cts', '.mts', '.tsx', '.js', '.cjs', '.mjs', '.jsx']
 
-  // Iterate over the modules, even when new
-  // ones are being added
-  for (let dep of mod.requires) {
-    // Only track local modules, not node_modules
-    if (!dep.startsWith('./') && !dep.startsWith('../')) {
-      continue
+function resolveWithExtension(file, extensions) {
+  // Try to find `./a.ts`, `./a.ts`, ... from `./a`
+  for (let ext of extensions) {
+    let full = `${file}${ext}`
+    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
+      return full
     }
+  }
 
-    try {
-      let basedir = path.dirname(mod.file)
-      let depPath = resolve.sync(dep, { basedir, extensions })
-      yield* _getModuleDependencies(depPath)
-    } catch (_err) {
-      // eslint-disable-next-line no-empty
+  // Try to find `./a/index.js` from `./a`
+  for (let ext of extensions) {
+    let full = `${file}/index${ext}`
+    if (fs.existsSync(full)) {
+      return full
     }
   }
+
+  return null
+}
+
+function* _getModuleDependencies(filename, base, seen) {
+  let ext = path.extname(filename)
+
+  // Try to find the file
+  let absoluteFile = resolveWithExtension(
+    path.resolve(base, filename),
+    jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder
+  )
+  if (absoluteFile === null) return // File doesn't exist
+
+  // Prevent infinite loops when there are circular dependencies
+  if (seen.has(absoluteFile)) return // Already seen
+  seen.add(absoluteFile)
+
+  // Mark the file as a dependency
+  yield absoluteFile
+
+  // Resolve new base for new imports/requires
+  base = path.dirname(absoluteFile)
+
+  let contents = fs.readFileSync(absoluteFile, 'utf-8')
+
+  // Find imports/requires
+  for (let match of [
+    ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
+    ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
+    ...contents.matchAll(/require\(['"`](.{3,})['"`]\)/gi),
+  ]) {
+    // Bail out if it's not a relative file
+    if (!match[1].startsWith('.')) continue
+
+    yield* _getModuleDependencies(match[1], base, seen)
+  }
 }
 
-export default function getModuleDependencies(entryFile) {
-  return new Set(_getModuleDependencies(entryFile))
+export default function getModuleDependencies(absoluteFilePath) {
+  return new Set(
+    _getModuleDependencies(absoluteFilePath, path.dirname(absoluteFilePath), new Set())
+  )
 }