diff --git a/demos/package.json b/demos/package.json index 276c12c3..bd82433c 100644 --- a/demos/package.json +++ b/demos/package.json @@ -2,7 +2,6 @@ "name": "tiptap-demos", "version": "0.0.0", "private": true, - "type": "module", "scripts": { "start": "vite --host", "build": "yarn ts && vite build", @@ -10,6 +9,7 @@ }, "dependencies": { "d3": "^7.0.4", + "fast-glob": "^3.2.7", "remixicon": "^2.5.0", "shiki": "^0.9.11", "simplify-js": "^1.2.4", @@ -23,7 +23,6 @@ "@vitejs/plugin-react-refresh": "^1.3.6", "@vitejs/plugin-vue": "^1.9.2", "autoprefixer": "^10.3.6", - "globby": "^12.0.2", "iframe-resizer": "^4.3.2", "postcss": "^8.3.8", "react": "^17.0.2", diff --git a/demos/postcss.config.js b/demos/postcss.config.js index b8d8788d..33ad091d 100644 --- a/demos/postcss.config.js +++ b/demos/postcss.config.js @@ -1,10 +1,6 @@ -import tailwind from 'tailwindcss' -import autoprefixer from 'autoprefixer' -import tailwindConfig from './tailwind.config.js' - -export default { - plugins: [ - tailwind(tailwindConfig), - autoprefixer, - ], +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, } diff --git a/demos/tailwind.config.js b/demos/tailwind.config.js index 6934b4fe..d7b2165d 100644 --- a/demos/tailwind.config.js +++ b/demos/tailwind.config.js @@ -1,6 +1,6 @@ -import defaultTheme from 'tailwindcss/defaultTheme.js' +const defaultTheme = require('tailwindcss/defaultTheme') -export default { +module.exports = { mode: 'jit', purge: [ './preview/**/*.{vue,js,ts,jsx,tsx}', diff --git a/demos/vite.config.ts b/demos/vite.config.ts index 335b98dc..81452c3b 100644 --- a/demos/vite.config.ts +++ b/demos/vite.config.ts @@ -6,11 +6,10 @@ import { } from 'path' import { v4 as uuid } from 'uuid' import fs from 'fs' -import { globbySync } from 'globby' +import fg from 'fast-glob' import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' import reactRefresh from '@vitejs/plugin-react-refresh' -import postcss from './postcss.config.js' // import checker from 'vite-plugin-checker' const includeDependencies = fs.readFileSync('./includeDependencies.txt') @@ -24,13 +23,9 @@ export default defineConfig({ include: includeDependencies, }, - css: { - postcss, - }, - build: { rollupOptions: { - input: globbySync('./**/index.html', { + input: fg.sync('./**/index.html', { ignore: ['dist'], }), }, @@ -73,10 +68,10 @@ export default defineConfig({ }, load(id) { if (id === '@demos') { - const demos = globbySync('./src/*/*', { onlyDirectories: true }) + const demos = fg.sync('./src/*/*', { onlyDirectories: true }) .map(demoPath => { const name = demoPath.replace('./src/', '') - const tabs = globbySync(`./src/${name}/*`, { onlyDirectories: true }) + const tabs = fg.sync(`./src/${name}/*`, { onlyDirectories: true }) .map(tabPath => ({ name: basename(tabPath), })) @@ -102,7 +97,7 @@ export default defineConfig({ load(id) { if (id.startsWith('source!')) { const path = id.split('!!')[0].replace('source!', '') - const files = globbySync(`${path}/**/*`, { + const files = fg.sync(`${path}/**/*`, { ignore: [ '**/index.html', '**/*.spec.js', @@ -167,7 +162,7 @@ export default defineConfig({ resolve: { alias: [ - ...globbySync('../packages/*', { onlyDirectories: true }) + ...fg.sync('../packages/*', { onlyDirectories: true }) .map(name => name.replace('../packages/', '')) .map(name => { return { find: `@tiptap/${name}`, replacement: resolve(`../packages/${name}/src/index.ts`) } diff --git a/yarn.lock b/yarn.lock index 9ea7080d..364337b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2763,11 +2763,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== - array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" @@ -4937,18 +4932,6 @@ globby@^11.0.2, globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" -globby@^12.0.2: - version "12.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.0.2.tgz#53788b2adf235602ed4cabfea5c70a1139e1ab11" - integrity sha512-lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ== - dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.8" - merge2 "^1.4.1" - slash "^4.0.0" - graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" @@ -6120,7 +6103,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0, merge2@^1.4.1: +merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -7858,11 +7841,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"