diff --git a/CHANGELOG.md b/CHANGELOG.md index a99588d39411..24ac901cef2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Nothing yet! +## [3.2.6] - 2023-02-08 + +### Fixed + +- drop oxide api shim ([add16364b4b1100e1af23ad1ca6900a0b53cbba0](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0)) + ## [3.2.5] - 2023-02-08 ### Added @@ -2163,7 +2169,8 @@ No release notes - Everything! -[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...HEAD +[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...HEAD +[3.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...v3.2.6 [3.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...v3.2.5 [3.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.3...v3.2.4 [3.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.2...v3.2.3 diff --git a/oxide-node-api-shim/index.js b/oxide-node-api-shim/index.js deleted file mode 100644 index 85eff736e471..000000000000 --- a/oxide-node-api-shim/index.js +++ /dev/null @@ -1,21 +0,0 @@ -let log = require('../lib/util/log').default - -// This should be a temporary file. -// -// Right now we require `@tailwindcss/oxide` as one of the packages in package.json. This contains -// all the necessary Rust bindings. However, we won't ship those bindings by default yet, and -// therefore you need to install the explicit oxide-insiders version where the Rust bindings are -// available. -// -// To ensure that this doesn't break existing builds of the insiders release, we will use this shim -// to implement all the APIs and show a warning in case you are trying to run `OXIDE=1 npx -// tailwindcs ...` without having installed the oxide-insiders version. -module.exports.parseCandidateStringsFromFiles = function parseCandidateStringsFromFiles( - _changedContent -) { - log.warn('oxide-required', [ - 'It looks like you are trying to run Tailwind CSS with the OXIDE=1 environment variable.', - 'This version does not have the necessary Rust bindings, so please install the `tailwindcss@insiders-oxide` version instead.', - ]) - return [] -} diff --git a/oxide-node-api-shim/package.json b/oxide-node-api-shim/package.json deleted file mode 100644 index 831cef156bae..000000000000 --- a/oxide-node-api-shim/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@tailwindcss/oxide-shim", - "main": "./index.js", - "license": "MIT" -} diff --git a/package-lock.json b/package-lock.json index 57900e74009c..c9706c573602 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "license": "MIT", "workspaces": [ "integrations/*", diff --git a/package-lock.stable.json b/package-lock.stable.json index bf00de57c642..552ad21e8c46 100644 --- a/package-lock.stable.json +++ b/package-lock.stable.json @@ -1,12 +1,12 @@ { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "license": "MIT", "dependencies": { "@tailwindcss/oxide": "file:./oxide-node-api-shim", diff --git a/package.json b/package.json index e973502ccfc3..23702274d009 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js", diff --git a/package.stable.json b/package.stable.json index 57aafc1ef488..1ff633751777 100644 --- a/package.stable.json +++ b/package.stable.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "3.2.5", + "version": "3.2.6", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js", @@ -41,7 +41,6 @@ "stubs/*.stub.js", "nesting/*", "types/**/*", - "oxide-node-api-shim", "*.d.ts", "*.css", "*.js" @@ -71,7 +70,6 @@ "postcss": "^8.0.9" }, "dependencies": { - "@tailwindcss/oxide": "file:./oxide-node-api-shim", "arg": "^5.0.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", diff --git a/src/lib/expandTailwindAtRules.js b/src/lib/expandTailwindAtRules.js index d4688f74c929..504575755ab6 100644 --- a/src/lib/expandTailwindAtRules.js +++ b/src/lib/expandTailwindAtRules.js @@ -6,8 +6,6 @@ import log from '../util/log' import cloneNodes from '../util/cloneNodes' import { defaultExtractor } from './defaultExtractor' -import oxide from '@tailwindcss/oxide' - let env = sharedState.env const builtInExtractors = { @@ -134,7 +132,7 @@ export default function expandTailwindAtRules(context) { if (env.OXIDE) { // TODO: Pass through or implement `extractor` - for (let candidate of oxide.parseCandidateStringsFromFiles( + for (let candidate of require('@tailwindcss/oxide').parseCandidateStringsFromFiles( context.changedContent // Object.assign({}, builtInTransformers, context.tailwindConfig.content.transform) )) {