diff --git a/.gitignore b/.gitignore index 38c6e53f6..9673e8596 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /node_modules /coverage +/cli /lib /example tailwind.config.js diff --git a/package-lock.json b/package-lock.json index 1a56c3efc..bf9c20193 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "tailwindcss", "version": "2.1.2", "license": "MIT", "dependencies": { @@ -46,6 +45,7 @@ "@babel/node": "^7.12.13", "@babel/preset-env": "^7.13.8", "@tailwindcss/aspect-ratio": "^0.2.0", + "@vercel/ncc": "^0.28.5", "autoprefixer": "^10.2.5", "babel-jest": "^26.6.3", "clean-css": "^5.1.2", @@ -73,6 +73,8 @@ "integrity": "sha512-cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw==", "dev": true, "dependencies": { + "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents", + "chokidar": "^3.4.0", "commander": "^4.0.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", @@ -1745,6 +1747,7 @@ "jest-resolve": "^26.6.2", "jest-util": "^26.6.2", "jest-worker": "^26.6.2", + "node-notifier": "^8.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -2143,6 +2146,15 @@ "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==", "dev": true }, + "node_modules/@vercel/ncc": { + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.28.5.tgz", + "integrity": "sha512-ZSwD4EDCon2EsnPZ2/Qcigx4N2DiuBLV/rDnF04giEPFuDeBeUDdnSTyYYfX8KNic/prrJuS1vUEmAOHmj+fRg==", + "dev": true, + "bin": { + "ncc": "dist/ncc/cli.js" + } + }, "node_modules/abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -2847,6 +2859,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -3694,7 +3707,8 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -5819,6 +5833,7 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -6547,6 +6562,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { + "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -11800,6 +11816,12 @@ "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==", "dev": true }, + "@vercel/ncc": { + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.28.5.tgz", + "integrity": "sha512-ZSwD4EDCon2EsnPZ2/Qcigx4N2DiuBLV/rDnF04giEPFuDeBeUDdnSTyYYfX8KNic/prrJuS1vUEmAOHmj+fRg==", + "dev": true + }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -11825,7 +11847,8 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true + "dev": true, + "requires": {} }, "acorn-node": { "version": "1.8.2", @@ -13156,7 +13179,8 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", - "dev": true + "dev": true, + "requires": {} }, "eslint-plugin-prettier": { "version": "3.4.0", @@ -14800,7 +14824,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "26.0.0", @@ -17861,7 +17886,8 @@ "version": "7.4.4", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/package.json b/package.json index 7be369632..03945dfc6 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "bugs": "https://github.com/tailwindlabs/tailwindcss/issues", "homepage": "https://tailwindcss.com", "bin": { - "tailwind": "lib/cli.js", - "tailwindcss": "lib/cli.js" + "tailwind": "cli/index.js", + "tailwindcss": "cli/index.js" }, "contributors": [ "Adam Wathan ", @@ -21,7 +21,7 @@ "prebabelify": "rimraf lib", "babelify": "babel src --out-dir lib --copy-files", "rebuild-fixtures": "npm run babelify && babel-node scripts/rebuildFixtures.js", - "prepublishOnly": "npm run babelify && babel-node scripts/build.js", + "prepublishOnly": "npm run babelify && ncc build lib/cli.js -o cli && babel-node scripts/build.js", "style": "eslint .", "test": "cross-env TAILWIND_MODE=build jest", "posttest": "npm run style", @@ -30,7 +30,7 @@ }, "files": [ "dist/*.css", - "jit/*", + "cli/*", "lib/*", "scripts/*.js", "stubs/*.stub.js", @@ -43,6 +43,7 @@ "@babel/node": "^7.12.13", "@babel/preset-env": "^7.13.8", "@tailwindcss/aspect-ratio": "^0.2.0", + "@vercel/ncc": "^0.28.5", "autoprefixer": "^10.2.5", "babel-jest": "^26.6.3", "clean-css": "^5.1.2",