From 7c2037dd4d207d7509c798066ee7e3cfb0d04865 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Fri, 10 Nov 2023 15:21:17 +0100 Subject: [PATCH] chore: use require('./package.json') in rollup.config instead of assert to remove the warning (#4469) --- packages/browser/rollup.config.js | 8 +++++--- packages/coverage-istanbul/rollup.config.js | 11 +++++------ packages/coverage-v8/rollup.config.js | 11 +++++------ packages/expect/rollup.config.js | 9 +++++---- packages/runner/rollup.config.js | 8 +++++--- packages/snapshot/rollup.config.js | 6 ++++-- packages/spy/rollup.config.js | 6 ++++-- packages/ui/rollup.config.js | 10 +++++----- packages/utils/rollup.config.js | 6 ++++-- packages/vite-node/rollup.config.js | 6 ++++-- packages/vitest/rollup.config.js | 5 +++-- packages/web-worker/rollup.config.js | 7 ++++--- 12 files changed, 53 insertions(+), 40 deletions(-) diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js index 26315b521..910c332a6 100644 --- a/packages/browser/rollup.config.js +++ b/packages/browser/rollup.config.js @@ -1,15 +1,17 @@ +import { createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import resolve from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...Object.keys(pkg.dependencies), ...Object.keys(pkg.peerDependencies || {}), - 'vitest/node', - 'vitest', + /^@?vitest(\/|$)/, 'worker_threads', 'node:worker_threads', ] diff --git a/packages/coverage-istanbul/rollup.config.js b/packages/coverage-istanbul/rollup.config.js index fef84f6e4..ae5351536 100644 --- a/packages/coverage-istanbul/rollup.config.js +++ b/packages/coverage-istanbul/rollup.config.js @@ -1,11 +1,13 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' import nodeResolve from '@rollup/plugin-node-resolve' import { join } from 'pathe' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = { index: 'src/index.ts', @@ -16,10 +18,7 @@ const external = [ ...builtinModules, ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), - 'vitest', - 'vitest/node', - 'vitest/config', - 'vitest/coverage', + /^@?vitest(\/|$)/, ] const plugins = [ diff --git a/packages/coverage-v8/rollup.config.js b/packages/coverage-v8/rollup.config.js index 3872be2e1..eb5897fd6 100644 --- a/packages/coverage-v8/rollup.config.js +++ b/packages/coverage-v8/rollup.config.js @@ -1,11 +1,13 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' import nodeResolve from '@rollup/plugin-node-resolve' import { join } from 'pathe' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = { index: 'src/index.ts', @@ -17,10 +19,7 @@ const external = [ ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), 'node:inspector', - 'vitest', - 'vitest/node', - 'vitest/config', - 'vitest/coverage', + /^@?vitest(\/|$)/, ] const plugins = [ diff --git a/packages/expect/rollup.config.js b/packages/expect/rollup.config.js index ca7d4a1c2..901c03cef 100644 --- a/packages/expect/rollup.config.js +++ b/packages/expect/rollup.config.js @@ -1,16 +1,17 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import { defineConfig } from 'rollup' import copy from 'rollup-plugin-copy' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...builtinModules, ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), - '@vitest/utils/diff', - '@vitest/utils/error', + /^@?vitest(\/|$)/, ] const plugins = [ diff --git a/packages/runner/rollup.config.js b/packages/runner/rollup.config.js index cebc5be64..428029800 100644 --- a/packages/runner/rollup.config.js +++ b/packages/runner/rollup.config.js @@ -1,15 +1,17 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import json from '@rollup/plugin-json' import dts from 'rollup-plugin-dts' import { defineConfig } from 'rollup' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...builtinModules, ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), - '@vitest/utils/error', + /^@?vitest(\/|$)/, ] const entries = { diff --git a/packages/snapshot/rollup.config.js b/packages/snapshot/rollup.config.js index c74d3fefe..32d75de37 100644 --- a/packages/snapshot/rollup.config.js +++ b/packages/snapshot/rollup.config.js @@ -1,10 +1,12 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import nodeResolve from '@rollup/plugin-node-resolve' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import { defineConfig } from 'rollup' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...builtinModules, diff --git a/packages/spy/rollup.config.js b/packages/spy/rollup.config.js index ef9793181..fa89fdadc 100644 --- a/packages/spy/rollup.config.js +++ b/packages/spy/rollup.config.js @@ -1,8 +1,10 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import { defineConfig } from 'rollup' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...builtinModules, diff --git a/packages/ui/rollup.config.js b/packages/ui/rollup.config.js index bedc86537..830e4acea 100644 --- a/packages/ui/rollup.config.js +++ b/packages/ui/rollup.config.js @@ -1,10 +1,12 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import resolve from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const external = [ ...builtinModules, @@ -12,10 +14,8 @@ const external = [ ...Object.keys(pkg.peerDependencies || {}), 'worker_threads', 'node:worker_threads', - 'vitest/node', - 'vitest/config', + /^@?vitest(\/|$)/, 'vite', - 'vitest', ] const entries = [ diff --git a/packages/utils/rollup.config.js b/packages/utils/rollup.config.js index 504e2d267..8630b787f 100644 --- a/packages/utils/rollup.config.js +++ b/packages/utils/rollup.config.js @@ -1,10 +1,12 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import { defineConfig } from 'rollup' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import resolve from '@rollup/plugin-node-resolve' import json from '@rollup/plugin-json' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = { 'index': 'src/index.ts', diff --git a/packages/vite-node/rollup.config.js b/packages/vite-node/rollup.config.js index d26b3d20e..b9f3d7712 100644 --- a/packages/vite-node/rollup.config.js +++ b/packages/vite-node/rollup.config.js @@ -1,11 +1,13 @@ -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import resolve from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' import { defineConfig } from 'rollup' -import pkg from './package.json' assert { type: 'json' } + +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = { 'index': 'src/index.ts', diff --git a/packages/vitest/rollup.config.js b/packages/vitest/rollup.config.js index a6896ce73..b7e51caf9 100644 --- a/packages/vitest/rollup.config.js +++ b/packages/vitest/rollup.config.js @@ -1,5 +1,5 @@ import fs from 'node:fs' -import { builtinModules } from 'node:module' +import { builtinModules, createRequire } from 'node:module' import { fileURLToPath } from 'node:url' import { dirname, join, normalize, relative, resolve } from 'pathe' import esbuild from 'rollup-plugin-esbuild' @@ -12,7 +12,8 @@ import c from 'picocolors' import fg from 'fast-glob' import { defineConfig } from 'rollup' -import pkg from './package.json' assert { type: 'json' } +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = [ 'src/index.ts', diff --git a/packages/web-worker/rollup.config.js b/packages/web-worker/rollup.config.js index 2a46110d4..ca2a99603 100644 --- a/packages/web-worker/rollup.config.js +++ b/packages/web-worker/rollup.config.js @@ -1,10 +1,12 @@ +import { createRequire } from 'node:module' import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import nodeResolve from '@rollup/plugin-node-resolve' import json from '@rollup/plugin-json' -import pkg from './package.json' assert { type: 'json' } +const require = createRequire(import.meta.url) +const pkg = require('./package.json') const entries = { index: 'src/index.ts', @@ -14,8 +16,7 @@ const entries = { const external = [ ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), - 'vitest', - 'vitest/execute', + /^@?vitest(\/|$)/, 'vite-node/utils', ] -- 2.51.2