Skip to content

Commit 37db752

Browse files
committed
Replace tiny-colors with yoctocolors-cjs in dist/require/vendor.js
1 parent 4a8692a commit 37db752

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

.config/rollup.base.config.mjs

+21-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { builtinModules, createRequire } from 'node:module'
22
import path from 'node:path'
33

4-
import commonjs from '@rollup/plugin-commonjs'
5-
import json from '@rollup/plugin-json'
4+
import commonjsPlugin from '@rollup/plugin-commonjs'
5+
import jsonPlugin from '@rollup/plugin-json'
66
import { nodeResolve } from '@rollup/plugin-node-resolve'
7-
import replace from '@rollup/plugin-replace'
7+
import replacePlugin from '@rollup/plugin-replace'
88
import { readPackageUpSync } from 'read-package-up'
99
import rangesIntersect from 'semver/ranges/intersects.js'
1010
import { purgePolyfills } from 'unplugin-purge-polyfills'
@@ -43,7 +43,7 @@ const {
4343

4444
const require = createRequire(import.meta.url)
4545

46-
const ts = require('rollup-plugin-ts')
46+
const tsPlugin = require('rollup-plugin-ts')
4747

4848
const rootPackageJson = require(rootPackageJsonPath)
4949
const {
@@ -78,9 +78,10 @@ const checkSocketInteropUseRegExp = new RegExp(`\\b${SOCKET_INTEROP}\\b`)
7878
const danglingRequiresRegExp = /^\s*require\(["'].+?["']\);?\r?\n/gm
7979
const firstUseStrictRegExp = /'use strict';?/
8080
const oraSpinnersAssignmentsRegExp = /(?<=ora[^.]+\.spinners\s*=\s*)[$\w]+/g
81+
const requireTinyColorsRegExp = /require\(["']tiny-colors["']\)/g
8182
const requireUrlAssignmentRegExp =
8283
/(?<=var +)[$\w]+(?= *= *require\('node:url'\))/
83-
const splitUrlRequiresRegExp = /require\('u' \+ 'rl'\)/g
84+
const splitUrlRequiresRegExp = /require\(["']u["']\s*\+\s*["']rl["']\)/g
8485

8586
function isAncestorsExternal(id, depStats) {
8687
let currNmIndex = id.indexOf(SLASH_NODE_MODULES_SLASH)
@@ -207,8 +208,8 @@ export default function baseConfig(extendConfig = {}) {
207208
...extendConfig,
208209
plugins: [
209210
customResolver,
210-
json(),
211-
ts({
211+
jsonPlugin(),
212+
tsPlugin({
212213
transpiler: 'babel',
213214
browserslist: false,
214215
transpileOnly: true,
@@ -219,12 +220,22 @@ export default function baseConfig(extendConfig = {}) {
219220
purgePolyfills.rollup({
220221
replacements: {}
221222
}),
223+
replacePlugin({
224+
delimiters: ['(?<=(?:require\\(|from\\s*)["\'])', '(?=["\'])'],
225+
preventAssignment: false,
226+
values: builtinAliases
227+
}),
222228
// Convert un-prefixed built-in imports into "node:"" prefixed forms.
223-
replace({
229+
replacePlugin({
224230
delimiters: ['(?<=(?:require\\(|from\\s*)["\'])', '(?=["\'])'],
225231
preventAssignment: false,
226232
values: builtinAliases
227233
}),
234+
// Replace ESM package require('tiny-colors') with CJS package require('yoctocolors-cjs').
235+
socketModifyPlugin({
236+
find: requireTinyColorsRegExp,
237+
replace: "require('yoctocolors-cjs')"
238+
}),
228239
// Try to convert `require('u' + 'rl')` into something like `require$$2$3`.
229240
socketModifyPlugin({
230241
find: splitUrlRequiresRegExp,
@@ -253,7 +264,7 @@ export default function baseConfig(extendConfig = {}) {
253264
)
254265
}
255266
}),
256-
commonjs({
267+
commonjsPlugin({
257268
defaultIsModuleExports: true,
258269
extensions: ['.cjs', '.js', '.ts', `.ts${ROLLUP_ENTRY_SUFFIX}`],
259270
ignoreDynamicRequires: true,
@@ -311,7 +322,7 @@ function ${SOCKET_INTEROP}(e) {
311322

312323
// Replace hard-coded absolute paths in source with hard-coded relative paths.
313324
const replaceAbsPathsOutputPlugin = (() => {
314-
const { name, renderChunk } = replace({
325+
const { name, renderChunk } = replacePlugin({
315326
delimiters: ['(?<=["\'])', '/'],
316327
preventAssignment: false,
317328
values: {

0 commit comments

Comments
 (0)