Skip to content

Commit

Permalink
Fix imports and exports
Browse files Browse the repository at this point in the history
  • Loading branch information
ai committed Oct 23, 2023
1 parent a62ac94 commit d4f54df
Show file tree
Hide file tree
Showing 22 changed files with 42 additions and 45 deletions.
2 changes: 1 addition & 1 deletion packages/esbuild-why/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { writeFileSync } from 'node:fs'
import { join } from 'node:path'
import open from 'open'

import { getReportName } from './report'
import { getReportName } from './report.js'

export default [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/esbuild-why/report.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isValidFilename } from './valid-filename'
import { isValidFilename } from './valid-filename.js'

export function getReportName(config, check) {
if (config.checks.length === 1) return `esbuild-why.html`
Expand Down
2 changes: 1 addition & 1 deletion packages/esbuild-why/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import esbuildPkg from '@size-limit/esbuild'
import { readFile } from 'node:fs/promises'
import { join } from 'node:path'
import open from 'open'
import rm from 'size-limit/rm'
import { rm } from 'size-limit'
import { afterEach, expect, it, vi } from 'vitest'

import esbuildWhyPkg from '..'
Expand Down
2 changes: 1 addition & 1 deletion packages/esbuild/get-config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import processImport from 'size-limit/process-import'
import { processImport } from 'size-limit'

export async function getConfig(_limitConfig, check, output) {
await processImport(check, output)
Expand Down
9 changes: 4 additions & 5 deletions packages/esbuild/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { nanoid } from 'nanoid/non-secure'
import { readdir, readFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join, parse, resolve } from 'node:path'
import rm from 'size-limit/rm'
import { SizeLimitError } from 'size-limit/size-limit-error'
import { rm, SizeLimitError } from 'size-limit'

import { convertConfig } from './convert-config'
import { getConfig } from './get-config'
import { runEsbuild } from './run-esbuild'
import { convertConfig } from './convert-config.js'
import { getConfig } from './get-config.js'
import { runEsbuild } from './run-esbuild.js'

const ESBUILD_EMPTY_PROJECT = 12
const ESBUILD_EMPTY_PROJECT_GZIP = 32
Expand Down
5 changes: 2 additions & 3 deletions packages/esbuild/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import filePkg from '@size-limit/file'
import { existsSync } from 'node:fs'
import { mkdir, writeFile } from 'node:fs/promises'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { SizeLimitError } from 'size-limit/size-limit-error'
import { rm, SizeLimitError } from 'size-limit'
import { afterEach, describe, expect, it, vi } from 'vitest'

import esbuildPkg from '../'
import esbuildPkg from '../index.js'
const [file] = filePkg
const [esbuild] = esbuildPkg

Expand Down
2 changes: 1 addition & 1 deletion packages/file/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createReadStream } from 'node:fs'
import { stat } from 'node:fs/promises'
import { constants, createBrotliCompress, createGzip } from 'node:zlib'
import { gte } from 'semver'
import { SizeLimitError } from 'size-limit/size-limit-error.js'
import { SizeLimitError } from 'size-limit'

const BROTLI_NODE_VERSION = 'v11.7.0'

Expand Down
4 changes: 2 additions & 2 deletions packages/file/test/index.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { join } from 'node:path'
import { SizeLimitError } from 'size-limit/size-limit-error'
import { SizeLimitError } from 'size-limit'
import { expect, it } from 'vitest'

import filePkg from '../'
import filePkg from '../index.js'
const [file] = filePkg

function fixture(name) {
Expand Down
8 changes: 6 additions & 2 deletions packages/size-limit/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import calc from './calc'
import { Plugins } from './load-plugins'
import calc from './calc.js'
import { Plugins } from './load-plugins.js'

export { processImport } from './process-import.js'
export { rm } from './rm.js'
export { SizeLimitError } from './size-limit-error.js'

/**
* Run Size Limit and return the result
Expand Down
5 changes: 1 addition & 4 deletions packages/size-limit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
},
"exports": {
".": "./index.js",
"./package.json": "./package.json",
"./rm": "./rm.js",
"./size-limit-error": "./size-limit-error.js",
"./process-import": "./process-import.js"
"./package.json": "./package.json"
},
"dependencies": {
"bytes-iec": "^3.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/size-limit/process-import.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mkdir, writeFile } from 'node:fs/promises'
import { join } from 'node:path'

export default async function processImport(check, output) {
export async function processImport(check, output) {
if (!check.import) {
return
}
Expand Down
2 changes: 1 addition & 1 deletion packages/size-limit/rm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { existsSync } from 'node:fs'
import fs from 'node:fs/promises'

export default async function rm(dir) {
export async function rm(dir) {
if (!fs.rm) {
/* c8 ignore next 3 */
if (existsSync(dir)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/size-limit/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import webpackPlugin from '@size-limit/webpack'
import { join } from 'node:path'
import { expect, it } from 'vitest'

import sizeLimit from '../'
import sizeLimit from '../index.js'

const ROOT = join(__dirname, '..', '..', '..')
const INTEGRATION = join(ROOT, 'fixtures', 'integration', 'index.js')
Expand Down
2 changes: 1 addition & 1 deletion packages/time/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SizeLimitError } from 'size-limit/size-limit-error.js'
import { SizeLimitError } from 'size-limit'

import { getRunningTime } from './get-running-time.js'

Expand Down
2 changes: 1 addition & 1 deletion packages/time/test/cache.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { writeFile } from 'node:fs/promises'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { rm } from 'size-limit'
import { afterEach, beforeAll, expect, it } from 'vitest'

import { getCache, saveCache } from '../cache'
Expand Down
6 changes: 3 additions & 3 deletions packages/time/test/get-running-time.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { rm } from 'size-limit'
import { afterEach, expect, it } from 'vitest'

import { getCache, saveCache } from '../cache'
import { cleanCache, getRunningTime } from '../get-running-time'
import { getCache, saveCache } from '../cache.js'
import { cleanCache, getRunningTime } from '../get-running-time.js'

const EXAMPLE = join(__dirname, '../node_modules/nanoid/index.browser.js')

Expand Down
6 changes: 3 additions & 3 deletions packages/time/test/index.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SizeLimitError } from 'size-limit/size-limit-error'
import { SizeLimitError } from 'size-limit'
import { beforeEach, expect, it, vi } from 'vitest'

import timePkg from '../'
import { getRunningTime } from '../get-running-time'
import { getRunningTime } from '../get-running-time.js'
import timePkg from '../index.js'
const [time] = timePkg

vi.mock('../get-running-time')
Expand Down
4 changes: 2 additions & 2 deletions packages/webpack-css/test/index.test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import filePkg from '@size-limit/file'
import webpackPkg from '@size-limit/webpack'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { rm } from 'size-limit'
import { afterEach, expect, it, vi } from 'vitest'

import webpackCssPkg from '../'
import webpackCssPkg from '../index.js'
const [webpack] = webpackPkg
const [file] = filePkg
const [webpackCss] = webpackCssPkg
Expand Down
4 changes: 2 additions & 2 deletions packages/webpack-why/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import webpackPkg from '@size-limit/webpack'
import { existsSync } from 'node:fs'
import { mkdir, readFile, writeFile } from 'node:fs/promises'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { rm } from 'size-limit'
import { afterEach, expect, it, vi } from 'vitest'

import webpackWhyPkg from '../'
import webpackWhyPkg from '../index.js'
const [webpack] = webpackPkg
const [file] = filePkg
const [webpackWhy] = webpackWhyPkg
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack/get-config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import processImport from 'size-limit/process-import'
import { processImport } from 'size-limit'

function escapeRegexp(string) {
return string.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d')
Expand Down
9 changes: 4 additions & 5 deletions packages/webpack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { nanoid } from 'nanoid/non-secure'
import { readdir } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { SizeLimitError } from 'size-limit/size-limit-error'
import { rm, SizeLimitError } from 'size-limit'

import { convertConfig } from './convert-config'
import { getConfig } from './get-config'
import { runWebpack } from './run-webpack'
import { convertConfig } from './convert-config.js'
import { getConfig } from './get-config.js'
import { runWebpack } from './run-webpack.js'

const WEBPACK_EMPTY_PROJECT = 0
const WEBPACK_EMPTY_PROJECT_GZIP = 20
Expand Down
5 changes: 2 additions & 3 deletions packages/webpack/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import filePkg from '@size-limit/file'
import { existsSync } from 'node:fs'
import { mkdir, writeFile } from 'node:fs/promises'
import { join } from 'node:path'
import rm from 'size-limit/rm'
import { SizeLimitError } from 'size-limit/size-limit-error'
import { rm, SizeLimitError } from 'size-limit'
import { afterEach, describe, expect, it, vi } from 'vitest'

import webpackPkg from '../'
import webpackPkg from '../index.js'
const [file] = filePkg
const [webpack] = webpackPkg

Expand Down

0 comments on commit d4f54df

Please sign in to comment.