tailwindcss 0.0.0-oxide-insiders.07fe8bf → 0.0.0-oxide-insiders.019fddb

package/lib/lib/sharedState.js

@@ -18,10 +18,18 @@ _export(exports, {
     NONE: ()=>NONE,
     resolveDebug: ()=>resolveDebug
 });
+const _packageJson = /*#__PURE__*/ _interopRequireDefault(require("../../package.json"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let OXIDE_DEFAULT_ENABLED = _packageJson.default.tailwindcss.engine === "oxide";
 const env = {
     NODE_ENV: process.env.NODE_ENV,
     DEBUG: resolveDebug(process.env.DEBUG),
-    OXIDE: process.env.OXIDE
+    ENGINE: _packageJson.default.tailwindcss.engine,
+    OXIDE: resolveBoolean(process.env.OXIDE, OXIDE_DEFAULT_ENABLED)
 };
 const contextMap = new Map();
 const configContextMap = new Map();
@@ -29,6 +37,15 @@ const contextSourcesMap = new Map();
 const sourceHashMap = new Map();
 const NOT_ON_DEMAND = new String("*");
 const NONE = Symbol("__NONE__");
+function resolveBoolean(value, defaultValue) {
+    if (value === undefined) {
+        return defaultValue;
+    }
+    if (value === "0" || value === "false") {
+        return false;
+    }
+    return true;
+}
 function resolveDebug(debug) {
     if (debug === undefined) {
         return false;

package/lib/oxide/cli/build/plugin.js

@@ -17,7 +17,7 @@ const _options = /*#__PURE__*/ _interopRequireDefault(require("postcss-load-conf
 const _processTailwindFeatures = /*#__PURE__*/ _interopRequireDefault(require("../../../processTailwindFeatures"));
 const _deps = require("./deps");
 const _utils = require("./utils");
-const _shared = require("../shared");
+const _sharedState = require("../../../lib/sharedState");
 const _resolveConfig = /*#__PURE__*/ _interopRequireDefault(require("../../../../resolveConfig"));
 const _getModuleDependencies = /*#__PURE__*/ _interopRequireDefault(require("../../../lib/getModuleDependencies"));
 const _content = require("../../../lib/content");
@@ -142,7 +142,7 @@ let state = {
         return config;
     },
     refreshConfigDependencies (configPath) {
-        _shared.env.DEBUG && console.time("Module dependencies");
+        _sharedState.env.DEBUG && console.time("Module dependencies");
         for (let file of this.configDependencies){
             delete require.cache[require.resolve(file)];
         }
@@ -152,7 +152,7 @@ let state = {
                 this.configDependencies.add(dependency);
             }
         }
-        _shared.env.DEBUG && console.timeEnd("Module dependencies");
+        _sharedState.env.DEBUG && console.timeEnd("Module dependencies");
     },
     readContentPaths () {
         let content = [];
@@ -160,7 +160,7 @@ let state = {
         // TODO: When we make the postcss plugin async-capable this can become async
         let files = _fastGlob.default.sync(this.contentPatterns.all);
         for (let file of files){
-            if (_shared.env.OXIDE) {
+            if (_sharedState.env.OXIDE) {
                 content.push({
                     file,
                     extension: _path.default.extname(file).slice(1)
@@ -189,26 +189,26 @@ let state = {
             this.context.changedContent = this.changedContent.splice(0);
             return this.context;
         }
-        _shared.env.DEBUG && console.time("Searching for config");
+        _sharedState.env.DEBUG && console.time("Searching for config");
         var _findAtConfigPath1;
         let configPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : cliConfigPath;
-        _shared.env.DEBUG && console.timeEnd("Searching for config");
-        _shared.env.DEBUG && console.time("Loading config");
+        _sharedState.env.DEBUG && console.timeEnd("Searching for config");
+        _sharedState.env.DEBUG && console.time("Loading config");
         let config = this.loadConfig(configPath, content);
-        _shared.env.DEBUG && console.timeEnd("Loading config");
-        _shared.env.DEBUG && console.time("Creating context");
+        _sharedState.env.DEBUG && console.timeEnd("Loading config");
+        _sharedState.env.DEBUG && console.time("Creating context");
         this.context = createContext(config, []);
         Object.assign(this.context, {
             userConfigPath: configPath
         });
-        _shared.env.DEBUG && console.timeEnd("Creating context");
-        _shared.env.DEBUG && console.time("Resolving content paths");
+        _sharedState.env.DEBUG && console.timeEnd("Creating context");
+        _sharedState.env.DEBUG && console.time("Resolving content paths");
         this.refreshContentPaths();
-        _shared.env.DEBUG && console.timeEnd("Resolving content paths");
+        _sharedState.env.DEBUG && console.timeEnd("Resolving content paths");
         if (this.watcher) {
-            _shared.env.DEBUG && console.time("Watch new files");
+            _sharedState.env.DEBUG && console.time("Watch new files");
             this.watcher.refreshWatchedFiles();
-            _shared.env.DEBUG && console.timeEnd("Watch new files");
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
         }
         for (let file of this.readContentPaths()){
             this.context.changedContent.push(file);
@@ -239,7 +239,7 @@ async function createProcessor(args, cliConfigPath) {
         return {
             postcssPlugin: "tailwindcss",
             Once (root, { result  }) {
-                _shared.env.DEBUG && console.time("Compiling CSS");
+                _sharedState.env.DEBUG && console.time("Compiling CSS");
                 (0, _processTailwindFeatures.default)(({ createContext  })=>{
                     console.error();
                     console.error("Rebuilding...");
@@ -253,7 +253,7 @@ async function createProcessor(args, cliConfigPath) {
                         });
                     };
                 })(root, result);
-                _shared.env.DEBUG && console.timeEnd("Compiling CSS");
+                _sharedState.env.DEBUG && console.timeEnd("Compiling CSS");
             }
         };
     };
@@ -288,17 +288,17 @@ async function createProcessor(args, cliConfigPath) {
             if (!state.watcher) {
                 return result;
             }
-            _shared.env.DEBUG && console.time("Recording PostCSS dependencies");
+            _sharedState.env.DEBUG && console.time("Recording PostCSS dependencies");
             for (let message of result.messages){
                 if (message.type === "dependency") {
                     state.contextDependencies.add(message.file);
                 }
             }
-            _shared.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
+            _sharedState.env.DEBUG && console.timeEnd("Recording PostCSS dependencies");
             // TODO: This needs to be in a different spot
-            _shared.env.DEBUG && console.time("Watch new files");
+            _sharedState.env.DEBUG && console.time("Watch new files");
             state.watcher.refreshWatchedFiles();
-            _shared.env.DEBUG && console.timeEnd("Watch new files");
+            _sharedState.env.DEBUG && console.timeEnd("Watch new files");
             return result;
         }).then((result)=>{
             if (!output) {

package/lib/plugin.js

@@ -28,9 +28,9 @@ module.exports = function tailwindcss(configOrPath) {
                 let context = (0, _setupTrackingContext.default)(configOrPath);
                 if (root.type === "document") {
                     let roots = root.nodes.filter((node)=>node.type === "root");
-                    for (const root1 of roots){
-                        if (root1.type === "root") {
-                            (0, _processTailwindFeatures.default)(context)(root1, result);
+                    for (const root of roots){
+                        if (root.type === "root") {
+                            (0, _processTailwindFeatures.default)(context)(root, result);
                         }
                     }
                     return;

package/lib/util/defaults.js

@@ -14,10 +14,10 @@ function defaults(target, ...sources) {
                 target[k] = source[k];
             }
         }
-        for (let k1 of Object.getOwnPropertySymbols(source)){
+        for (let k of Object.getOwnPropertySymbols(source)){
             var _target_hasOwnProperty1;
-            if (!(target === null || target === void 0 ? void 0 : (_target_hasOwnProperty1 = target.hasOwnProperty) === null || _target_hasOwnProperty1 === void 0 ? void 0 : _target_hasOwnProperty1.call(target, k1))) {
-                target[k1] = source[k1];
+            if (!(target === null || target === void 0 ? void 0 : (_target_hasOwnProperty1 = target.hasOwnProperty) === null || _target_hasOwnProperty1 === void 0 ? void 0 : _target_hasOwnProperty1.call(target, k))) {
+                target[k] = source[k];
             }
         }
     }

package/lib/util/normalizeConfig.js

@@ -128,8 +128,8 @@ function normalizeConfig(config) {
                 }
                 // `config.content.transform` is optional, and can be a Function or a Record<String, Function>
                 if (typeof config.content.transform === "object") {
-                    for (let value1 of Object.values(config.content.transform)){
-                        if (typeof value1 !== "function") {
+                    for (let value of Object.values(config.content.transform)){
+                        if (typeof value !== "function") {
                             return false;
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-oxide-insiders.07fe8bf",
+  "version": "0.0.0-oxide-insiders.019fddb",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,25 +16,22 @@
     "integrations/*",
     "oxide/crates/node"
   ],
+  "tailwindcss": {
+    "engine": "oxide"
+  },
   "scripts": {
-    "prebuild": "npm run generate && rimraf lib",
-    "build": "swc src --out-dir lib --copy-files",
-    "postbuild": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js --define:process.env.CSS_TRANSFORMER_WASM=false",
-    "rebuild-fixtures": "npm run build && node -r @swc/register scripts/rebuildFixtures.js",
+    "dev": "concurrently -n tailwind,oxide-node -c green,yellow 'npm run dev:js' 'npm run dev:rust'",
+    "build": "npm run build:rust && npm run build:js && npm run build:peers",
+    "test": "jest",
     "style": "eslint .",
-    "pretest": "npm run generate",
-    "test": "jest && OXIDE=1 jest",
-    "test:integrations": "npm run test --prefix ./integrations",
-    "install:integrations": "node scripts/install-integrations.js",
+    "prepublishOnly": "npm install --force && npm run build && npm run generate:types",
+    "dev:rust": "npm run --prefix ./oxide dev:node",
+    "dev:js": "npm run build:js -- --watch",
+    "build:rust": "npm run --prefix ./oxide build:node",
+    "build:js": "npm run generate:plugin-list && swc src --out-dir lib --copy-files --delete-dir-on-start",
+    "build:peers": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js --define:process.env.CSS_TRANSFORMER_WASM=false",
     "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js",
-    "generate:types": "node -r @swc/register scripts/generate-types.js",
-    "generate": "npm run generate:plugin-list && npm run generate:types",
-    "release-channel": "node ./scripts/release-channel.js",
-    "release-notes": "node ./scripts/release-notes.js",
-    "oxide:install": "npm run install:all --prefix ./oxide",
-    "oxide:dev": "concurrently -n tailwind,oxide-node -c green,yellow 'npm run build -- --watch' 'npm run --prefix ./oxide dev:node'",
-    "oxide:build": "npm run --prefix ./oxide build:node && npm run build",
-    "prepublishOnly": "npm install --force && npm run build"
+    "generate:types": "node -r @swc/register scripts/generate-types.js"
   },
   "files": [
     "src/*",
@@ -45,26 +42,25 @@
     "stubs/*.stub.js",
     "nesting/*",
     "types/**/*",
-    "oxide-node-api-shim",
     "*.d.ts",
     "*.css",
     "*.js"
   ],
   "devDependencies": {
     "@swc/cli": "0.1.59",
-    "@swc/core": "1.3.24",
+    "@swc/core": "1.3.27",
     "@swc/jest": "0.2.24",
     "@swc/register": "0.1.10",
     "autoprefixer": "^10.4.13",
     "concurrently": "^7.5.0",
     "cssnano": "^5.1.14",
-    "esbuild": "^0.16.10",
+    "esbuild": "^0.17.3",
     "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^28.1.3",
     "jest-diff": "^28.1.3",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2",
     "turbo": "^1.7.0"
@@ -73,7 +69,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
-    "@tailwindcss/oxide": "0.0.0-oxide-insiders.07fe8bf",
+    "@tailwindcss/oxide": "0.0.0-oxide-insiders.019fddb",
     "arg": "^5.0.2",
     "browserslist": "^4.21.4",
     "chokidar": "^3.5.3",
@@ -108,6 +104,7 @@
   ],
   "jest": {
     "testTimeout": 30000,
+    "globalSetup": "<rootDir>/jest/global-setup.js",
     "setupFilesAfterEnv": [
       "<rootDir>/jest/customMatchers.js"
     ],
@@ -123,6 +120,6 @@
     }
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=16.0.0"
   }
 }