From e5b9ea04e9f72a37031b6c3f4df183ac29ccad9a Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 25 Jan 2022 15:20:14 +0000 Subject: [PATCH] refactor: migrate to `knitwork` --- packages/bridge/src/vite/templates.ts | 4 ++-- packages/kit/package.json | 1 + packages/kit/src/components.ts | 2 +- packages/kit/src/internal/template.ts | 2 +- packages/nitro/package.json | 1 + packages/nitro/src/build.ts | 2 +- packages/nitro/src/rollup/config.ts | 3 ++- packages/nitro/src/rollup/plugins/assets.ts | 2 +- packages/nitro/src/rollup/plugins/dynamic-require.ts | 2 +- packages/nitro/src/rollup/plugins/middleware.ts | 2 +- packages/nitro/src/rollup/plugins/storage.ts | 2 +- packages/nuxt3/build.config.ts | 1 + packages/nuxt3/package.json | 1 + packages/nuxt3/src/auto-imports/module.ts | 2 +- packages/nuxt3/src/auto-imports/utils.ts | 2 +- packages/nuxt3/src/components/loader.ts | 2 +- packages/nuxt3/src/components/templates.ts | 2 +- packages/nuxt3/src/core/templates.ts | 2 +- packages/nuxt3/src/pages/module.ts | 2 +- packages/vite/package.json | 1 + packages/vite/src/dev-bundler.ts | 2 +- yarn.lock | 11 +++++++++++ 22 files changed, 34 insertions(+), 17 deletions(-) diff --git a/packages/bridge/src/vite/templates.ts b/packages/bridge/src/vite/templates.ts index f1febcc3835..ac5971bdce0 100644 --- a/packages/bridge/src/vite/templates.ts +++ b/packages/bridge/src/vite/templates.ts @@ -2,7 +2,7 @@ import hash from 'hash-sum' import { resolve } from 'pathe' import type { Nuxt, NuxtApp } from '@nuxt/schema' -import { genImport, genObjectFromRawEntries } from 'mlly' +import { genImport, genObjectFromRawEntries } from 'knitwork' type TemplateContext = { nuxt: Nuxt; @@ -25,7 +25,7 @@ export const middlewareTemplate = { id: m.name || m.src.replace(/[\\/]/g, '/').replace(/\.(js|ts)$/, '') } }) - return `${_middleware.map(m => genImport(m.filePath,`$${hash(m.id)}` )).join('\n')} + return `${_middleware.map(m => genImport(m.filePath, `$${hash(m.id)}`)).join('\n')} const middleware = ${genObjectFromRawEntries(_middleware.map(m => [m.id, `$${hash(m.id)}`]))} export default middleware` } diff --git a/packages/kit/package.json b/packages/kit/package.json index 4627a6cb0d3..54bbdb6c1e1 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -20,6 +20,7 @@ "globby": "^13.1.0", "hash-sum": "^2.0.0", "jiti": "^1.12.9", + "knitwork": "^0.1.0", "lodash.template": "^4.5.0", "mlly": "^0.4.0", "pathe": "^0.2.0", diff --git a/packages/kit/src/components.ts b/packages/kit/src/components.ts index bc872f86a30..44092da047b 100644 --- a/packages/kit/src/components.ts +++ b/packages/kit/src/components.ts @@ -1,6 +1,6 @@ import { pascalCase, kebabCase } from 'scule' import type { ComponentsDir, Component } from '@nuxt/schema' -import { genDynamicImport } from 'mlly' +import { genDynamicImport } from 'knitwork' import { useNuxt } from './context' import { assertNuxtCompatibility } from './compatibility' diff --git a/packages/kit/src/internal/template.ts b/packages/kit/src/internal/template.ts index 6eabf35de87..863aa87f630 100644 --- a/packages/kit/src/internal/template.ts +++ b/packages/kit/src/internal/template.ts @@ -3,7 +3,7 @@ import lodashTemplate from 'lodash.template' import hash from 'hash-sum' import { camelCase } from 'scule' import { basename, extname } from 'pathe' -import { genDynamicImport, genImport } from 'mlly' +import { genDynamicImport, genImport } from 'knitwork' import type { NuxtTemplate } from '@nuxt/schema' diff --git a/packages/nitro/package.json b/packages/nitro/package.json index 53a0e405b3d..e4d79b0170c 100644 --- a/packages/nitro/package.json +++ b/packages/nitro/package.json @@ -48,6 +48,7 @@ "http-proxy": "^1.18.1", "is-primitive": "^3.0.1", "jiti": "^1.12.9", + "knitwork": "^0.1.0", "listhen": "^0.2.6", "mime": "^3.0.0", "mlly": "^0.4.0", diff --git a/packages/nitro/src/build.ts b/packages/nitro/src/build.ts index 38e55260bb5..d7e5cd0fc20 100644 --- a/packages/nitro/src/build.ts +++ b/packages/nitro/src/build.ts @@ -2,7 +2,7 @@ import { relative, resolve, join } from 'pathe' import consola from 'consola' import * as rollup from 'rollup' import fse from 'fs-extra' -import { genDynamicImport } from 'mlly' +import { genDynamicImport } from 'knitwork' import { printFSTree } from './utils/tree' import { getRollupConfig } from './rollup/config' import { hl, prettyPath, serializeTemplate, writeFile, isDirectory, replaceAll } from './utils' diff --git a/packages/nitro/src/rollup/config.ts b/packages/nitro/src/rollup/config.ts index 55f266ae535..60e12413434 100644 --- a/packages/nitro/src/rollup/config.ts +++ b/packages/nitro/src/rollup/config.ts @@ -17,7 +17,8 @@ import * as unenv from 'unenv' import devalue from '@nuxt/devalue' import type { Preset } from 'unenv' -import { sanitizeFilePath, genImport } from 'mlly' +import { sanitizeFilePath } from 'mlly' +import { genImport } from 'knitwork' import { NitroContext } from '../context' import { resolvePath } from '../utils' import { pkgDir } from '../dirs' diff --git a/packages/nitro/src/rollup/plugins/assets.ts b/packages/nitro/src/rollup/plugins/assets.ts index b516b6aebcd..1c5d9bfaeee 100644 --- a/packages/nitro/src/rollup/plugins/assets.ts +++ b/packages/nitro/src/rollup/plugins/assets.ts @@ -4,7 +4,7 @@ import createEtag from 'etag' import mime from 'mime' import { resolve } from 'pathe' import { globby } from 'globby' -import { genDynamicImport, genObjectFromRawEntries } from 'mlly' +import { genDynamicImport, genObjectFromRawEntries } from 'knitwork' import virtual from './virtual' export interface AssetOptions { diff --git a/packages/nitro/src/rollup/plugins/dynamic-require.ts b/packages/nitro/src/rollup/plugins/dynamic-require.ts index da65f0cbbd7..54bcbc9fee3 100644 --- a/packages/nitro/src/rollup/plugins/dynamic-require.ts +++ b/packages/nitro/src/rollup/plugins/dynamic-require.ts @@ -2,7 +2,7 @@ import { pathToFileURL } from 'url' import { resolve } from 'pathe' import { globby } from 'globby' import type { Plugin } from 'rollup' -import { genDynamicImport, genObjectFromRawEntries, genImport } from 'mlly' +import { genDynamicImport, genObjectFromRawEntries, genImport } from 'knitwork' import { serializeImportName } from '../../utils' const PLUGIN_NAME = 'dynamic-require' diff --git a/packages/nitro/src/rollup/plugins/middleware.ts b/packages/nitro/src/rollup/plugins/middleware.ts index e15920a46ae..493ce598e8f 100644 --- a/packages/nitro/src/rollup/plugins/middleware.ts +++ b/packages/nitro/src/rollup/plugins/middleware.ts @@ -3,7 +3,7 @@ import { relative } from 'pathe' import table from 'table' import isPrimitive from 'is-primitive' import { isDebug } from 'std-env' -import { genArrayFromRaw, genDynamicImport, genImport } from 'mlly' +import { genArrayFromRaw, genDynamicImport, genImport } from 'knitwork' import type { ServerMiddleware } from '../../server/middleware' import virtual from './virtual' diff --git a/packages/nitro/src/rollup/plugins/storage.ts b/packages/nitro/src/rollup/plugins/storage.ts index d508c60ad2b..1cd5fcf557c 100644 --- a/packages/nitro/src/rollup/plugins/storage.ts +++ b/packages/nitro/src/rollup/plugins/storage.ts @@ -1,5 +1,5 @@ import virtual from '@rollup/plugin-virtual' -import { genImport } from 'mlly' +import { genImport } from 'knitwork' import { serializeImportName } from '../../utils' export interface StorageOptions { diff --git a/packages/nuxt3/build.config.ts b/packages/nuxt3/build.config.ts index 4ee95be9092..df88ce24fb5 100644 --- a/packages/nuxt3/build.config.ts +++ b/packages/nuxt3/build.config.ts @@ -21,6 +21,7 @@ export default defineBuildConfig({ externals: [ '@vue/reactivity', '@vue/shared', + 'knitwork', '@vueuse/head', 'vue-meta' ] diff --git a/packages/nuxt3/package.json b/packages/nuxt3/package.json index fcf474af3ab..a8a665779b0 100644 --- a/packages/nuxt3/package.json +++ b/packages/nuxt3/package.json @@ -38,6 +38,7 @@ "hash-sum": "^2.0.0", "hookable": "^5.1.1", "ignore": "^5.2.0", + "knitwork": "^0.1.0", "mlly": "^0.4.0", "murmurhash-es": "^0.1.1", "nuxi": "3.0.0", diff --git a/packages/nuxt3/src/auto-imports/module.ts b/packages/nuxt3/src/auto-imports/module.ts index b3d650603a6..6be862f76c0 100644 --- a/packages/nuxt3/src/auto-imports/module.ts +++ b/packages/nuxt3/src/auto-imports/module.ts @@ -1,7 +1,7 @@ import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolveAlias, addPluginTemplate, useNuxt } from '@nuxt/kit' import type { AutoImportsOptions } from '@nuxt/schema' import { isAbsolute, join, relative, resolve, normalize } from 'pathe' -import { genDynamicImport } from 'mlly' +import { genDynamicImport } from 'knitwork' import { TransformPlugin } from './transform' import { Nuxt3AutoImports } from './imports' import { scanForComposables } from './composables' diff --git a/packages/nuxt3/src/auto-imports/utils.ts b/packages/nuxt3/src/auto-imports/utils.ts index c73da253a35..31f33acaa1b 100644 --- a/packages/nuxt3/src/auto-imports/utils.ts +++ b/packages/nuxt3/src/auto-imports/utils.ts @@ -1,5 +1,5 @@ import type { AutoImport } from '@nuxt/schema' -import { genExport, genImport } from 'mlly' +import { genExport, genImport } from 'knitwork' export function toImportModuleMap (autoImports: AutoImport[], isCJS = false) { const aliasKeyword = isCJS ? ' : ' : ' as ' diff --git a/packages/nuxt3/src/components/loader.ts b/packages/nuxt3/src/components/loader.ts index 573c8223f2a..e8162ca277b 100644 --- a/packages/nuxt3/src/components/loader.ts +++ b/packages/nuxt3/src/components/loader.ts @@ -1,7 +1,7 @@ import { createUnplugin } from 'unplugin' import { parseQuery, parseURL } from 'ufo' import { Component } from '@nuxt/schema' -import { genImport } from 'mlly' +import { genImport } from 'knitwork' interface LoaderOptions { getComponents(): Component[] diff --git a/packages/nuxt3/src/components/templates.ts b/packages/nuxt3/src/components/templates.ts index 52a4bc98786..2b9137d2c0a 100644 --- a/packages/nuxt3/src/components/templates.ts +++ b/packages/nuxt3/src/components/templates.ts @@ -1,7 +1,7 @@ import { relative } from 'pathe' import type { Component } from '@nuxt/schema' -import { genDynamicImport, genObjectFromRawEntries } from 'mlly' +import { genDynamicImport, genObjectFromRawEntries } from 'knitwork' export type ComponentsTemplateOptions = { buildDir?: string diff --git a/packages/nuxt3/src/core/templates.ts b/packages/nuxt3/src/core/templates.ts index b21b7ff8951..80da827af06 100644 --- a/packages/nuxt3/src/core/templates.ts +++ b/packages/nuxt3/src/core/templates.ts @@ -1,6 +1,6 @@ import { templateUtils } from '@nuxt/kit' import type { Nuxt, NuxtApp } from '@nuxt/schema' -import { genArrayFromRaw, genDynamicImport, genExport, genImport } from 'mlly' +import { genArrayFromRaw, genDynamicImport, genExport, genImport } from 'knitwork' import { relative } from 'pathe' diff --git a/packages/nuxt3/src/pages/module.ts b/packages/nuxt3/src/pages/module.ts index 0b8bd99ec77..96eb45d3dd2 100644 --- a/packages/nuxt3/src/pages/module.ts +++ b/packages/nuxt3/src/pages/module.ts @@ -1,7 +1,7 @@ import { existsSync } from 'fs' import { defineNuxtModule, addTemplate, addPlugin, templateUtils, addVitePlugin, addWebpackPlugin } from '@nuxt/kit' import { resolve } from 'pathe' -import { genDynamicImport, genObjectFromRawEntries } from 'mlly' +import { genDynamicImport, genObjectFromRawEntries } from 'knitwork' import { distDir } from '../dirs' import { resolveLayouts, resolvePagesRoutes, normalizeRoutes, resolveMiddleware, getImportName } from './utils' import { TransformMacroPlugin, TransformMacroPluginOptions } from './macros' diff --git a/packages/vite/package.json b/packages/vite/package.json index dce2c990bd0..bf708a563c1 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -28,6 +28,7 @@ "esbuild": "^0.14.13", "externality": "^0.1.6", "fs-extra": "^10.0.0", + "knitwork": "^0.1.0", "magic-string": "^0.25.7", "mlly": "^0.4.0", "p-debounce": "^4.0.0", diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts index f0b01b7ed17..dfb37480a1a 100644 --- a/packages/vite/src/dev-bundler.ts +++ b/packages/vite/src/dev-bundler.ts @@ -4,7 +4,7 @@ import { builtinModules } from 'module' import { resolve } from 'pathe' import * as vite from 'vite' import { ExternalsOptions, isExternal as _isExternal, ExternalsDefaults } from 'externality' -import { genDynamicImport, genObjectFromRawEntries } from 'mlly' +import { genDynamicImport, genObjectFromRawEntries } from 'knitwork' import { hashId, uniq } from './utils' export interface TransformChunk { diff --git a/yarn.lock b/yarn.lock index 4b6c454f5a9..ed3ae2c5b2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2871,6 +2871,7 @@ __metadata: globby: ^13.1.0 hash-sum: ^2.0.0 jiti: ^1.12.9 + knitwork: ^0.1.0 lodash.template: ^4.5.0 mlly: ^0.4.0 pathe: ^0.2.0 @@ -2965,6 +2966,7 @@ __metadata: http-proxy: ^1.18.1 is-primitive: ^3.0.1 jiti: ^1.12.9 + knitwork: ^0.1.0 listhen: ^0.2.6 mime: ^3.0.0 mlly: ^0.4.0 @@ -3234,6 +3236,7 @@ __metadata: esbuild: ^0.14.13 externality: ^0.1.6 fs-extra: ^10.0.0 + knitwork: ^0.1.0 magic-string: ^0.25.7 mlly: ^0.4.0 p-debounce: ^4.0.0 @@ -13784,6 +13787,13 @@ __metadata: languageName: node linkType: hard +"knitwork@npm:^0.1.0": + version: 0.1.0 + resolution: "knitwork@npm:0.1.0" + checksum: 36782ee8fcfb78a18684ff28ab6e829381d45a02cb8eb9efa192b3c521d9f6ff6d1ba3fbc28bdae471a9d251821ea99018a1f3e224e7b3cb62f72bbdb3a4cbd6 + languageName: node + linkType: hard + "kolorist@npm:^1.5.0": version: 1.5.1 resolution: "kolorist@npm:1.5.1" @@ -15841,6 +15851,7 @@ __metadata: hash-sum: ^2.0.0 hookable: ^5.1.1 ignore: ^5.2.0 + knitwork: ^0.1.0 mlly: ^0.4.0 murmurhash-es: ^0.1.1 nuxi: 3.0.0