diff --git a/integration/test-runner/index.ts b/integration/test-runner/index.ts index 9ccdff1dc..c6fe56365 100644 --- a/integration/test-runner/index.ts +++ b/integration/test-runner/index.ts @@ -1,11 +1,11 @@ import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core'; -import { runBasicTest } from './tests/basic/runBasicTest'; -import { runConfigGroupsTest } from './tests/config-groups/runConfigGroupsTest'; -import { runParallelTest } from './tests/parallel/runParallelTest'; -import { runTestFailureTest } from './tests/test-failure/runTestFailureTest'; -import { runLocationChangeTest } from './tests/location-change/runLocationChangeTest'; -import { runFocusTest } from './tests/focus/runFocusTest'; -import { runManyTests } from './tests/many/runManyTests'; +import { runBasicTest } from './tests/basic/runBasicTest.js'; +import { runConfigGroupsTest } from './tests/config-groups/runConfigGroupsTest.js'; +import { runParallelTest } from './tests/parallel/runParallelTest.js'; +import { runTestFailureTest } from './tests/test-failure/runTestFailureTest.js'; +import { runLocationChangeTest } from './tests/location-change/runLocationChangeTest.js'; +import { runFocusTest } from './tests/focus/runFocusTest.js'; +import { runManyTests } from './tests/many/runManyTests.js'; export interface Tests { basic: boolean; diff --git a/packages/browser-logs/index.d.ts b/packages/browser-logs/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/browser-logs/index.d.ts +++ b/packages/browser-logs/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/browser-logs/src/deserialize.ts b/packages/browser-logs/src/deserialize.ts index 7cd23451a..b483842ac 100644 --- a/packages/browser-logs/src/deserialize.ts +++ b/packages/browser-logs/src/deserialize.ts @@ -1,4 +1,4 @@ -import { ParseStackTraceOptions, parseStackTrace } from './parseStackTrace'; +import { ParseStackTraceOptions, parseStackTrace } from './parseStackTrace.js'; const KEY_WTR_TYPE = '__WTR_TYPE__'; const KEY_CONSTRUCTOR_NAME = '__WTR_CONSTRUCTOR_NAME__'; diff --git a/packages/browser-logs/src/index.ts b/packages/browser-logs/src/index.ts index 6cf28f9d2..8d655459f 100644 --- a/packages/browser-logs/src/index.ts +++ b/packages/browser-logs/src/index.ts @@ -1,3 +1,8 @@ -export { deserialize } from './deserialize'; -export { browserScript } from './browserScript'; -export { parseStackTrace, StackLocation, MapStackLocation } from './parseStackTrace'; +export { deserialize } from './deserialize.js'; +export { browserScript } from './browserScript.js'; +export { + MapBrowserUrl, + parseStackTrace, + StackLocation, + MapStackLocation, +} from './parseStackTrace.js'; diff --git a/packages/browser-logs/test/serialize-deserialize.test.ts b/packages/browser-logs/test/serialize-deserialize.test.ts index 65fbf152f..321668782 100644 --- a/packages/browser-logs/test/serialize-deserialize.test.ts +++ b/packages/browser-logs/test/serialize-deserialize.test.ts @@ -3,7 +3,7 @@ import puppeteer, { Browser, Page } from 'puppeteer'; import fs from 'fs'; import path from 'path'; -import { deserialize } from '../src/deserialize'; +import { deserialize } from '../src/deserialize.js'; const serializeScript = fs.readFileSync(require.resolve('../dist/serialize.js'), 'utf-8'); const defaultOptions = { browserRootDir: __dirname, cwd: __dirname }; diff --git a/packages/config-loader/index.d.ts b/packages/config-loader/index.d.ts index e4ddc9027..2b8395cdb 100644 --- a/packages/config-loader/index.d.ts +++ b/packages/config-loader/index.d.ts @@ -1 +1 @@ -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-core/index.d.ts b/packages/dev-server-core/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-core/index.d.ts +++ b/packages/dev-server-core/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-core/src/dom5/index.ts b/packages/dev-server-core/src/dom5/index.ts index e28807f4e..c881b2179 100644 --- a/packages/dev-server-core/src/dom5/index.ts +++ b/packages/dev-server-core/src/dom5/index.ts @@ -11,7 +11,7 @@ * subject to an additional IP rights grant found at * http://polymer.github.io/PATENTS.txt */ -export * from './modification'; -export * from './predicates'; -export * from './util'; -export * from './walking'; +export * from './modification.js'; +export * from './predicates.js'; +export * from './util.js'; +export * from './walking.js'; diff --git a/packages/dev-server-core/src/dom5/iteration.ts b/packages/dev-server-core/src/dom5/iteration.ts index 8520de3b9..33fb228a4 100644 --- a/packages/dev-server-core/src/dom5/iteration.ts +++ b/packages/dev-server-core/src/dom5/iteration.ts @@ -12,8 +12,8 @@ * http://polymer.github.io/PATENTS.txt */ -import { isElement, Predicate, predicates as p } from './predicates'; -import { defaultChildNodes, GetChildNodes } from './util'; +import { isElement, Predicate, predicates as p } from './predicates.js'; +import { defaultChildNodes, GetChildNodes } from './util.js'; /** * Applies `mapfn` to `node` and the tree below `node`, yielding a flattened diff --git a/packages/dev-server-core/src/dom5/modification.ts b/packages/dev-server-core/src/dom5/modification.ts index e4053a61b..55510004e 100644 --- a/packages/dev-server-core/src/dom5/modification.ts +++ b/packages/dev-server-core/src/dom5/modification.ts @@ -13,8 +13,8 @@ */ import cloneObject from 'clone'; -import { isDocumentFragment, predicates as p } from './predicates'; -import { queryAll } from './walking'; +import { isDocumentFragment, predicates as p } from './predicates.js'; +import { queryAll } from './walking.js'; function newTextNode(value: string): any { return { diff --git a/packages/dev-server-core/src/dom5/predicates.ts b/packages/dev-server-core/src/dom5/predicates.ts index 12f59dba0..bb66c426a 100644 --- a/packages/dev-server-core/src/dom5/predicates.ts +++ b/packages/dev-server-core/src/dom5/predicates.ts @@ -13,7 +13,7 @@ * http://polymer.github.io/PATENTS.txt */ -import { getAttribute, getAttributeIndex, getTextContent } from './util'; +import { getAttribute, getAttributeIndex, getTextContent } from './util.js'; /** * Match the text inside an element, textnode, or comment diff --git a/packages/dev-server-core/src/dom5/util.ts b/packages/dev-server-core/src/dom5/util.ts index 623cf7e4b..9def72989 100644 --- a/packages/dev-server-core/src/dom5/util.ts +++ b/packages/dev-server-core/src/dom5/util.ts @@ -12,9 +12,15 @@ * http://polymer.github.io/PATENTS.txt */ -import { constructors } from './modification'; -import { isCommentNode, isDocument, isDocumentFragment, isElement, isTextNode } from './predicates'; -import { nodeWalkAll } from './walking'; +import { constructors } from './modification.js'; +import { + isCommentNode, + isDocument, + isDocumentFragment, + isElement, + isTextNode, +} from './predicates.js'; +import { nodeWalkAll } from './walking.js'; /** * Return the text value of a node or element diff --git a/packages/dev-server-core/src/dom5/walking.ts b/packages/dev-server-core/src/dom5/walking.ts index 8b0caff5a..278615c5e 100644 --- a/packages/dev-server-core/src/dom5/walking.ts +++ b/packages/dev-server-core/src/dom5/walking.ts @@ -12,9 +12,9 @@ * http://polymer.github.io/PATENTS.txt */ -import * as iteration from './iteration'; -import { isElement, Predicate, predicates as p } from './predicates'; -import { defaultChildNodes, GetChildNodes } from './util'; +import * as iteration from './iteration.js'; +import { isElement, Predicate, predicates as p } from './predicates.js'; +import { defaultChildNodes, GetChildNodes } from './util.js'; /** * Applies `mapfn` to `node` and the tree below `node`, returning a flattened diff --git a/packages/dev-server-core/src/index.ts b/packages/dev-server-core/src/index.ts index 2bcfb0c8d..e238c16b4 100644 --- a/packages/dev-server-core/src/index.ts +++ b/packages/dev-server-core/src/index.ts @@ -5,17 +5,17 @@ export { Server } from 'net'; import WebSocket from 'ws'; export { WebSocket }; -export { DevServer } from './server/DevServer'; -export { Plugin, ServerStartParams, ResolveOptions } from './plugins/Plugin'; -export { DevServerCoreConfig, MimeTypeMappings } from './server/DevServerCoreConfig'; -export { WebSocketsManager, WebSocketData } from './web-sockets/WebSocketsManager'; +export { DevServer } from './server/DevServer.js'; +export { Plugin, ServerStartParams, ResolveOptions } from './plugins/Plugin.js'; +export { DevServerCoreConfig, MimeTypeMappings } from './server/DevServerCoreConfig.js'; +export { WebSocketsManager, WebSocketData } from './web-sockets/WebSocketsManager.js'; export { getRequestBrowserPath, getRequestFilePath, getResponseBody, getHtmlPath, isInlineScriptRequest, -} from './utils'; -export { Logger, ErrorWithLocation } from './logger/Logger'; -export { PluginSyntaxError } from './logger/PluginSyntaxError'; -export { PluginError } from './logger/PluginError'; +} from './utils.js'; +export { Logger, ErrorWithLocation } from './logger/Logger.js'; +export { PluginSyntaxError } from './logger/PluginSyntaxError.js'; +export { PluginError } from './logger/PluginError.js'; diff --git a/packages/dev-server-core/src/middleware/PluginTransformCache.ts b/packages/dev-server-core/src/middleware/PluginTransformCache.ts index 0661ff3fb..9a6d5a361 100644 --- a/packages/dev-server-core/src/middleware/PluginTransformCache.ts +++ b/packages/dev-server-core/src/middleware/PluginTransformCache.ts @@ -2,7 +2,7 @@ import LRUCache from 'lru-cache'; import { FSWatcher } from 'chokidar'; import fs from 'fs'; import { promisify } from 'util'; -import { RequestCancelledError } from '../utils'; +import { RequestCancelledError } from '../utils.js'; const fsStat = promisify(fs.stat); diff --git a/packages/dev-server-core/src/middleware/historyApiFallbackMiddleware.ts b/packages/dev-server-core/src/middleware/historyApiFallbackMiddleware.ts index 8d630496f..7444e5513 100644 --- a/packages/dev-server-core/src/middleware/historyApiFallbackMiddleware.ts +++ b/packages/dev-server-core/src/middleware/historyApiFallbackMiddleware.ts @@ -1,7 +1,7 @@ import { Middleware } from 'koa'; import path from 'path'; -import { toBrowserPath } from '../utils'; -import { Logger } from '../logger/Logger'; +import { toBrowserPath } from '../utils.js'; +import { Logger } from '../logger/Logger.js'; /** * Serves index.html when a non-file request within the scope of the app index is made. diff --git a/packages/dev-server-core/src/middleware/pluginTransformMiddleware.ts b/packages/dev-server-core/src/middleware/pluginTransformMiddleware.ts index 7a5599370..f04867067 100644 --- a/packages/dev-server-core/src/middleware/pluginTransformMiddleware.ts +++ b/packages/dev-server-core/src/middleware/pluginTransformMiddleware.ts @@ -1,11 +1,11 @@ import { FSWatcher } from 'chokidar'; import { Middleware } from 'koa'; -import { DevServerCoreConfig } from '../server/DevServerCoreConfig'; -import { PluginTransformCache } from './PluginTransformCache'; -import { getRequestFilePath, getResponseBody, RequestCancelledError } from '../utils'; -import { Logger } from '../logger/Logger'; -import type { PluginSyntaxError } from '../logger/PluginSyntaxError'; +import { DevServerCoreConfig } from '../server/DevServerCoreConfig.js'; +import { PluginTransformCache } from './PluginTransformCache.js'; +import { getRequestFilePath, getResponseBody, RequestCancelledError } from '../utils.js'; +import { Logger } from '../logger/Logger.js'; +import type { PluginSyntaxError } from '../logger/PluginSyntaxError.js'; /** * Sets up a middleware which allows plugins to transform files before they are served to the browser. diff --git a/packages/dev-server-core/src/middleware/serveFilesMiddleware.ts b/packages/dev-server-core/src/middleware/serveFilesMiddleware.ts index 6a94f870e..f1f384d83 100644 --- a/packages/dev-server-core/src/middleware/serveFilesMiddleware.ts +++ b/packages/dev-server-core/src/middleware/serveFilesMiddleware.ts @@ -1,7 +1,7 @@ import { Middleware } from 'koa'; import send from 'koa-send'; import koaStatic, { Options as KoaStaticOptions } from 'koa-static'; -import { isOutsideRootDir, resolvePathOutsideRootDir } from '../utils'; +import { isOutsideRootDir, resolvePathOutsideRootDir } from '../utils.js'; /** * Creates multiple middleware used for serving files. diff --git a/packages/dev-server-core/src/middleware/watchServedFilesMiddleware.ts b/packages/dev-server-core/src/middleware/watchServedFilesMiddleware.ts index 185772a51..c05cb1e01 100644 --- a/packages/dev-server-core/src/middleware/watchServedFilesMiddleware.ts +++ b/packages/dev-server-core/src/middleware/watchServedFilesMiddleware.ts @@ -2,7 +2,7 @@ import { Middleware } from 'koa'; import { FSWatcher } from 'chokidar'; import fs from 'fs'; -import { getRequestFilePath } from '../utils'; +import { getRequestFilePath } from '../utils.js'; /** * Sets up a middleware which tracks served files and sends a reload message to any diff --git a/packages/dev-server-core/src/plugins/mimeTypesPlugin.ts b/packages/dev-server-core/src/plugins/mimeTypesPlugin.ts index 437d32067..5da9f8db4 100644 --- a/packages/dev-server-core/src/plugins/mimeTypesPlugin.ts +++ b/packages/dev-server-core/src/plugins/mimeTypesPlugin.ts @@ -2,8 +2,8 @@ import picoMatch from 'picomatch'; import { isAbsolute, posix, sep } from 'path'; import { MimeTypeMappings } from '../server/DevServerCoreConfig'; -import { Plugin } from './Plugin'; -import { getRequestFilePath } from '../utils'; +import { Plugin } from './Plugin.js'; +import { getRequestFilePath } from '../utils.js'; function createMatcher(rootDir: string, pattern: string) { const resolvedPattern = diff --git a/packages/dev-server-core/src/plugins/transformModuleImportsPlugin.ts b/packages/dev-server-core/src/plugins/transformModuleImportsPlugin.ts index 5995721dc..83e8a0049 100644 --- a/packages/dev-server-core/src/plugins/transformModuleImportsPlugin.ts +++ b/packages/dev-server-core/src/plugins/transformModuleImportsPlugin.ts @@ -4,13 +4,13 @@ import { Context } from 'koa'; // @ts-ignore import { parse, ParsedImport } from 'es-module-lexer'; -import { queryAll, predicates, getTextContent, setTextContent } from '../dom5'; +import { queryAll, predicates, getTextContent, setTextContent } from '../dom5/index.js'; import { parse as parseHtml, serialize as serializeHtml } from 'parse5'; -import { Plugin } from './Plugin'; -import { PluginSyntaxError } from '../logger/PluginSyntaxError'; -import { toFilePath } from '../utils'; -import { Logger } from '../logger/Logger'; -import { parseDynamicImport } from './parseDynamicImport'; +import { Plugin } from './Plugin.js'; +import { PluginSyntaxError } from '../logger/PluginSyntaxError.js'; +import { toFilePath } from '../utils.js'; +import { Logger } from '../logger/Logger.js'; +import { parseDynamicImport } from './parseDynamicImport.js'; export type ResolveImport = ( source: string, diff --git a/packages/dev-server-core/src/server/DevServer.ts b/packages/dev-server-core/src/server/DevServer.ts index ef14e8577..d8c4679d2 100644 --- a/packages/dev-server-core/src/server/DevServer.ts +++ b/packages/dev-server-core/src/server/DevServer.ts @@ -3,10 +3,10 @@ import { ListenOptions, Server, Socket } from 'net'; import chokidar from 'chokidar'; import { promisify } from 'util'; -import { DevServerCoreConfig } from './DevServerCoreConfig'; -import { createServer } from './createServer'; -import { Logger } from '../logger/Logger'; -import { WebSocketsManager } from '../web-sockets/WebSocketsManager'; +import { DevServerCoreConfig } from './DevServerCoreConfig.js'; +import { createServer } from './createServer.js'; +import { Logger } from '../logger/Logger.js'; +import { WebSocketsManager } from '../web-sockets/WebSocketsManager.js'; export class DevServer { public koaApp: Koa; diff --git a/packages/dev-server-core/src/server/addPlugins.ts b/packages/dev-server-core/src/server/addPlugins.ts index d579cfc0c..051e946ef 100644 --- a/packages/dev-server-core/src/server/addPlugins.ts +++ b/packages/dev-server-core/src/server/addPlugins.ts @@ -1,8 +1,8 @@ -import { DevServerCoreConfig } from './DevServerCoreConfig'; -import { transformModuleImportsPlugin } from '../plugins/transformModuleImportsPlugin'; -import { webSocketsPlugin } from '../web-sockets/webSocketsPlugin'; -import { mimeTypesPlugin } from '../plugins/mimeTypesPlugin'; -import { Logger } from '../logger/Logger'; +import { DevServerCoreConfig } from './DevServerCoreConfig.js'; +import { transformModuleImportsPlugin } from '../plugins/transformModuleImportsPlugin.js'; +import { webSocketsPlugin } from '../web-sockets/webSocketsPlugin.js'; +import { mimeTypesPlugin } from '../plugins/mimeTypesPlugin.js'; +import { Logger } from '../logger/Logger.js'; export function addPlugins(logger: Logger, config: DevServerCoreConfig) { if (!config.plugins) { diff --git a/packages/dev-server-core/src/server/createMiddleware.ts b/packages/dev-server-core/src/server/createMiddleware.ts index 6dc960712..1bf5fdce1 100644 --- a/packages/dev-server-core/src/server/createMiddleware.ts +++ b/packages/dev-server-core/src/server/createMiddleware.ts @@ -2,17 +2,17 @@ import { Middleware } from 'koa'; import koaEtag from 'koa-etag'; import { FSWatcher } from 'chokidar'; -import { DevServerCoreConfig } from './DevServerCoreConfig'; -import { basePathMiddleware } from '../middleware/basePathMiddleware'; -import { etagCacheMiddleware } from '../middleware/etagCacheMiddleware'; -import { historyApiFallbackMiddleware } from '../middleware/historyApiFallbackMiddleware'; -import { pluginMimeTypeMiddleware } from '../middleware/pluginMimeTypeMiddleware'; -import { pluginServeMiddleware } from '../middleware/pluginServeMiddleware'; -import { pluginTransformMiddleware } from '../middleware/pluginTransformMiddleware'; -import { Logger } from '../logger/Logger'; -import { watchServedFilesMiddleware } from '../middleware/watchServedFilesMiddleware'; -import { pluginFileParsedMiddleware } from '../middleware/pluginFileParsedMiddleware'; -import { serveFilesMiddleware } from '../middleware/serveFilesMiddleware'; +import { DevServerCoreConfig } from './DevServerCoreConfig.js'; +import { basePathMiddleware } from '../middleware/basePathMiddleware.js'; +import { etagCacheMiddleware } from '../middleware/etagCacheMiddleware.js'; +import { historyApiFallbackMiddleware } from '../middleware/historyApiFallbackMiddleware.js'; +import { pluginMimeTypeMiddleware } from '../middleware/pluginMimeTypeMiddleware.js'; +import { pluginServeMiddleware } from '../middleware/pluginServeMiddleware.js'; +import { pluginTransformMiddleware } from '../middleware/pluginTransformMiddleware.js'; +import { Logger } from '../logger/Logger.js'; +import { watchServedFilesMiddleware } from '../middleware/watchServedFilesMiddleware.js'; +import { pluginFileParsedMiddleware } from '../middleware/pluginFileParsedMiddleware.js'; +import { serveFilesMiddleware } from '../middleware/serveFilesMiddleware.js'; /** * Creates middlewares based on the given configuration. The middlewares can be diff --git a/packages/dev-server-core/src/server/createServer.ts b/packages/dev-server-core/src/server/createServer.ts index 13435a4e0..bb5720535 100644 --- a/packages/dev-server-core/src/server/createServer.ts +++ b/packages/dev-server-core/src/server/createServer.ts @@ -6,10 +6,10 @@ import http2Server from 'http2'; import fs from 'fs'; import net, { Server, Socket, ListenOptions } from 'net'; -import { DevServerCoreConfig } from './DevServerCoreConfig'; -import { createMiddleware } from './createMiddleware'; -import { Logger } from '../logger/Logger'; -import { addPlugins } from './addPlugins'; +import { DevServerCoreConfig } from './DevServerCoreConfig.js'; +import { createMiddleware } from './createMiddleware.js'; +import { Logger } from '../logger/Logger.js'; +import { addPlugins } from './addPlugins.js'; /** * A request handler that returns a 301 HTTP Redirect to the same location as the original diff --git a/packages/dev-server-core/src/test-helpers.ts b/packages/dev-server-core/src/test-helpers.ts index 193114a29..74e19db79 100644 --- a/packages/dev-server-core/src/test-helpers.ts +++ b/packages/dev-server-core/src/test-helpers.ts @@ -2,10 +2,10 @@ import portfinder from 'portfinder'; import { expect } from 'chai'; import { green, red, yellow } from 'nanocolors'; -import { DevServer } from './server/DevServer'; -import { DevServerCoreConfig } from './server/DevServerCoreConfig'; -import { Logger } from './logger/Logger'; -import { Plugin } from './plugins/Plugin'; +import { DevServer } from './server/DevServer.js'; +import { DevServerCoreConfig } from './server/DevServerCoreConfig.js'; +import { Logger } from './logger/Logger.js'; +import { Plugin } from './plugins/Plugin.js'; const defaultConfig: Omit = { hostname: 'localhost', diff --git a/packages/dev-server-core/src/web-sockets/WebSocketsManager.ts b/packages/dev-server-core/src/web-sockets/WebSocketsManager.ts index 99104d0db..cb04c7089 100644 --- a/packages/dev-server-core/src/web-sockets/WebSocketsManager.ts +++ b/packages/dev-server-core/src/web-sockets/WebSocketsManager.ts @@ -1,6 +1,6 @@ import { Server } from 'net'; import WebSocket from 'ws'; -import { EventEmitter } from './EventEmitter'; +import { EventEmitter } from './EventEmitter.js'; export const NAME_WEB_SOCKET_IMPORT = '/__web-dev-server__web-socket.js'; export const NAME_WEB_SOCKET_API = 'wds'; diff --git a/packages/dev-server-core/src/web-sockets/webSocketsPlugin.ts b/packages/dev-server-core/src/web-sockets/webSocketsPlugin.ts index 6dc5b3cda..d2ca58aa3 100644 --- a/packages/dev-server-core/src/web-sockets/webSocketsPlugin.ts +++ b/packages/dev-server-core/src/web-sockets/webSocketsPlugin.ts @@ -1,5 +1,5 @@ -import { Plugin } from '../plugins/Plugin'; -import { NAME_WEB_SOCKET_IMPORT, NAME_WEB_SOCKET_API } from './WebSocketsManager'; +import { Plugin } from '../plugins/Plugin.js'; +import { NAME_WEB_SOCKET_IMPORT, NAME_WEB_SOCKET_API } from './WebSocketsManager.js'; import { appendToDocument, isHtmlFragment } from '@web/parse5-utils'; export const webSocketScript = ` diff --git a/packages/dev-server-core/test-helpers.d.ts b/packages/dev-server-core/test-helpers.d.ts index e2073520d..a828b5289 100644 --- a/packages/dev-server-core/test-helpers.d.ts +++ b/packages/dev-server-core/test-helpers.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/test-helpers'; +export * from './dist/test-helpers.js'; diff --git a/packages/dev-server-core/test/helpers.ts b/packages/dev-server-core/test/helpers.ts index 415ddb722..398a0f9b2 100644 --- a/packages/dev-server-core/test/helpers.ts +++ b/packages/dev-server-core/test/helpers.ts @@ -5,8 +5,8 @@ import { fetchText, expectIncludes, virtualFilesPlugin, -} from '../src/test-helpers'; -import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig'; +} from '../src/test-helpers.js'; +import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.js'; export function createTestServer(config: Partial = {}) { return originalCreateTestServer({ diff --git a/packages/dev-server-core/test/middleware/basePathMiddleware.test.ts b/packages/dev-server-core/test/middleware/basePathMiddleware.test.ts index 09330c98e..4de47b14e 100644 --- a/packages/dev-server-core/test/middleware/basePathMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/basePathMiddleware.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import { DevServer } from '../../src/server/DevServer'; -import { createTestServer } from '../helpers'; +import { DevServer } from '../../src/server/DevServer.js'; +import { createTestServer } from '../helpers.js'; describe('base path middleware', () => { describe('without a trailing /', () => { diff --git a/packages/dev-server-core/test/middleware/etagCacheMiddleware.test.ts b/packages/dev-server-core/test/middleware/etagCacheMiddleware.test.ts index 59512f020..75838be21 100644 --- a/packages/dev-server-core/test/middleware/etagCacheMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/etagCacheMiddleware.test.ts @@ -3,8 +3,8 @@ import path from 'path'; import fs from 'fs'; import { nanoid } from 'nanoid'; -import { createTestServer, timeout } from '../helpers'; -import { DevServer } from '../../src/server/DevServer'; +import { createTestServer, timeout } from '../helpers.js'; +import { DevServer } from '../../src/server/DevServer.js'; const fixtureDir = path.resolve(__dirname, '..', 'fixtures', 'basic'); const testFileAName = '/cached-file-a.js'; diff --git a/packages/dev-server-core/test/middleware/historyApiFallbackMiddleware.test.ts b/packages/dev-server-core/test/middleware/historyApiFallbackMiddleware.test.ts index 1689ef743..ba511b2f2 100644 --- a/packages/dev-server-core/test/middleware/historyApiFallbackMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/historyApiFallbackMiddleware.test.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import path from 'path'; -import { createTestServer } from '../helpers'; -import { DevServer } from '../../src/server/DevServer'; +import { createTestServer } from '../helpers.js'; +import { DevServer } from '../../src/server/DevServer.js'; describe('history api fallback middleware', () => { describe('index in root', () => { diff --git a/packages/dev-server-core/test/middleware/pluginFileParsedMiddleware.test.ts b/packages/dev-server-core/test/middleware/pluginFileParsedMiddleware.test.ts index c48c64d78..844287d97 100644 --- a/packages/dev-server-core/test/middleware/pluginFileParsedMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/pluginFileParsedMiddleware.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { Context } from 'koa'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; describe('plugin-file-parsed middleware', () => { it('is called after other plugin hooks', async () => { diff --git a/packages/dev-server-core/test/middleware/pluginMimeTypeMiddleware.test.ts b/packages/dev-server-core/test/middleware/pluginMimeTypeMiddleware.test.ts index fb636af0a..49e7c55a5 100644 --- a/packages/dev-server-core/test/middleware/pluginMimeTypeMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/pluginMimeTypeMiddleware.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; describe('plugin-mime-type middleware', () => { it('can set the mime type of a file with a string', async () => { diff --git a/packages/dev-server-core/test/middleware/pluginServeMiddleware.test.ts b/packages/dev-server-core/test/middleware/pluginServeMiddleware.test.ts index 6b6778281..baec7e2fa 100644 --- a/packages/dev-server-core/test/middleware/pluginServeMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/pluginServeMiddleware.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; describe('plugin-serve middleware', () => { it('can serve non-existing files', async () => { diff --git a/packages/dev-server-core/test/middleware/pluginTransformMiddleware.test.ts b/packages/dev-server-core/test/middleware/pluginTransformMiddleware.test.ts index 5feef5fb1..d0fc91f2b 100644 --- a/packages/dev-server-core/test/middleware/pluginTransformMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/pluginTransformMiddleware.test.ts @@ -1,8 +1,8 @@ /* eslint-disable no-restricted-syntax, no-await-in-loop */ import { expect } from 'chai'; -import { createTestServer } from '../helpers'; -import { fetchText, expectIncludes } from '../../src/test-helpers'; +import { createTestServer } from '../helpers.js'; +import { fetchText, expectIncludes } from '../../src/test-helpers.js'; describe('plugin-transform middleware', () => { it('can transform a served file', async () => { diff --git a/packages/dev-server-core/test/middleware/serveFilesMiddleware.test.ts b/packages/dev-server-core/test/middleware/serveFilesMiddleware.test.ts index 191cd1b0c..453d11d2b 100644 --- a/packages/dev-server-core/test/middleware/serveFilesMiddleware.test.ts +++ b/packages/dev-server-core/test/middleware/serveFilesMiddleware.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import path from 'path'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; describe('serveFilesMiddleware', () => { it('can serve files outside of the root directory', async () => { diff --git a/packages/dev-server-core/test/plugins/mimeTypesPlugin.test.ts b/packages/dev-server-core/test/plugins/mimeTypesPlugin.test.ts index 3f9ab786d..641108190 100644 --- a/packages/dev-server-core/test/plugins/mimeTypesPlugin.test.ts +++ b/packages/dev-server-core/test/plugins/mimeTypesPlugin.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; describe('mimeTypesPLugin', () => { it('can configure mime types for files', async () => { diff --git a/packages/dev-server-core/test/plugins/parseDynamicImport.test.ts b/packages/dev-server-core/test/plugins/parseDynamicImport.test.ts index 2a519caaa..39b7bbb0d 100644 --- a/packages/dev-server-core/test/plugins/parseDynamicImport.test.ts +++ b/packages/dev-server-core/test/plugins/parseDynamicImport.test.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { parseDynamicImport } from '../../src/plugins/parseDynamicImport'; +import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.js'; describe('parseDynamicImport', () => { function testParseDynamicImport(specifier: string) { diff --git a/packages/dev-server-core/test/plugins/transformModuleImportsPlugin.test.ts b/packages/dev-server-core/test/plugins/transformModuleImportsPlugin.test.ts index 86b7426a4..f1ce647d2 100644 --- a/packages/dev-server-core/test/plugins/transformModuleImportsPlugin.test.ts +++ b/packages/dev-server-core/test/plugins/transformModuleImportsPlugin.test.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; -import { transformImports } from '../../src/plugins/transformModuleImportsPlugin'; -import type { PluginSyntaxError } from '../../src/logger/PluginSyntaxError'; -import { createTestServer } from '../helpers'; +import { transformImports } from '../../src/plugins/transformModuleImportsPlugin.js'; +import type { PluginSyntaxError } from '../../src/logger/PluginSyntaxError.js'; +import { createTestServer } from '../helpers.js'; const defaultFilePath = '/root/my-file.js'; const defaultResolveImport = (src: string) => `RESOLVED__${src}`; diff --git a/packages/dev-server-core/test/server/DevServer.test.ts b/packages/dev-server-core/test/server/DevServer.test.ts index d92dc14b8..672557911 100644 --- a/packages/dev-server-core/test/server/DevServer.test.ts +++ b/packages/dev-server-core/test/server/DevServer.test.ts @@ -6,9 +6,9 @@ import { FSWatcher } from 'chokidar'; import { expect } from 'chai'; import portfinder from 'portfinder'; import { Stub, stubMethod } from 'hanbi'; -import { ServerStartParams } from '../../src/plugins/Plugin'; -import { DevServer } from '../../src/server/DevServer'; -import { createTestServer } from '../helpers'; +import { ServerStartParams } from '../../src/plugins/Plugin.js'; +import { DevServer } from '../../src/server/DevServer.js'; +import { createTestServer } from '../helpers.js'; describe('basic', () => { let host: string; diff --git a/packages/dev-server-core/test/web-sockets/WebSocketsManager.test.ts b/packages/dev-server-core/test/web-sockets/WebSocketsManager.test.ts index 17e9f916f..98d3d9720 100644 --- a/packages/dev-server-core/test/web-sockets/WebSocketsManager.test.ts +++ b/packages/dev-server-core/test/web-sockets/WebSocketsManager.test.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import WebSocket from 'ws'; -import { NAME_WEB_SOCKET_API } from '../../src/web-sockets/WebSocketsManager'; +import { NAME_WEB_SOCKET_API } from '../../src/web-sockets/WebSocketsManager.js'; -import { createTestServer } from '../helpers'; +import { createTestServer } from '../helpers.js'; function waitFor(fn: (resolve: () => void) => void, msg: string) { return new Promise((resolve, reject) => { diff --git a/packages/dev-server-core/test/web-sockets/webSocketsPlugin.test.ts b/packages/dev-server-core/test/web-sockets/webSocketsPlugin.test.ts index ea6b5a242..8c59fda77 100644 --- a/packages/dev-server-core/test/web-sockets/webSocketsPlugin.test.ts +++ b/packages/dev-server-core/test/web-sockets/webSocketsPlugin.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import { createTestServer } from '../helpers'; -import { webSocketScript } from '../../src/web-sockets/webSocketsPlugin'; +import { createTestServer } from '../helpers.js'; +import { webSocketScript } from '../../src/web-sockets/webSocketsPlugin.js'; describe('webSocketsPlugin', () => { it('injects an event stream script if a plugin has inject set and event stream is enabled', async () => { diff --git a/packages/dev-server-esbuild/index.d.ts b/packages/dev-server-esbuild/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-esbuild/index.d.ts +++ b/packages/dev-server-esbuild/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-esbuild/src/EsbuildPlugin.ts b/packages/dev-server-esbuild/src/EsbuildPlugin.ts index 5655e4662..5143101bc 100644 --- a/packages/dev-server-esbuild/src/EsbuildPlugin.ts +++ b/packages/dev-server-esbuild/src/EsbuildPlugin.ts @@ -19,7 +19,7 @@ import { } from '@web/dev-server-core/dist/dom5'; import { parse as parseHtml, serialize as serializeHtml } from 'parse5'; -import { getEsbuildTarget } from './getEsbuildTarget'; +import { getEsbuildTarget } from './getEsbuildTarget.js'; const filteredWarnings = ['Unsupported source map comment']; diff --git a/packages/dev-server-esbuild/src/esbuildPluginFactory.ts b/packages/dev-server-esbuild/src/esbuildPluginFactory.ts index cb8c16f06..992a54871 100644 --- a/packages/dev-server-esbuild/src/esbuildPluginFactory.ts +++ b/packages/dev-server-esbuild/src/esbuildPluginFactory.ts @@ -1,6 +1,6 @@ import { Plugin } from '@web/dev-server-core'; import { Loader } from 'esbuild'; -import { EsbuildPlugin } from './EsbuildPlugin'; +import { EsbuildPlugin } from './EsbuildPlugin.js'; export interface EsBuildPluginArgs { target?: string | string[]; diff --git a/packages/dev-server-esbuild/src/getEsbuildTarget.ts b/packages/dev-server-esbuild/src/getEsbuildTarget.ts index 592404a25..e06354a59 100644 --- a/packages/dev-server-esbuild/src/getEsbuildTarget.ts +++ b/packages/dev-server-esbuild/src/getEsbuildTarget.ts @@ -1,11 +1,11 @@ -import { parseUserAgent } from './parseUserAgent'; +import { parseUserAgent } from './parseUserAgent.js'; import { TARGET_LATEST_MODERN, TARGET_LOWEST_ESM_SUPPORT, Browser, isLatestModernBrowser, isLatestSafari, -} from './browser-targets'; +} from './browser-targets.js'; const cache = new Map(); diff --git a/packages/dev-server-esbuild/src/index.ts b/packages/dev-server-esbuild/src/index.ts index 1ec48d058..414f2159e 100644 --- a/packages/dev-server-esbuild/src/index.ts +++ b/packages/dev-server-esbuild/src/index.ts @@ -1 +1 @@ -export { esbuildPlugin } from './esbuildPluginFactory'; +export { esbuildPlugin } from './esbuildPluginFactory.js'; diff --git a/packages/dev-server-esbuild/test/banner-footer.test.ts b/packages/dev-server-esbuild/test/banner-footer.test.ts index 579fcc5bb..d80849884 100644 --- a/packages/dev-server-esbuild/test/banner-footer.test.ts +++ b/packages/dev-server-esbuild/test/banner-footer.test.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { createTestServer } from '@web/dev-server-core/test-helpers'; import { expectIncludes } from '@web/dev-server-core/test-helpers'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; describe('esbuildPlugin banner/footers', function () { this.timeout(5000); diff --git a/packages/dev-server-esbuild/test/browser-targets.test.ts b/packages/dev-server-esbuild/test/browser-targets.test.ts index ff68c2c51..57ab9d857 100644 --- a/packages/dev-server-esbuild/test/browser-targets.test.ts +++ b/packages/dev-server-esbuild/test/browser-targets.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { browsers } from '@mdn/browser-compat-data'; -import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets'; +import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets.js'; describe('isLatestModernBrowser', () => { it('returns true for latest Chrome', async () => { diff --git a/packages/dev-server-esbuild/test/json.test.ts b/packages/dev-server-esbuild/test/json.test.ts index 152a303ac..0d98282a9 100644 --- a/packages/dev-server-esbuild/test/json.test.ts +++ b/packages/dev-server-esbuild/test/json.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; describe('esbuildPlugin JSON', function () { it('transforms .json files', async () => { diff --git a/packages/dev-server-esbuild/test/jsx.test.ts b/packages/dev-server-esbuild/test/jsx.test.ts index 809bd5329..8f94ba45b 100644 --- a/packages/dev-server-esbuild/test/jsx.test.ts +++ b/packages/dev-server-esbuild/test/jsx.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; describe('esbuildPlugin JSX', function () { it('transforms .jsx files', async () => { diff --git a/packages/dev-server-esbuild/test/target.test.ts b/packages/dev-server-esbuild/test/target.test.ts index 2d8e8a0d5..d2e9ffbd3 100644 --- a/packages/dev-server-esbuild/test/target.test.ts +++ b/packages/dev-server-esbuild/test/target.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; const modernJs = ` class MyClass { diff --git a/packages/dev-server-esbuild/test/ts.test.ts b/packages/dev-server-esbuild/test/ts.test.ts index 7ac1c9e1f..ce2ec0295 100644 --- a/packages/dev-server-esbuild/test/ts.test.ts +++ b/packages/dev-server-esbuild/test/ts.test.ts @@ -5,7 +5,7 @@ import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-hel import { Plugin as RollupPlugin } from 'rollup'; import { fromRollup } from '@web/dev-server-rollup'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; describe('esbuildPlugin TS', function () { this.timeout(5000); diff --git a/packages/dev-server-esbuild/test/tsx.test.ts b/packages/dev-server-esbuild/test/tsx.test.ts index 1cb4bf748..595e5e3cc 100644 --- a/packages/dev-server-esbuild/test/tsx.test.ts +++ b/packages/dev-server-esbuild/test/tsx.test.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { createTestServer } from '@web/dev-server-core/test-helpers'; import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers'; -import { esbuildPlugin } from '../src/index'; +import { esbuildPlugin } from '../src/index.js'; describe('esbuildPlugin TSX', function () { this.timeout(5000); diff --git a/packages/dev-server-hmr/index.d.ts b/packages/dev-server-hmr/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-hmr/index.d.ts +++ b/packages/dev-server-hmr/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-hmr/src/hmrPluginFactory.ts b/packages/dev-server-hmr/src/hmrPluginFactory.ts index 23ce3a152..79a79d708 100644 --- a/packages/dev-server-hmr/src/hmrPluginFactory.ts +++ b/packages/dev-server-hmr/src/hmrPluginFactory.ts @@ -1,5 +1,5 @@ import type { Plugin } from '@web/dev-server-core'; -import { HmrPlugin } from './HmrPlugin'; +import { HmrPlugin } from './HmrPlugin.js'; export function hmrPlugin(): Plugin { return new HmrPlugin(); diff --git a/packages/dev-server-hmr/src/index.ts b/packages/dev-server-hmr/src/index.ts index 1700b36d1..11770315f 100644 --- a/packages/dev-server-hmr/src/index.ts +++ b/packages/dev-server-hmr/src/index.ts @@ -1 +1 @@ -export { hmrPlugin } from './hmrPluginFactory'; +export { hmrPlugin } from './hmrPluginFactory.js'; diff --git a/packages/dev-server-hmr/test/HmrPlugin.test.ts b/packages/dev-server-hmr/test/HmrPlugin.test.ts index 783f12fc7..dd5e3c376 100644 --- a/packages/dev-server-hmr/test/HmrPlugin.test.ts +++ b/packages/dev-server-hmr/test/HmrPlugin.test.ts @@ -3,9 +3,9 @@ import { stubMethod, restore as restoreStubs } from 'hanbi'; import { createTestServer, fetchText, expectIncludes } from '@web/dev-server-core/test-helpers'; import { posix as pathUtil } from 'path'; -import { hmrPlugin } from '../src/index'; -import { NAME_HMR_CLIENT_IMPORT } from '../src/HmrPlugin'; -import { mockFile, mockFiles } from './utils'; +import { hmrPlugin } from '../src/index.js'; +import { NAME_HMR_CLIENT_IMPORT } from '../src/HmrPlugin.js'; +import { mockFile, mockFiles } from './utils.js'; describe('HmrPlugin', () => { afterEach(async () => { diff --git a/packages/dev-server-hmr/test/browser.test.ts b/packages/dev-server-hmr/test/browser.test.ts index 995c0776d..c195e9ca8 100644 --- a/packages/dev-server-hmr/test/browser.test.ts +++ b/packages/dev-server-hmr/test/browser.test.ts @@ -4,8 +4,8 @@ import { createTestServer, expectIncludes } from '@web/dev-server-core/test-help import { Browser, HTTPResponse, launch as launchPuppeteer, Page } from 'puppeteer'; import { posix as pathUtil } from 'path'; -import { hmrPlugin } from '../src/index'; -import { mockFiles } from './utils'; +import { hmrPlugin } from '../src/index.js'; +import { mockFiles } from './utils.js'; function trackErrors(page: Page) { const errors: any[] = []; diff --git a/packages/dev-server-import-maps/index.d.ts b/packages/dev-server-import-maps/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-import-maps/index.d.ts +++ b/packages/dev-server-import-maps/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-import-maps/src/importMapsPlugin.ts b/packages/dev-server-import-maps/src/importMapsPlugin.ts index be127bcdb..11376b8f8 100644 --- a/packages/dev-server-import-maps/src/importMapsPlugin.ts +++ b/packages/dev-server-import-maps/src/importMapsPlugin.ts @@ -17,7 +17,7 @@ import { shouldInject, mergeImportMaps, getDocumentBaseUrl, -} from './utils'; +} from './utils.js'; import { ImportMap } from '@import-maps/resolve'; import { createElement, diff --git a/packages/dev-server-import-maps/src/index.ts b/packages/dev-server-import-maps/src/index.ts index 3f3d64c17..fcfdc68a1 100644 --- a/packages/dev-server-import-maps/src/index.ts +++ b/packages/dev-server-import-maps/src/index.ts @@ -1 +1 @@ -export { importMapsPlugin } from './importMapsPlugin'; +export { importMapsPlugin } from './importMapsPlugin.js'; diff --git a/packages/dev-server-import-maps/src/utils.ts b/packages/dev-server-import-maps/src/utils.ts index 2a6c0d4d4..f86991aa6 100644 --- a/packages/dev-server-import-maps/src/utils.ts +++ b/packages/dev-server-import-maps/src/utils.ts @@ -4,7 +4,7 @@ import { Element as ElementAst } from 'parse5'; import { getAttribute } from '@web/parse5-utils'; import { ParsedImportMap } from '@import-maps/resolve'; -import { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin'; +import { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin.js'; export const IMPORT_MAP_PARAM = 'wds-import-map'; diff --git a/packages/dev-server-import-maps/test/injection.test.ts b/packages/dev-server-import-maps/test/injection.test.ts index 90e4b57aa..b55c2a42b 100644 --- a/packages/dev-server-import-maps/test/injection.test.ts +++ b/packages/dev-server-import-maps/test/injection.test.ts @@ -1,7 +1,7 @@ import { createTestServer, expectNotIncludes } from '@web/dev-server-core/test-helpers'; import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers'; -import { importMapsPlugin } from '../src/importMapsPlugin'; +import { importMapsPlugin } from '../src/importMapsPlugin.js'; it('can inject an import map into any page', async () => { const { server, host } = await createTestServer({ diff --git a/packages/dev-server-import-maps/test/resolving.test.ts b/packages/dev-server-import-maps/test/resolving.test.ts index 42cb50938..bc3368a78 100644 --- a/packages/dev-server-import-maps/test/resolving.test.ts +++ b/packages/dev-server-import-maps/test/resolving.test.ts @@ -1,11 +1,11 @@ -import { createTestServer } from '@web/dev-server-core/test-helpers'; import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers'; +import { createTestServer } from '@web/dev-server-core/test-helpers'; import { expect } from 'chai'; import { spy } from 'hanbi'; import path from 'path'; -import { importMapsPlugin } from '../src/importMapsPlugin'; -import { IMPORT_MAP_PARAM } from '../src/utils'; +import { importMapsPlugin } from '../src/importMapsPlugin.js'; +import { IMPORT_MAP_PARAM } from '../src/utils.js'; function createHtml(importMap: Record) { return ` diff --git a/packages/dev-server-legacy/index.d.ts b/packages/dev-server-legacy/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-legacy/index.d.ts +++ b/packages/dev-server-legacy/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-legacy/src/index.ts b/packages/dev-server-legacy/src/index.ts index 9bcdb5496..a359009b1 100644 --- a/packages/dev-server-legacy/src/index.ts +++ b/packages/dev-server-legacy/src/index.ts @@ -1 +1 @@ -export { legacyPlugin } from './legacyPlugin'; +export { legacyPlugin } from './legacyPlugin.js'; diff --git a/packages/dev-server-legacy/src/injectPolyfillsLoader.ts b/packages/dev-server-legacy/src/injectPolyfillsLoader.ts index 54c20772b..58539f3d8 100644 --- a/packages/dev-server-legacy/src/injectPolyfillsLoader.ts +++ b/packages/dev-server-legacy/src/injectPolyfillsLoader.ts @@ -9,8 +9,8 @@ import { GeneratedFile, File, } from '@web/polyfills-loader'; -import { PARAM_TRANSFORM_SYSTEMJS } from './constants'; -import { findJsScripts } from './findJsScripts'; +import { PARAM_TRANSFORM_SYSTEMJS } from './constants.js'; +import { findJsScripts } from './findJsScripts.js'; function findScripts(indexUrl: string, documentAst: DocumentAst) { const scriptNodes = findJsScripts(documentAst); diff --git a/packages/dev-server-legacy/src/legacyPlugin.ts b/packages/dev-server-legacy/src/legacyPlugin.ts index 7ee5ca6f8..16ebff9c6 100644 --- a/packages/dev-server-legacy/src/legacyPlugin.ts +++ b/packages/dev-server-legacy/src/legacyPlugin.ts @@ -1,10 +1,10 @@ import { Plugin, Logger, getRequestFilePath, isInlineScriptRequest } from '@web/dev-server-core'; import { GeneratedFile, PolyfillsConfig } from '@web/polyfills-loader'; import path from 'path'; -import { isLegacyBrowser } from './isLegacyBrowser'; -import { babelTransform, es5Config, systemJsConfig } from './babelTransform'; -import { injectPolyfillsLoader } from './injectPolyfillsLoader'; -import { PARAM_TRANSFORM_SYSTEMJS } from './constants'; +import { isLegacyBrowser } from './isLegacyBrowser.js'; +import { babelTransform, es5Config, systemJsConfig } from './babelTransform.js'; +import { injectPolyfillsLoader } from './injectPolyfillsLoader.js'; +import { PARAM_TRANSFORM_SYSTEMJS } from './constants.js'; interface inlineScripts { lastModified: string; diff --git a/packages/dev-server-legacy/test/transform-html.test.ts b/packages/dev-server-legacy/test/transform-html.test.ts index 7f4cc7fb7..2fdd19951 100644 --- a/packages/dev-server-legacy/test/transform-html.test.ts +++ b/packages/dev-server-legacy/test/transform-html.test.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import { createTestServer } from '@web/dev-server-core/test-helpers'; import { fetchText, expectIncludes } from '@web/dev-server-core/test-helpers'; -import { legacyPlugin } from '../src/legacyPlugin'; -import { modernUserAgents, legacyUserAgents } from './userAgents'; +import { legacyPlugin } from '../src/legacyPlugin.js'; +import { modernUserAgents, legacyUserAgents } from './userAgents.js'; const htmlBody = ` diff --git a/packages/dev-server-legacy/test/transform-js.test.ts b/packages/dev-server-legacy/test/transform-js.test.ts index 929db3c8d..fd035680e 100644 --- a/packages/dev-server-legacy/test/transform-js.test.ts +++ b/packages/dev-server-legacy/test/transform-js.test.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import { createTestServer } from '@web/dev-server-core/test-helpers'; import { fetchText, expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers'; -import { legacyPlugin } from '../src/legacyPlugin'; -import { modernUserAgents, legacyUserAgents } from './userAgents'; +import { legacyPlugin } from '../src/legacyPlugin.js'; +import { modernUserAgents, legacyUserAgents } from './userAgents.js'; const modernCode = ` class Foo { diff --git a/packages/dev-server-polyfill/index.d.ts b/packages/dev-server-polyfill/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-polyfill/index.d.ts +++ b/packages/dev-server-polyfill/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-rollup/index.d.ts b/packages/dev-server-rollup/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server-rollup/index.d.ts +++ b/packages/dev-server-rollup/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server-rollup/src/fromRollup.ts b/packages/dev-server-rollup/src/fromRollup.ts index a0e781604..5263566d5 100644 --- a/packages/dev-server-rollup/src/fromRollup.ts +++ b/packages/dev-server-rollup/src/fromRollup.ts @@ -1,5 +1,5 @@ import { InputOptions, Plugin as RollupPlugin } from 'rollup'; -import { rollupAdapter } from './rollupAdapter'; +import { rollupAdapter } from './rollupAdapter.js'; type FnArgs = readonly unknown[]; type RollupPluginFn = (...args: T) => RollupPlugin; diff --git a/packages/dev-server-rollup/src/index.ts b/packages/dev-server-rollup/src/index.ts index e602def98..d37362eef 100644 --- a/packages/dev-server-rollup/src/index.ts +++ b/packages/dev-server-rollup/src/index.ts @@ -1,4 +1,4 @@ export { RollupNodeResolveOptions, nodeResolve } from '@rollup/plugin-node-resolve'; -export { fromRollup } from './fromRollup'; -export { rollupAdapter } from './rollupAdapter'; -export { rollupBundlePlugin } from './rollupBundlePlugin'; +export { fromRollup } from './fromRollup.js'; +export { rollupAdapter } from './rollupAdapter.js'; +export { rollupBundlePlugin } from './rollupBundlePlugin.js'; diff --git a/packages/dev-server-rollup/src/rollupAdapter.ts b/packages/dev-server-rollup/src/rollupAdapter.ts index bc671df97..b7be6a94e 100644 --- a/packages/dev-server-rollup/src/rollupAdapter.ts +++ b/packages/dev-server-rollup/src/rollupAdapter.ts @@ -21,9 +21,9 @@ import { CustomPluginOptions, Plugin as RollupPlugin, TransformPluginContext } f import { InputOptions } from 'rollup'; import { red, cyan } from 'nanocolors'; -import { toBrowserPath, isAbsoluteFilePath, isOutsideRootDir } from './utils'; -import { createRollupPluginContextAdapter } from './createRollupPluginContextAdapter'; -import { createRollupPluginContexts, RollupPluginContexts } from './createRollupPluginContexts'; +import { toBrowserPath, isAbsoluteFilePath, isOutsideRootDir } from './utils.js'; +import { createRollupPluginContextAdapter } from './createRollupPluginContextAdapter.js'; +import { createRollupPluginContexts, RollupPluginContexts } from './createRollupPluginContexts.js'; const NULL_BYTE_PARAM = 'web-dev-server-rollup-null-byte'; const VIRTUAL_FILE_PREFIX = '/__web-dev-server__/rollup'; diff --git a/packages/dev-server-rollup/test/node/plugins/alias.test.ts b/packages/dev-server-rollup/test/node/plugins/alias.test.ts index cca536123..70e4509cc 100644 --- a/packages/dev-server-rollup/test/node/plugins/alias.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/alias.test.ts @@ -1,7 +1,7 @@ import rollupAlias from '@rollup/plugin-alias'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/fromRollup'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/fromRollup.js'; const alias = fromRollup(rollupAlias); diff --git a/packages/dev-server-rollup/test/node/plugins/babel.test.ts b/packages/dev-server-rollup/test/node/plugins/babel.test.ts index 84088729d..0dbf5d9b6 100644 --- a/packages/dev-server-rollup/test/node/plugins/babel.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/babel.test.ts @@ -1,8 +1,8 @@ /// import rollupBabel from '@rollup/plugin-babel'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/index'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/index.js'; const babel = fromRollup(rollupBabel); diff --git a/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts b/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts index 3c5bd958d..250a75ce3 100644 --- a/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/commonjs.test.ts @@ -4,8 +4,8 @@ import { resolve } from 'path'; import { chromeLauncher } from '@web/test-runner-chrome'; import * as path from 'path'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/index'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/index.js'; import { nodeResolvePlugin } from '@web/dev-server'; const commonjs = fromRollup(rollupCommonjs); diff --git a/packages/dev-server-rollup/test/node/plugins/node-resolve.test.ts b/packages/dev-server-rollup/test/node/plugins/node-resolve.test.ts index 9585fc9b4..2c7912987 100644 --- a/packages/dev-server-rollup/test/node/plugins/node-resolve.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/node-resolve.test.ts @@ -2,8 +2,8 @@ import path from 'path'; import rollupNodeResolve from '@rollup/plugin-node-resolve'; import rollupCommonjs from '@rollup/plugin-commonjs'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/index'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/index.js'; import { expect } from 'chai'; const nodeResolve = fromRollup(rollupNodeResolve, {}, { throwOnUnresolvedImport: true }); diff --git a/packages/dev-server-rollup/test/node/plugins/postcss.test.ts b/packages/dev-server-rollup/test/node/plugins/postcss.test.ts index 1d2db97ed..43526f05c 100644 --- a/packages/dev-server-rollup/test/node/plugins/postcss.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/postcss.test.ts @@ -4,8 +4,8 @@ import { chromeLauncher } from '@web/test-runner-chrome'; import { runTests } from '@web/test-runner-core/test-helpers'; import { resolve } from 'path'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/index'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/index.js'; const postcss = fromRollup(rollupPostcss); diff --git a/packages/dev-server-rollup/test/node/plugins/replace.test.ts b/packages/dev-server-rollup/test/node/plugins/replace.test.ts index 7f3aaef5b..83a8b723a 100644 --- a/packages/dev-server-rollup/test/node/plugins/replace.test.ts +++ b/packages/dev-server-rollup/test/node/plugins/replace.test.ts @@ -1,7 +1,7 @@ import rollupReplace from '@rollup/plugin-replace'; -import { createTestServer, fetchText, expectIncludes } from '../test-helpers'; -import { fromRollup } from '../../../src/index'; +import { createTestServer, fetchText, expectIncludes } from '../test-helpers.js'; +import { fromRollup } from '../../../src/index.js'; const replace = fromRollup(rollupReplace as any); diff --git a/packages/dev-server-rollup/test/node/rollupBundlePlugin.test.ts b/packages/dev-server-rollup/test/node/rollupBundlePlugin.test.ts index 410bc6316..658812a3a 100644 --- a/packages/dev-server-rollup/test/node/rollupBundlePlugin.test.ts +++ b/packages/dev-server-rollup/test/node/rollupBundlePlugin.test.ts @@ -1,6 +1,6 @@ +import { rollupBundlePlugin } from '../../src/rollupBundlePlugin.js'; import path from 'path'; -import { rollupBundlePlugin } from '../../src/rollupBundlePlugin'; -import { createTestServer, fetchText, expectIncludes } from './test-helpers'; +import { createTestServer, fetchText, expectIncludes } from './test-helpers.js'; describe('rollupBundlePlugin', () => { it('can bundle a single entrypoint', async () => { diff --git a/packages/dev-server-rollup/test/node/unit.test.ts b/packages/dev-server-rollup/test/node/unit.test.ts index 1900935cd..42a416132 100644 --- a/packages/dev-server-rollup/test/node/unit.test.ts +++ b/packages/dev-server-rollup/test/node/unit.test.ts @@ -2,8 +2,8 @@ import { Plugin as RollupPlugin, AcornNode } from 'rollup'; import { expect } from 'chai'; import path from 'path'; -import { createTestServer, fetchText, expectIncludes } from './test-helpers'; -import { fromRollup } from '../../src/index'; +import { createTestServer, fetchText, expectIncludes } from './test-helpers.js'; +import { fromRollup } from '../../src/index.js'; describe('@web/dev-server-rollup', () => { describe('resolveId', () => { diff --git a/packages/dev-server/index.d.ts b/packages/dev-server/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/dev-server/index.d.ts +++ b/packages/dev-server/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/dev-server/src/bin.ts b/packages/dev-server/src/bin.ts index b7619d63f..3b09dc8a8 100644 --- a/packages/dev-server/src/bin.ts +++ b/packages/dev-server/src/bin.ts @@ -1,4 +1,4 @@ #!/usr/bin/env node -import { startDevServer } from './startDevServer'; +import { startDevServer } from './startDevServer.js'; startDevServer(); diff --git a/packages/dev-server/src/config/mergeConfigs.ts b/packages/dev-server/src/config/mergeConfigs.ts index 1240b0787..ec187e601 100644 --- a/packages/dev-server/src/config/mergeConfigs.ts +++ b/packages/dev-server/src/config/mergeConfigs.ts @@ -1,4 +1,4 @@ -import { DevServerConfig } from './DevServerConfig'; +import { DevServerConfig } from './DevServerConfig.js'; const arrayKeys = ['plugins', 'middleware']; diff --git a/packages/dev-server/src/config/parseConfig.ts b/packages/dev-server/src/config/parseConfig.ts index 107afcee5..8507db24f 100644 --- a/packages/dev-server/src/config/parseConfig.ts +++ b/packages/dev-server/src/config/parseConfig.ts @@ -1,13 +1,13 @@ import { getPortPromise } from 'portfinder'; import path from 'path'; -import { DevServerCliArgs } from './readCliArgs'; -import { mergeConfigs } from './mergeConfigs'; -import { DevServerConfig } from './DevServerConfig'; -import { esbuildPlugin } from '../plugins/esbuildPlugin'; -import { watchPlugin } from '../plugins/watchPlugin'; -import { nodeResolvePlugin } from '../plugins/nodeResolvePlugin'; -import { DevServerStartError } from '../DevServerStartError'; +import { DevServerCliArgs } from './readCliArgs.js'; +import { mergeConfigs } from './mergeConfigs.js'; +import { DevServerConfig } from './DevServerConfig.js'; +import { esbuildPlugin } from '../plugins/esbuildPlugin.js'; +import { watchPlugin } from '../plugins/watchPlugin.js'; +import { nodeResolvePlugin } from '../plugins/nodeResolvePlugin.js'; +import { DevServerStartError } from '../DevServerStartError.js'; const defaultConfig: Partial = { rootDir: process.cwd(), diff --git a/packages/dev-server/src/config/readCliArgs.ts b/packages/dev-server/src/config/readCliArgs.ts index 9fee96a33..6dd892bd9 100644 --- a/packages/dev-server/src/config/readCliArgs.ts +++ b/packages/dev-server/src/config/readCliArgs.ts @@ -1,7 +1,7 @@ import commandLineArgs from 'command-line-args'; import commandLineUsage, { OptionDefinition } from 'command-line-usage'; import camelCase from 'camelcase'; -import { DevServerConfig } from './DevServerConfig'; +import { DevServerConfig } from './DevServerConfig.js'; export interface DevServerCliArgs extends Partial< diff --git a/packages/dev-server/src/config/readFileConfig.ts b/packages/dev-server/src/config/readFileConfig.ts index 706db3b9e..cae64bfcd 100644 --- a/packages/dev-server/src/config/readFileConfig.ts +++ b/packages/dev-server/src/config/readFileConfig.ts @@ -1,5 +1,5 @@ import { readConfig, ConfigLoaderError } from '@web/config-loader'; -import { DevServerStartError } from '../DevServerStartError'; +import { DevServerStartError } from '../DevServerStartError.js'; export interface ReadFileConfigParams { /** diff --git a/packages/dev-server/src/index.ts b/packages/dev-server/src/index.ts index 2b464e332..6c8c6cf4f 100644 --- a/packages/dev-server/src/index.ts +++ b/packages/dev-server/src/index.ts @@ -1,9 +1,9 @@ export { RollupNodeResolveOptions } from '@web/dev-server-rollup'; -export { startDevServer } from './startDevServer'; -export { mergeConfigs } from './config/mergeConfigs'; -export { DevServerStartError } from './DevServerStartError'; -export { esbuildPlugin } from './plugins/esbuildPlugin'; -export { nodeResolvePlugin } from './plugins/nodeResolvePlugin'; +export { startDevServer } from './startDevServer.js'; +export { mergeConfigs } from './config/mergeConfigs.js'; +export { DevServerStartError } from './DevServerStartError.js'; +export { esbuildPlugin } from './plugins/esbuildPlugin.js'; +export { nodeResolvePlugin } from './plugins/nodeResolvePlugin.js'; -import type { DevServerConfig as FullDevServerConfig } from './config/DevServerConfig'; +import type { DevServerConfig as FullDevServerConfig } from './config/DevServerConfig.js'; export type DevServerConfig = Partial; diff --git a/packages/dev-server/src/logger/createLogger.ts b/packages/dev-server/src/logger/createLogger.ts index 3ddca0820..051291eb5 100644 --- a/packages/dev-server/src/logger/createLogger.ts +++ b/packages/dev-server/src/logger/createLogger.ts @@ -1,6 +1,6 @@ import { Plugin } from '@web/dev-server-core'; -import { DevServerLogger } from './DevServerLogger'; -import { logStartMessage } from './logStartMessage'; +import { DevServerLogger } from './DevServerLogger.js'; +import { logStartMessage } from './logStartMessage.js'; const CLEAR_COMMAND = process.platform === 'win32' ? '\x1B[2J\x1B[0f' : '\x1B[2J\x1B[H'; diff --git a/packages/dev-server/src/openBrowser.ts b/packages/dev-server/src/openBrowser.ts index d24d71f8b..8c3dfa10c 100644 --- a/packages/dev-server/src/openBrowser.ts +++ b/packages/dev-server/src/openBrowser.ts @@ -1,6 +1,6 @@ import openBrowserWindow from 'open'; import path from 'path'; -import { DevServerConfig } from './config/DevServerConfig'; +import { DevServerConfig } from './config/DevServerConfig.js'; function isValidURL(str: string) { try { diff --git a/packages/dev-server/src/startDevServer.ts b/packages/dev-server/src/startDevServer.ts index 5e2b1d0c5..f4d65e71c 100644 --- a/packages/dev-server/src/startDevServer.ts +++ b/packages/dev-server/src/startDevServer.ts @@ -1,12 +1,12 @@ import { DevServer } from '@web/dev-server-core'; -import { DevServerConfig } from './config/DevServerConfig'; -import { mergeConfigs } from './config/mergeConfigs'; -import { parseConfig } from './config/parseConfig'; -import { readCliArgs } from './config/readCliArgs'; -import { readFileConfig } from './config/readFileConfig'; -import { DevServerStartError } from './DevServerStartError'; -import { createLogger } from './logger/createLogger'; -import { openBrowser } from './openBrowser'; +import { DevServerConfig } from './config/DevServerConfig.js'; +import { mergeConfigs } from './config/mergeConfigs.js'; +import { parseConfig } from './config/parseConfig.js'; +import { readCliArgs } from './config/readCliArgs.js'; +import { readFileConfig } from './config/readFileConfig.js'; +import { DevServerStartError } from './DevServerStartError.js'; +import { createLogger } from './logger/createLogger.js'; +import { openBrowser } from './openBrowser.js'; export interface StartDevServerParams { /** diff --git a/packages/parse5-utils/index.d.ts b/packages/parse5-utils/index.d.ts index e4ddc9027..2b8395cdb 100644 --- a/packages/parse5-utils/index.d.ts +++ b/packages/parse5-utils/index.d.ts @@ -1 +1 @@ -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/polyfills-loader/index.d.ts b/packages/polyfills-loader/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/polyfills-loader/index.d.ts +++ b/packages/polyfills-loader/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/polyfills-loader/src/createPolyfillsData.ts b/packages/polyfills-loader/src/createPolyfillsData.ts index eec2edce2..1145e87e2 100644 --- a/packages/polyfills-loader/src/createPolyfillsData.ts +++ b/packages/polyfills-loader/src/createPolyfillsData.ts @@ -1,8 +1,12 @@ import path from 'path'; import fs from 'fs'; -import Terser from 'terser'; -import { PolyfillsLoaderConfig, PolyfillConfig, PolyfillFile } from './types'; -import { createContentHash, noModuleSupportTest, hasFileOfType, fileTypes } from './utils'; +import path from 'path'; +import { minify } from 'terser'; +import { PolyfillsLoaderConfig, PolyfillConfig, PolyfillFile } from './types.js'; +import { createContentHash, noModuleSupportTest, hasFileOfType, fileTypes } from './utils.js'; + +import { createRequire } from 'node:module'; +const require = createRequire(import.meta.url); export async function createPolyfillsData(cfg: PolyfillsLoaderConfig): Promise { const { polyfills = {} } = cfg; @@ -227,7 +231,7 @@ export async function createPolyfillsData(cfg: PolyfillsLoaderConfig): Promise

(entries: [string, V][]) { const obj: Record = {}; diff --git a/packages/rollup-plugin-html/src/input/extract/extractAssets.ts b/packages/rollup-plugin-html/src/input/extract/extractAssets.ts index b1aafebcd..7eb032b2a 100644 --- a/packages/rollup-plugin-html/src/input/extract/extractAssets.ts +++ b/packages/rollup-plugin-html/src/input/extract/extractAssets.ts @@ -1,13 +1,13 @@ import { Document, serialize } from 'parse5'; import fs from 'fs'; import path from 'path'; -import { InputAsset } from '../InputData'; +import { InputAsset } from '../InputData.js'; import { findAssets, getSourcePaths, isHashedAsset, resolveAssetFilePath, -} from '../../assets/utils'; +} from '../../assets/utils.js'; export interface ExtractAssetsParams { document: Document; diff --git a/packages/rollup-plugin-html/src/input/extract/extractModules.ts b/packages/rollup-plugin-html/src/input/extract/extractModules.ts index d977838ee..aec82e009 100644 --- a/packages/rollup-plugin-html/src/input/extract/extractModules.ts +++ b/packages/rollup-plugin-html/src/input/extract/extractModules.ts @@ -2,9 +2,9 @@ import { findElements, getAttribute, getTagName, getTextContent, remove } from ' import { Document, Attribute } from 'parse5'; import path from 'path'; import crypto from 'crypto'; -import { resolveAssetFilePath } from '../../assets/utils'; +import { resolveAssetFilePath } from '../../assets/utils.js'; import { getAttributes } from '@web/parse5-utils'; -import { ScriptModuleTag } from '../../RollupPluginHTMLOptions'; +import { ScriptModuleTag } from '../../RollupPluginHTMLOptions.js'; export interface ExtractModulesParams { document: Document; diff --git a/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts b/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts index 3f620c115..e955ccfed 100644 --- a/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts +++ b/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts @@ -1,7 +1,7 @@ import path from 'path'; import { parse, serialize } from 'parse5'; -import { extractModules } from './extractModules'; -import { extractAssets } from './extractAssets'; +import { extractModules } from './extractModules.js'; +import { extractAssets } from './extractAssets.js'; export interface ExtractParams { html: string; diff --git a/packages/rollup-plugin-html/src/input/getInputData.ts b/packages/rollup-plugin-html/src/input/getInputData.ts index cdc859a4e..b33008017 100644 --- a/packages/rollup-plugin-html/src/input/getInputData.ts +++ b/packages/rollup-plugin-html/src/input/getInputData.ts @@ -2,11 +2,11 @@ import fs from 'fs'; import path from 'path'; import glob from 'glob'; -import { createError } from '../utils'; -import { RollupPluginHTMLOptions } from '../RollupPluginHTMLOptions'; -import { InputData } from './InputData'; -import { normalizeInputOptions } from './normalizeInputOptions'; -import { extractModulesAndAssets } from './extract/extractModulesAndAssets'; +import { createError } from '../utils.js'; +import { RollupPluginHTMLOptions } from '../RollupPluginHTMLOptions.js'; +import { InputData } from './InputData.js'; +import { normalizeInputOptions } from './normalizeInputOptions.js'; +import { extractModulesAndAssets } from './extract/extractModulesAndAssets.js'; import { InputOption } from 'rollup'; function resolveGlob(fromGlob: string, opts: glob.IOptions) { diff --git a/packages/rollup-plugin-html/src/input/normalizeInputOptions.ts b/packages/rollup-plugin-html/src/input/normalizeInputOptions.ts index 47c7e1c00..7ae9eba70 100644 --- a/packages/rollup-plugin-html/src/input/normalizeInputOptions.ts +++ b/packages/rollup-plugin-html/src/input/normalizeInputOptions.ts @@ -1,6 +1,6 @@ import { InputOption } from 'rollup'; -import { InputHTMLOptions, RollupPluginHTMLOptions } from '../RollupPluginHTMLOptions'; -import { createError } from '../utils'; +import { InputHTMLOptions, RollupPluginHTMLOptions } from '../RollupPluginHTMLOptions.js'; +import { createError } from '../utils.js'; export function normalizeInputOptions( pluginOptions: RollupPluginHTMLOptions, diff --git a/packages/rollup-plugin-html/src/output/createHTMLOutput.ts b/packages/rollup-plugin-html/src/output/createHTMLOutput.ts index f61236462..cb2224267 100644 --- a/packages/rollup-plugin-html/src/output/createHTMLOutput.ts +++ b/packages/rollup-plugin-html/src/output/createHTMLOutput.ts @@ -1,14 +1,14 @@ -import { getEntrypointBundles } from './getEntrypointBundles'; -import { getOutputHTML } from './getOutputHTML'; -import { createError } from '../utils'; +import { getEntrypointBundles } from './getEntrypointBundles.js'; +import { getOutputHTML } from './getOutputHTML.js'; +import { createError } from '../utils.js'; import { GeneratedBundle, RollupPluginHTMLOptions, TransformHtmlFunction, -} from '../RollupPluginHTMLOptions'; +} from '../RollupPluginHTMLOptions.js'; import { EmittedFile } from 'rollup'; -import { InputData } from '../input/InputData'; -import { EmittedAssets } from './emitAssets'; +import { InputData } from '../input/InputData.js'; +import { EmittedAssets } from './emitAssets.js'; export interface CreateHTMLAssetParams { outputDir: string; diff --git a/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts b/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts index 6d12f5454..12c1bbb5c 100644 --- a/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts +++ b/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts @@ -8,8 +8,8 @@ import { RollupPluginHTMLOptions, ScriptModuleTag, } from '../RollupPluginHTMLOptions'; -import { createError, NOOP_IMPORT } from '../utils'; -import { toBrowserPath } from './utils'; +import { createError, NOOP_IMPORT } from '../utils.js'; +import { toBrowserPath } from './utils.js'; export interface CreateImportPathParams { publicPath?: string; diff --git a/packages/rollup-plugin-html/src/output/getOutputHTML.ts b/packages/rollup-plugin-html/src/output/getOutputHTML.ts index 93d14ae8d..d3c1b8256 100644 --- a/packages/rollup-plugin-html/src/output/getOutputHTML.ts +++ b/packages/rollup-plugin-html/src/output/getOutputHTML.ts @@ -1,4 +1,4 @@ -import { injectBundles } from './injectBundles'; +import { injectBundles } from './injectBundles.js'; import { InputData } from '../input/InputData'; import { EntrypointBundle, @@ -7,11 +7,11 @@ import { } from '../RollupPluginHTMLOptions'; import { parse, serialize } from 'parse5'; import { minify as minifyHTMLFunc } from 'html-minifier-terser'; -import { injectedUpdatedAssetPaths } from './injectedUpdatedAssetPaths'; -import { EmittedAssets } from './emitAssets'; -import { injectAbsoluteBaseUrl } from './injectAbsoluteBaseUrl'; -import { hashInlineScripts } from './hashInlineScripts'; -import { injectServiceWorkerRegistration } from './injectServiceWorkerRegistration'; +import { injectedUpdatedAssetPaths } from './injectedUpdatedAssetPaths.js'; +import { EmittedAssets } from './emitAssets.js'; +import { injectAbsoluteBaseUrl } from './injectAbsoluteBaseUrl.js'; +import { hashInlineScripts } from './hashInlineScripts.js'; +import { injectServiceWorkerRegistration } from './injectServiceWorkerRegistration.js'; export interface GetOutputHTMLParams { input: InputData; diff --git a/packages/rollup-plugin-html/src/output/injectBundles.ts b/packages/rollup-plugin-html/src/output/injectBundles.ts index e6db2ecd8..a624297bb 100644 --- a/packages/rollup-plugin-html/src/output/injectBundles.ts +++ b/packages/rollup-plugin-html/src/output/injectBundles.ts @@ -1,8 +1,8 @@ import { Document, Attribute } from 'parse5'; import { createScript, findElement, getTagName, appendChild } from '@web/parse5-utils'; -import { EntrypointBundle } from '../RollupPluginHTMLOptions'; -import { createError } from '../utils'; +import { EntrypointBundle } from '../RollupPluginHTMLOptions.js'; +import { createError } from '../utils.js'; export function createLoadScript(src: string, format: string, attributes?: Attribute[]) { const attributesObject: Record = {}; diff --git a/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts b/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts index 9d54592e9..32d4d0980 100644 --- a/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts +++ b/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts @@ -8,11 +8,11 @@ import { getSourcePaths, isHashedAsset, resolveAssetFilePath, -} from '../assets/utils'; -import { InputData } from '../input/InputData'; -import { createError } from '../utils'; -import { EmittedAssets } from './emitAssets'; -import { toBrowserPath } from './utils'; +} from '../assets/utils.js'; +import { InputData } from '../input/InputData.js'; +import { createError } from '../utils.js'; +import { EmittedAssets } from './emitAssets.js'; +import { toBrowserPath } from './utils.js'; export interface InjectUpdatedAssetPathsArgs { document: Document; diff --git a/packages/rollup-plugin-html/src/rollupPluginHTML.ts b/packages/rollup-plugin-html/src/rollupPluginHTML.ts index 20a9bf803..388c32967 100644 --- a/packages/rollup-plugin-html/src/rollupPluginHTML.ts +++ b/packages/rollup-plugin-html/src/rollupPluginHTML.ts @@ -1,19 +1,19 @@ import { Plugin } from 'rollup'; import path from 'path'; -import { addRollupInput } from './input/addRollupInput'; -import { getInputData } from './input/getInputData'; -import { InputData } from './input/InputData'; -import { createHTMLOutput } from './output/createHTMLOutput'; +import { addRollupInput } from './input/addRollupInput.js'; +import { getInputData } from './input/getInputData.js'; +import { InputData } from './input/InputData.js'; +import { createHTMLOutput } from './output/createHTMLOutput.js'; import { GeneratedBundle, RollupPluginHTMLOptions, ScriptModuleTag, TransformHtmlFunction, -} from './RollupPluginHTMLOptions'; -import { createError, NOOP_IMPORT } from './utils'; -import { emitAssets } from './output/emitAssets'; +} from './RollupPluginHTMLOptions.js'; +import { createError, NOOP_IMPORT } from './utils.js'; +import { emitAssets } from './output/emitAssets.js'; export interface RollupPluginHtml extends Plugin { api: { diff --git a/packages/rollup-plugin-html/src/utils.ts b/packages/rollup-plugin-html/src/utils.ts index ce6c27c0e..b6df2d15c 100644 --- a/packages/rollup-plugin-html/src/utils.ts +++ b/packages/rollup-plugin-html/src/utils.ts @@ -1,4 +1,4 @@ -import { ScriptModuleTag } from './RollupPluginHTMLOptions'; +import { ScriptModuleTag } from './RollupPluginHTMLOptions.js'; const PLUGIN = '[@web/rollup-plugin-html]'; diff --git a/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts b/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts index 3d08f16ef..447e35ac0 100644 --- a/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts +++ b/packages/rollup-plugin-html/test/rollup-plugin-html.test.ts @@ -1,7 +1,7 @@ import { rollup, OutputChunk, OutputAsset, OutputOptions, Plugin } from 'rollup'; import { expect } from 'chai'; import path from 'path'; -import { rollupPluginHTML } from '../src/index'; +import { rollupPluginHTML } from '../src/index.js'; type Output = (OutputChunk | OutputAsset)[]; diff --git a/packages/rollup-plugin-html/test/src/input/InputData.test.ts b/packages/rollup-plugin-html/test/src/input/InputData.test.ts index cbda59747..ce6354002 100644 --- a/packages/rollup-plugin-html/test/src/input/InputData.test.ts +++ b/packages/rollup-plugin-html/test/src/input/InputData.test.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import path from 'path'; -import { getInputData } from '../../../src/input/getInputData'; -import { InputData } from '../../../src/input/InputData'; +import { getInputData } from '../../../src/input/getInputData.js'; +import { InputData } from '../../../src/input/InputData.js'; const rootDir = path.join(__dirname, '..', '..', 'fixtures', 'basic'); diff --git a/packages/rollup-plugin-html/test/src/input/extract/extractAssets.test.ts b/packages/rollup-plugin-html/test/src/input/extract/extractAssets.test.ts index b9558f791..f2d4cdcd9 100644 --- a/packages/rollup-plugin-html/test/src/input/extract/extractAssets.test.ts +++ b/packages/rollup-plugin-html/test/src/input/extract/extractAssets.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { parse } from 'parse5'; import path from 'path'; -import { extractAssets } from '../../../../src/input/extract/extractAssets'; +import { extractAssets } from '../../../../src/input/extract/extractAssets.js'; const rootDir = path.resolve(__dirname, '..', '..', '..', 'fixtures', 'assets'); diff --git a/packages/rollup-plugin-html/test/src/input/extract/extractModules.test.ts b/packages/rollup-plugin-html/test/src/input/extract/extractModules.test.ts index a58631159..11fd545b5 100644 --- a/packages/rollup-plugin-html/test/src/input/extract/extractModules.test.ts +++ b/packages/rollup-plugin-html/test/src/input/extract/extractModules.test.ts @@ -2,7 +2,7 @@ import path from 'path'; import { parse, serialize } from 'parse5'; import { expect } from 'chai'; -import { extractModules } from '../../../../src/input/extract/extractModules'; +import { extractModules } from '../../../../src/input/extract/extractModules.js'; const { sep } = path; diff --git a/packages/rollup-plugin-html/test/src/output/getEntrypointBundles.test.ts b/packages/rollup-plugin-html/test/src/output/getEntrypointBundles.test.ts index 5afb488a9..e7cf8d647 100644 --- a/packages/rollup-plugin-html/test/src/output/getEntrypointBundles.test.ts +++ b/packages/rollup-plugin-html/test/src/output/getEntrypointBundles.test.ts @@ -1,6 +1,9 @@ import { expect } from 'chai'; -import { getEntrypointBundles, createImportPath } from '../../../src/output/getEntrypointBundles'; -import { GeneratedBundle, ScriptModuleTag } from '../../../src/RollupPluginHTMLOptions'; +import { + getEntrypointBundles, + createImportPath, +} from '../../../src/output/getEntrypointBundles.js'; +import { GeneratedBundle, ScriptModuleTag } from '../../../src/RollupPluginHTMLOptions.js'; describe('createImportPath()', () => { it('creates a relative import path', () => { diff --git a/packages/rollup-plugin-html/test/src/output/getOutputHTML.test.ts b/packages/rollup-plugin-html/test/src/output/getOutputHTML.test.ts index f2e616305..11cf7a7ed 100644 --- a/packages/rollup-plugin-html/test/src/output/getOutputHTML.test.ts +++ b/packages/rollup-plugin-html/test/src/output/getOutputHTML.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import path from 'path'; -import { getOutputHTML, GetOutputHTMLParams } from '../../../src/output/getOutputHTML'; -import { EntrypointBundle } from '../../../src/RollupPluginHTMLOptions'; +import { getOutputHTML, GetOutputHTMLParams } from '../../../src/output/getOutputHTML.js'; +import { EntrypointBundle } from '../../../src/RollupPluginHTMLOptions.js'; describe('getOutputHTML()', () => { const defaultEntrypointBundles: Record = { diff --git a/packages/rollup-plugin-html/test/src/output/injectBundles.test.ts b/packages/rollup-plugin-html/test/src/output/injectBundles.test.ts index e59c96a02..5068d8dc3 100644 --- a/packages/rollup-plugin-html/test/src/output/injectBundles.test.ts +++ b/packages/rollup-plugin-html/test/src/output/injectBundles.test.ts @@ -2,7 +2,7 @@ import { getTextContent } from '@web/parse5-utils'; import { expect } from 'chai'; import { parse, serialize } from 'parse5'; -import { injectBundles, createLoadScript } from '../../../src/output/injectBundles'; +import { injectBundles, createLoadScript } from '../../../src/output/injectBundles.js'; describe('createLoadScript()', () => { it('creates a script for es modules', () => { diff --git a/packages/rollup-plugin-html/test/src/output/injectedUpdatedAssetPaths.test.ts b/packages/rollup-plugin-html/test/src/output/injectedUpdatedAssetPaths.test.ts index 353a6399a..85ae406fe 100644 --- a/packages/rollup-plugin-html/test/src/output/injectedUpdatedAssetPaths.test.ts +++ b/packages/rollup-plugin-html/test/src/output/injectedUpdatedAssetPaths.test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import path from 'path'; import { parse, serialize } from 'parse5'; -import { InputData } from '../../../src/input/InputData'; +import { InputData } from '../../../src/input/InputData.js'; -import { injectedUpdatedAssetPaths } from '../../../src/output/injectedUpdatedAssetPaths'; +import { injectedUpdatedAssetPaths } from '../../../src/output/injectedUpdatedAssetPaths.js'; describe('injectedUpdatedAssetPaths()', () => { it('injects updated asset paths', () => { diff --git a/packages/rollup-plugin-polyfills-loader/index.d.ts b/packages/rollup-plugin-polyfills-loader/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/rollup-plugin-polyfills-loader/index.d.ts +++ b/packages/rollup-plugin-polyfills-loader/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/rollup-plugin-polyfills-loader/src/createPolyfillsLoaderConfig.ts b/packages/rollup-plugin-polyfills-loader/src/createPolyfillsLoaderConfig.ts index 3f4b218d8..dae87d3f5 100644 --- a/packages/rollup-plugin-polyfills-loader/src/createPolyfillsLoaderConfig.ts +++ b/packages/rollup-plugin-polyfills-loader/src/createPolyfillsLoaderConfig.ts @@ -3,7 +3,7 @@ import { PolyfillsLoaderConfig, FileType, fileTypes } from '@web/polyfills-loade import { ModuleFormat } from 'rollup'; import { RollupPluginPolyfillsLoaderConfig } from './types'; -import { createError } from './utils'; +import { createError } from './utils.js'; export function formatToFileType(format: ModuleFormat) { switch (format) { diff --git a/packages/rollup-plugin-polyfills-loader/src/index.ts b/packages/rollup-plugin-polyfills-loader/src/index.ts index a57d58a19..c17f274c7 100644 --- a/packages/rollup-plugin-polyfills-loader/src/index.ts +++ b/packages/rollup-plugin-polyfills-loader/src/index.ts @@ -1,4 +1,4 @@ -import { polyfillsLoader } from './rollupPluginPolyfillsLoader'; +import { polyfillsLoader } from './rollupPluginPolyfillsLoader.js'; export default polyfillsLoader; export { polyfillsLoader }; diff --git a/packages/rollup-plugin-polyfills-loader/src/rollupPluginPolyfillsLoader.ts b/packages/rollup-plugin-polyfills-loader/src/rollupPluginPolyfillsLoader.ts index 9542ac073..a0d834686 100644 --- a/packages/rollup-plugin-polyfills-loader/src/rollupPluginPolyfillsLoader.ts +++ b/packages/rollup-plugin-polyfills-loader/src/rollupPluginPolyfillsLoader.ts @@ -4,8 +4,8 @@ import { GeneratedFile, injectPolyfillsLoader, File, fileTypes } from '@web/poly import path from 'path'; import { RollupPluginPolyfillsLoaderConfig } from './types'; -import { createError, shouldInjectLoader } from './utils'; -import { createPolyfillsLoaderConfig, formatToFileType } from './createPolyfillsLoaderConfig'; +import { createError, shouldInjectLoader } from './utils.js'; +import { createPolyfillsLoaderConfig, formatToFileType } from './createPolyfillsLoaderConfig.js'; export function polyfillsLoader(pluginOptions: RollupPluginPolyfillsLoaderConfig = {}): Plugin { let generatedFiles: GeneratedFile[] | undefined; diff --git a/packages/rollup-plugin-polyfills-loader/test/src/createPolyfillsLoaderConfig.test.ts b/packages/rollup-plugin-polyfills-loader/test/src/createPolyfillsLoaderConfig.test.ts index bc618ad4e..3e15905d1 100644 --- a/packages/rollup-plugin-polyfills-loader/test/src/createPolyfillsLoaderConfig.test.ts +++ b/packages/rollup-plugin-polyfills-loader/test/src/createPolyfillsLoaderConfig.test.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { createPolyfillsLoaderConfig } from '../../src/createPolyfillsLoaderConfig'; +import { createPolyfillsLoaderConfig } from '../../src/createPolyfillsLoaderConfig.js'; describe('createPolyfillsLoaderConfig()', () => { it('creates a config for a single module build', () => { diff --git a/packages/rollup-plugin-polyfills-loader/test/src/rollupPluginPolyfillsLoader.test.ts b/packages/rollup-plugin-polyfills-loader/test/src/rollupPluginPolyfillsLoader.test.ts index 9854c154c..3460565fd 100644 --- a/packages/rollup-plugin-polyfills-loader/test/src/rollupPluginPolyfillsLoader.test.ts +++ b/packages/rollup-plugin-polyfills-loader/test/src/rollupPluginPolyfillsLoader.test.ts @@ -3,8 +3,8 @@ import { OutputChunk, rollup, OutputAsset, RollupOptions, OutputOptions } from ' import { expect } from 'chai'; import fs from 'fs'; import path from 'path'; -import html from '@web/rollup-plugin-html'; -import polyfillsLoader from '../../src/index'; +import { rollupPluginHTML as html } from '@web/rollup-plugin-html'; +import polyfillsLoader from '../../src/index.js'; type Output = (OutputChunk | OutputAsset)[]; diff --git a/packages/rollup-plugin-polyfills-loader/test/src/utils.test.ts b/packages/rollup-plugin-polyfills-loader/test/src/utils.test.ts index b66fbdc28..22ca42691 100644 --- a/packages/rollup-plugin-polyfills-loader/test/src/utils.test.ts +++ b/packages/rollup-plugin-polyfills-loader/test/src/utils.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { fileTypes } from '@web/polyfills-loader'; -import { shouldInjectLoader } from '../../src/utils'; +import { shouldInjectLoader } from '../../src/utils.js'; describe('shouldInjectLoader', () => { it('returns true when modern contains non-module or script', () => { diff --git a/packages/rollup-plugin-workbox/index.d.ts b/packages/rollup-plugin-workbox/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/rollup-plugin-workbox/index.d.ts +++ b/packages/rollup-plugin-workbox/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/storybook-builder/index.d.ts b/packages/storybook-builder/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/storybook-builder/index.d.ts +++ b/packages/storybook-builder/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/storybook-builder/src/generate-app-script.ts b/packages/storybook-builder/src/generate-app-script.ts index 196497381..643e44355 100644 --- a/packages/storybook-builder/src/generate-app-script.ts +++ b/packages/storybook-builder/src/generate-app-script.ts @@ -2,7 +2,7 @@ import { loadPreviewOrConfigFile } from '@storybook/core-common'; import type { Options, PreviewAnnotation } from '@storybook/types'; -import { virtualSetupAddonsFilename, virtualStoriesFilename } from './virtual-file-names'; +import { virtualSetupAddonsFilename, virtualStoriesFilename } from './virtual-file-names.js'; export async function generateAppScript(options: Options) { const { presets, configDir } = options; diff --git a/packages/storybook-builder/src/generate-iframe-html.ts b/packages/storybook-builder/src/generate-iframe-html.ts index 37dc3a46c..a9798f7ff 100644 --- a/packages/storybook-builder/src/generate-iframe-html.ts +++ b/packages/storybook-builder/src/generate-iframe-html.ts @@ -1,7 +1,7 @@ import { normalizeStories } from '@storybook/core-common'; import type { CoreConfig, Options } from '@storybook/types'; import { readFile } from 'fs-extra'; -import { virtualAppFilename } from './virtual-file-names'; +import { virtualAppFilename } from './virtual-file-names.js'; export type PreviewHtml = string | undefined; diff --git a/packages/storybook-builder/src/generate-stories-script.ts b/packages/storybook-builder/src/generate-stories-script.ts index 7fdfe40f6..1e7253f64 100644 --- a/packages/storybook-builder/src/generate-stories-script.ts +++ b/packages/storybook-builder/src/generate-stories-script.ts @@ -4,7 +4,7 @@ import { normalizePath } from '@rollup/pluginutils'; import { logger } from '@storybook/node-logger'; import type { Options } from '@storybook/types'; import * as path from 'path'; -import { listStories } from './list-stories'; +import { listStories } from './list-stories.js'; /** * This file is largely based on https://github.com/storybookjs/storybook/blob/d1195cbd0c61687f1720fefdb772e2f490a46584/lib/core-common/src/utils/to-importFn.ts diff --git a/packages/storybook-builder/src/index.ts b/packages/storybook-builder/src/index.ts index 16aa1b1d2..0d8ef688f 100644 --- a/packages/storybook-builder/src/index.ts +++ b/packages/storybook-builder/src/index.ts @@ -12,14 +12,14 @@ import * as fs from 'fs-extra'; import { join, parse, resolve } from 'path'; import { OutputOptions, RollupBuild, RollupOptions, rollup } from 'rollup'; import rollupPluginExternalGlobals from 'rollup-plugin-external-globals'; -import { generateIframeHtml } from './generate-iframe-html'; -import { getNodeModuleDir } from './get-node-module-dir'; -import { readFileConfig } from './read-file-config'; +import { generateIframeHtml } from './generate-iframe-html.js'; +import { getNodeModuleDir } from './get-node-module-dir.js'; +import { readFileConfig } from './read-file-config.js'; import { PREBUNDLED_MODULES_DIR, rollupPluginPrebundleModules, -} from './rollup-plugin-prebundle-modules'; -import { rollupPluginStorybookBuilder } from './rollup-plugin-storybook-builder'; +} from './rollup-plugin-prebundle-modules.js'; +import { rollupPluginStorybookBuilder } from './rollup-plugin-storybook-builder.js'; const wdsPluginExternalGlobals = fromRollup(rollupPluginExternalGlobals); const wdsPluginPrebundleModules = fromRollup(rollupPluginPrebundleModules); diff --git a/packages/storybook-builder/src/rollup-plugin-prebundle-modules.ts b/packages/storybook-builder/src/rollup-plugin-prebundle-modules.ts index ddf7d120c..e8b133e1d 100644 --- a/packages/storybook-builder/src/rollup-plugin-prebundle-modules.ts +++ b/packages/storybook-builder/src/rollup-plugin-prebundle-modules.ts @@ -2,7 +2,7 @@ import { stringifyProcessEnvs } from '@storybook/core-common'; import { build } from 'esbuild'; import { join } from 'path'; import type { Plugin } from 'rollup'; -import { getNodeModuleDir } from './get-node-module-dir'; +import { getNodeModuleDir } from './get-node-module-dir.js'; export const PREBUNDLED_MODULES_DIR = 'node_modules/.prebundled_modules'; diff --git a/packages/storybook-builder/src/rollup-plugin-storybook-builder.ts b/packages/storybook-builder/src/rollup-plugin-storybook-builder.ts index 49e700210..70185b9e8 100644 --- a/packages/storybook-builder/src/rollup-plugin-storybook-builder.ts +++ b/packages/storybook-builder/src/rollup-plugin-storybook-builder.ts @@ -1,15 +1,15 @@ import type { Options } from '@storybook/types'; import type { Plugin } from 'rollup'; -import { generateAppScript } from './generate-app-script'; -import { generateSetupAddonsScript } from './generate-setup-addons-script'; -import { generateStoriesScript } from './generate-stories-script'; -import { injectExportsOrder } from './inject-exports-order'; -import { listStories } from './list-stories'; +import { generateAppScript } from './generate-app-script.js'; +import { generateSetupAddonsScript } from './generate-setup-addons-script.js'; +import { generateStoriesScript } from './generate-stories-script.js'; +import { injectExportsOrder } from './inject-exports-order.js'; +import { listStories } from './list-stories.js'; import { virtualAppFilename, virtualSetupAddonsFilename, virtualStoriesFilename, -} from './virtual-file-names'; +} from './virtual-file-names.js'; export function rollupPluginStorybookBuilder(storybookOptions: Options): Plugin { let storyFilePaths: string[]; diff --git a/packages/storybook-framework-web-components/index.d.ts b/packages/storybook-framework-web-components/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/storybook-framework-web-components/index.d.ts +++ b/packages/storybook-framework-web-components/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/storybook-framework-web-components/package.json.d.ts b/packages/storybook-framework-web-components/package.json.d.ts index 21b3c2b22..f484fa161 100644 --- a/packages/storybook-framework-web-components/package.json.d.ts +++ b/packages/storybook-framework-web-components/package.json.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './package'; +export * from './package.js'; diff --git a/packages/storybook-framework-web-components/preset.d.ts b/packages/storybook-framework-web-components/preset.d.ts index 1184aac5e..0c87188b2 100644 --- a/packages/storybook-framework-web-components/preset.d.ts +++ b/packages/storybook-framework-web-components/preset.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/preset'; +export * from './dist/preset.js'; diff --git a/packages/storybook-framework-web-components/src/index.ts b/packages/storybook-framework-web-components/src/index.ts index fcb073fef..d4702960d 100644 --- a/packages/storybook-framework-web-components/src/index.ts +++ b/packages/storybook-framework-web-components/src/index.ts @@ -1 +1 @@ -export * from './types'; +export * from './types.js'; diff --git a/packages/storybook-framework-web-components/src/preset.ts b/packages/storybook-framework-web-components/src/preset.ts index dec62951e..c5b1c43ce 100644 --- a/packages/storybook-framework-web-components/src/preset.ts +++ b/packages/storybook-framework-web-components/src/preset.ts @@ -1,5 +1,5 @@ import type { PresetProperty } from '@storybook/types'; -import type { StorybookConfig } from './types'; +import type { StorybookConfig } from './types.js'; export const core: PresetProperty<'core', StorybookConfig> = { builder: '@web/storybook-builder', diff --git a/packages/storybook-utils/index.mjs b/packages/storybook-utils/index.mjs index 4df73b330..2b8395cdb 100644 --- a/packages/storybook-utils/index.mjs +++ b/packages/storybook-utils/index.mjs @@ -1 +1 @@ -export * from './src/index.js'; +export * from './dist/index.js'; diff --git a/packages/test-runner-browserstack/index.d.ts b/packages/test-runner-browserstack/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-browserstack/index.d.ts +++ b/packages/test-runner-browserstack/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-browserstack/src/browserstackLauncher.ts b/packages/test-runner-browserstack/src/browserstackLauncher.ts index d291e7e79..d760e969b 100644 --- a/packages/test-runner-browserstack/src/browserstackLauncher.ts +++ b/packages/test-runner-browserstack/src/browserstackLauncher.ts @@ -6,7 +6,7 @@ import { registerBrowserstackLocal, unregisterBrowserstackLocal, localId, -} from './browserstackManager'; +} from './browserstackManager.js'; export interface BrowserstackLauncherArgs { capabilities: Record; diff --git a/packages/test-runner-browserstack/src/index.ts b/packages/test-runner-browserstack/src/index.ts index 4f4e1a4d2..b0455aa2a 100644 --- a/packages/test-runner-browserstack/src/index.ts +++ b/packages/test-runner-browserstack/src/index.ts @@ -1 +1 @@ -export { browserstackLauncher } from './browserstackLauncher'; +export { browserstackLauncher } from './browserstackLauncher.js'; diff --git a/packages/test-runner-browserstack/test-remote/browserstackLauncher.test.ts b/packages/test-runner-browserstack/test-remote/browserstackLauncher.test.ts index f9c39baa8..7417149cc 100644 --- a/packages/test-runner-browserstack/test-remote/browserstackLauncher.test.ts +++ b/packages/test-runner-browserstack/test-remote/browserstackLauncher.test.ts @@ -1,5 +1,5 @@ -import { runIntegrationTests } from '../../../integration/test-runner'; -import { browserstackLauncher } from '../src/index'; +import { runIntegrationTests } from '../../../integration/test-runner/index.js'; +import { browserstackLauncher } from '../src/index.js'; if (!process.env.BROWSER_STACK_USERNAME) { throw new Error('Missing env var BROWSER_STACK_USERNAME'); diff --git a/packages/test-runner-chrome/index.d.ts b/packages/test-runner-chrome/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-chrome/index.d.ts +++ b/packages/test-runner-chrome/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-chrome/src/ChromeLauncher.ts b/packages/test-runner-chrome/src/ChromeLauncher.ts index 1f60cbe34..07fb66fb6 100644 --- a/packages/test-runner-chrome/src/ChromeLauncher.ts +++ b/packages/test-runner-chrome/src/ChromeLauncher.ts @@ -7,8 +7,8 @@ import { BrowserContext, } from 'puppeteer-core'; import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core'; -import { findExecutablePath } from './findExecutablePath'; -import { ChromeLauncherPage } from './ChromeLauncherPage'; +import { findExecutablePath } from './findExecutablePath.js'; +import { ChromeLauncherPage } from './ChromeLauncherPage.js'; function capitalize(str: string) { return `${str[0].toUpperCase()}${str.substring(1)}`; diff --git a/packages/test-runner-chrome/src/index.ts b/packages/test-runner-chrome/src/index.ts index d4a462b7a..7663ec5e2 100644 --- a/packages/test-runner-chrome/src/index.ts +++ b/packages/test-runner-chrome/src/index.ts @@ -1,5 +1,5 @@ import * as puppeteerCore from 'puppeteer-core'; -import { ChromeLauncher, CreateBrowserContextFn, CreatePageFn } from './ChromeLauncher'; +import { ChromeLauncher, CreateBrowserContextFn, CreatePageFn } from './ChromeLauncher.js'; import { PuppeteerNodeLaunchOptions, devices } from 'puppeteer-core'; export interface ChromeLauncherArgs { diff --git a/packages/test-runner-chrome/test/chromeLauncher.test.ts b/packages/test-runner-chrome/test/chromeLauncher.test.ts index a0e83dfe0..7e129d103 100644 --- a/packages/test-runner-chrome/test/chromeLauncher.test.ts +++ b/packages/test-runner-chrome/test/chromeLauncher.test.ts @@ -1,5 +1,5 @@ -import { runIntegrationTests } from '../../../integration/test-runner'; -import { chromeLauncher } from '../src/index'; +import { runIntegrationTests } from '../../../integration/test-runner/index.js'; +import { chromeLauncher } from '../src/index.js'; describe('test-runner-chrome', function testRunnerChrome() { this.timeout(20000); diff --git a/packages/test-runner-commands/browser/commands.d.ts b/packages/test-runner-commands/browser/commands.d.ts index 2281de658..cff5e26ff 100644 --- a/packages/test-runner-commands/browser/commands.d.ts +++ b/packages/test-runner-commands/browser/commands.d.ts @@ -10,7 +10,7 @@ import { SaveSnapshotPayload, SelectOptionPayload, SendMousePayload, -} from '../dist/index'; +} from '../dist/index.js'; /** * Executes a command on the server. If this is a custom command, you need to implement a plugin diff --git a/packages/test-runner-commands/index.d.ts b/packages/test-runner-commands/index.d.ts index 5198ffac4..af4b7d8b8 100644 --- a/packages/test-runner-commands/index.d.ts +++ b/packages/test-runner-commands/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './browser/commands'; +export * from './browser/commands.js'; diff --git a/packages/test-runner-commands/plugins.d.ts b/packages/test-runner-commands/plugins.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-commands/plugins.d.ts +++ b/packages/test-runner-commands/plugins.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-commands/src/index.ts b/packages/test-runner-commands/src/index.ts index 0f4b399ea..78e49c212 100644 --- a/packages/test-runner-commands/src/index.ts +++ b/packages/test-runner-commands/src/index.ts @@ -1,9 +1,9 @@ -export { Viewport, setViewportPlugin } from './setViewportPlugin'; -export { Media, emulateMediaPlugin } from './emulateMediaPlugin'; -export { selectOptionPlugin, SelectOptionPayload } from './selectOptionPlugin'; -export { setUserAgentPlugin } from './setUserAgentPlugin'; -export { sendKeysPlugin, SendKeysPayload } from './sendKeysPlugin'; -export { sendMousePlugin, SendMousePayload } from './sendMousePlugin'; -export { a11ySnapshotPlugin, A11ySnapshotPayload } from './a11ySnapshotPlugin'; -export { WriteFilePayload, ReadFilePayload, RemoveFilePayload, filePlugin } from './filePlugin'; -export { SaveSnapshotPayload, SnapshotPluginConfig, snapshotPlugin } from './snapshotPlugin'; +export { Viewport, setViewportPlugin } from './setViewportPlugin.js'; +export { Media, emulateMediaPlugin } from './emulateMediaPlugin.js'; +export { selectOptionPlugin, SelectOptionPayload } from './selectOptionPlugin.js'; +export { setUserAgentPlugin } from './setUserAgentPlugin.js'; +export { sendKeysPlugin, SendKeysPayload } from './sendKeysPlugin.js'; +export { sendMousePlugin, SendMousePayload } from './sendMousePlugin.js'; +export { a11ySnapshotPlugin, A11ySnapshotPayload } from './a11ySnapshotPlugin.js'; +export { WriteFilePayload, ReadFilePayload, RemoveFilePayload, filePlugin } from './filePlugin.js'; +export { SaveSnapshotPayload, SnapshotPluginConfig, snapshotPlugin } from './snapshotPlugin.js'; diff --git a/packages/test-runner-commands/test/a11y-snapshot/a11ySnapshotPlugin.test.ts b/packages/test-runner-commands/test/a11y-snapshot/a11ySnapshotPlugin.test.ts index eb80b5df3..bc57f4853 100644 --- a/packages/test-runner-commands/test/a11y-snapshot/a11ySnapshotPlugin.test.ts +++ b/packages/test-runner-commands/test/a11y-snapshot/a11ySnapshotPlugin.test.ts @@ -3,7 +3,7 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { a11ySnapshotPlugin } from '../../src/a11ySnapshotPlugin'; +import { a11ySnapshotPlugin } from '../../src/a11ySnapshotPlugin.js'; describe('a11ySnapshotPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/emulate-media/emulateMediaPlugin.test.ts b/packages/test-runner-commands/test/emulate-media/emulateMediaPlugin.test.ts index 1c746ea38..276b15065 100644 --- a/packages/test-runner-commands/test/emulate-media/emulateMediaPlugin.test.ts +++ b/packages/test-runner-commands/test/emulate-media/emulateMediaPlugin.test.ts @@ -3,7 +3,7 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { emulateMediaPlugin } from '../../src/emulateMediaPlugin'; +import { emulateMediaPlugin } from '../../src/emulateMediaPlugin.js'; describe('emulateMediaPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/file/filePlugin.test.ts b/packages/test-runner-commands/test/file/filePlugin.test.ts index d8b5cd842..b53fc9007 100644 --- a/packages/test-runner-commands/test/file/filePlugin.test.ts +++ b/packages/test-runner-commands/test/file/filePlugin.test.ts @@ -2,7 +2,7 @@ import path from 'path'; import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; -import { filePlugin } from '../../src/filePlugin'; +import { filePlugin } from '../../src/filePlugin.js'; describe('filePlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/select-option/selectOptionPlugin.test.ts b/packages/test-runner-commands/test/select-option/selectOptionPlugin.test.ts index f8931c5a0..dc22342bd 100644 --- a/packages/test-runner-commands/test/select-option/selectOptionPlugin.test.ts +++ b/packages/test-runner-commands/test/select-option/selectOptionPlugin.test.ts @@ -3,7 +3,7 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { selectOptionPlugin } from '../../src/selectOptionPlugin'; +import { selectOptionPlugin } from '../../src/selectOptionPlugin.js'; describe('selectOptionPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/send-keys/sendKeysPlugin.test.ts b/packages/test-runner-commands/test/send-keys/sendKeysPlugin.test.ts index f47a2bdbb..3d823f37b 100644 --- a/packages/test-runner-commands/test/send-keys/sendKeysPlugin.test.ts +++ b/packages/test-runner-commands/test/send-keys/sendKeysPlugin.test.ts @@ -3,7 +3,7 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { sendKeysPlugin } from '../../src/sendKeysPlugin'; +import { sendKeysPlugin } from '../../src/sendKeysPlugin.js'; describe('sendKeysPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/send-mouse/sendMousePlugin.test.ts b/packages/test-runner-commands/test/send-mouse/sendMousePlugin.test.ts index 35da46bea..2d315b1b1 100644 --- a/packages/test-runner-commands/test/send-mouse/sendMousePlugin.test.ts +++ b/packages/test-runner-commands/test/send-mouse/sendMousePlugin.test.ts @@ -4,8 +4,8 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { webdriverLauncher } from '@web/test-runner-webdriver'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { sendMousePlugin } from '../../src/sendMousePlugin'; -import { startSeleniumServer } from '../selenium-server'; +import { sendMousePlugin } from '../../src/sendMousePlugin.js'; +import { startSeleniumServer } from '../selenium-server.js'; describe('sendMousePlugin', function test() { this.timeout(50000); diff --git a/packages/test-runner-commands/test/set-user-agent/setUserAgentPlugin.test.ts b/packages/test-runner-commands/test/set-user-agent/setUserAgentPlugin.test.ts index 63c829d69..47af2f2c9 100644 --- a/packages/test-runner-commands/test/set-user-agent/setUserAgentPlugin.test.ts +++ b/packages/test-runner-commands/test/set-user-agent/setUserAgentPlugin.test.ts @@ -2,7 +2,7 @@ import path from 'path'; import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; -import { setUserAgentPlugin } from '../../src/setUserAgentPlugin'; +import { setUserAgentPlugin } from '../../src/setUserAgentPlugin.js'; describe('setUserAgentPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/set-viewport/setViewportPlugin.test.ts b/packages/test-runner-commands/test/set-viewport/setViewportPlugin.test.ts index 8f131f84c..565efe6ff 100644 --- a/packages/test-runner-commands/test/set-viewport/setViewportPlugin.test.ts +++ b/packages/test-runner-commands/test/set-viewport/setViewportPlugin.test.ts @@ -4,7 +4,7 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { chromeLauncher } from '@web/test-runner-chrome'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { setViewportPlugin } from '../../src/setViewportPlugin'; +import { setViewportPlugin } from '../../src/setViewportPlugin.js'; describe('setViewportPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-commands/test/snapshot/snapshotPlugin.test.ts b/packages/test-runner-commands/test/snapshot/snapshotPlugin.test.ts index 45454d66c..4d52f8ca3 100644 --- a/packages/test-runner-commands/test/snapshot/snapshotPlugin.test.ts +++ b/packages/test-runner-commands/test/snapshot/snapshotPlugin.test.ts @@ -2,7 +2,7 @@ import path from 'path'; import { runTests } from '@web/test-runner-core/test-helpers'; import { playwrightLauncher } from '@web/test-runner-playwright'; -import { snapshotPlugin } from '../../src/snapshotPlugin'; +import { snapshotPlugin } from '../../src/snapshotPlugin.js'; describe('snapshotPlugin', function test() { this.timeout(20000); diff --git a/packages/test-runner-core/browser/session.d.ts b/packages/test-runner-core/browser/session.d.ts index d9afd5c33..652092a4a 100644 --- a/packages/test-runner-core/browser/session.d.ts +++ b/packages/test-runner-core/browser/session.d.ts @@ -1,4 +1,4 @@ -import { TestSession, TestResultError, TestSuiteResult, TestResult } from '../dist/index'; +import { TestSession, TestResultError, TestSuiteResult, TestResult } from '../dist/index.js'; export interface RuntimeConfig { testFile: string; diff --git a/packages/test-runner-core/index.d.ts b/packages/test-runner-core/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-core/index.d.ts +++ b/packages/test-runner-core/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-core/src/cli/TestRunnerCli.ts b/packages/test-runner-core/src/cli/TestRunnerCli.ts index 633bcfe45..fa82d16cd 100644 --- a/packages/test-runner-core/src/cli/TestRunnerCli.ts +++ b/packages/test-runner-core/src/cli/TestRunnerCli.ts @@ -3,19 +3,19 @@ import path from 'path'; import { bold, cyan, red } from 'nanocolors'; import openBrowser from 'open'; -import { writeCoverageReport } from './writeCoverageReport'; -import { getSelectFilesMenu } from './getSelectFilesMenu'; -import { getWatchCommands } from './getWatchCommands'; -import { DynamicTerminal } from './terminal/DynamicTerminal'; -import { BufferedLogger } from './BufferedLogger'; -import { getManualDebugMenu } from './getManualDebugMenu'; -import { ErrorWithLocation } from '../logger/Logger'; -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { TestSessionManager } from '../test-session/TestSessionManager'; -import { SESSION_STATUS } from '../test-session/TestSessionStatus'; -import { Logger } from '../logger/Logger'; -import { TestRunner } from '../runner/TestRunner'; -import { TestCoverage } from '../coverage/getTestCoverage'; +import { writeCoverageReport } from './writeCoverageReport.js'; +import { getSelectFilesMenu } from './getSelectFilesMenu.js'; +import { getWatchCommands } from './getWatchCommands.js'; +import { DynamicTerminal } from './terminal/DynamicTerminal.js'; +import { BufferedLogger } from './BufferedLogger.js'; +import { getManualDebugMenu } from './getManualDebugMenu.js'; +import { ErrorWithLocation } from '../logger/Logger.js'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { TestSessionManager } from '../test-session/TestSessionManager.js'; +import { SESSION_STATUS } from '../test-session/TestSessionStatus.js'; +import { Logger } from '../logger/Logger.js'; +import { TestRunner } from '../runner/TestRunner.js'; +import { TestCoverage } from '../coverage/getTestCoverage.js'; export type MenuType = 'none' | 'overview' | 'focus' | 'debug' | 'manual-debug'; diff --git a/packages/test-runner-core/src/cli/terminal/DynamicTerminal.ts b/packages/test-runner-core/src/cli/terminal/DynamicTerminal.ts index 8d79bc4f9..720bf69e3 100644 --- a/packages/test-runner-core/src/cli/terminal/DynamicTerminal.ts +++ b/packages/test-runner-core/src/cli/terminal/DynamicTerminal.ts @@ -1,8 +1,8 @@ import logUpdate from 'log-update'; import cliCursor from 'cli-cursor'; -import { BufferedConsole } from './BufferedConsole'; -import { EventEmitter } from '../../utils/EventEmitter'; +import { BufferedConsole } from './BufferedConsole.js'; +import { EventEmitter } from '../../utils/EventEmitter.js'; const CLEAR_COMMAND = process.platform === 'win32' ? '\x1B[2J\x1B[0f' : '\x1B[2J\x1B[3J\x1B[H'; diff --git a/packages/test-runner-core/src/config/TestRunnerGroupConfig.ts b/packages/test-runner-core/src/config/TestRunnerGroupConfig.ts index c0751edea..f768e3b80 100644 --- a/packages/test-runner-core/src/config/TestRunnerGroupConfig.ts +++ b/packages/test-runner-core/src/config/TestRunnerGroupConfig.ts @@ -1,5 +1,5 @@ import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; -import { TestRunnerCoreConfig } from './TestRunnerCoreConfig'; +import { TestRunnerCoreConfig } from './TestRunnerCoreConfig.js'; export interface TestRunnerGroupConfig { name: string; diff --git a/packages/test-runner-core/src/index.ts b/packages/test-runner-core/src/index.ts index e155ab49f..c410f73b7 100644 --- a/packages/test-runner-core/src/index.ts +++ b/packages/test-runner-core/src/index.ts @@ -1,8 +1,8 @@ export { CoverageMapData } from 'istanbul-lib-coverage'; -import * as constants from './utils/constants'; +import * as constants from './utils/constants.js'; export { constants }; -export { BrowserLauncher, SessionResult } from './browser-launcher/BrowserLauncher'; +export { BrowserLauncher, SessionResult } from './browser-launcher/BrowserLauncher.js'; export { Reporter, ReportTestResultsArgs, @@ -11,30 +11,30 @@ export { TestRunArgs, TestRunStartedArgs, TestRunFinishedArgs, -} from './reporter/Reporter'; -export { TestRunner } from './runner/TestRunner'; -export { TestRunnerCli } from './cli/TestRunnerCli'; -export { BufferedLogger } from './cli/BufferedLogger'; -export { TestRunnerPlugin } from './server/TestRunnerPlugin'; -export { TestFramework } from './test-framework/TestFramework'; +} from './reporter/Reporter.js'; +export { TestRunner } from './runner/TestRunner.js'; +export { TestRunnerCli } from './cli/TestRunnerCli.js'; +export { BufferedLogger } from './cli/BufferedLogger.js'; +export { TestRunnerPlugin } from './server/TestRunnerPlugin.js'; +export { TestFramework } from './test-framework/TestFramework.js'; export { TestRunnerCoreConfig, CoverageConfig, CoverageThresholdConfig, -} from './config/TestRunnerCoreConfig'; -export { TestRunnerGroupConfig } from './config/TestRunnerGroupConfig'; -export { TestCoverage } from './coverage/getTestCoverage'; -export { Logger, ErrorWithLocation } from './logger/Logger'; +} from './config/TestRunnerCoreConfig.js'; +export { TestRunnerGroupConfig } from './config/TestRunnerGroupConfig.js'; +export { TestCoverage } from './coverage/getTestCoverage.js'; +export { Logger, ErrorWithLocation } from './logger/Logger.js'; export { TestSession, TestResultError, TestResult, TestSuiteResult, -} from './test-session/TestSession'; -export { DebugTestSession } from './test-session/DebugTestSession'; -export { BasicTestSession } from './test-session/BasicTestSession'; -export { TestSessionManager } from './test-session/TestSessionManager'; -export { TestSessionStatus, SESSION_STATUS } from './test-session/TestSessionStatus'; -export { EventEmitter } from './utils/EventEmitter'; -export { isTestFilePath } from './utils/isTestFilePath'; -export { fetchSourceMap } from './utils/fetchSourceMap'; +} from './test-session/TestSession.js'; +export { DebugTestSession } from './test-session/DebugTestSession.js'; +export { BasicTestSession } from './test-session/BasicTestSession.js'; +export { TestSessionManager } from './test-session/TestSessionManager.js'; +export { TestSessionStatus, SESSION_STATUS } from './test-session/TestSessionStatus.js'; +export { EventEmitter } from './utils/EventEmitter.js'; +export { isTestFilePath } from './utils/isTestFilePath.js'; +export { fetchSourceMap } from './utils/fetchSourceMap.js'; diff --git a/packages/test-runner-core/src/runner/TestRunner.ts b/packages/test-runner-core/src/runner/TestRunner.ts index 14db479d6..f2b486244 100644 --- a/packages/test-runner-core/src/runner/TestRunner.ts +++ b/packages/test-runner-core/src/runner/TestRunner.ts @@ -1,16 +1,16 @@ -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { createTestSessions } from './createSessionGroups'; -import { TestSession } from '../test-session/TestSession'; -import { getTestCoverage, TestCoverage } from '../coverage/getTestCoverage'; -import { TestScheduler } from './TestScheduler'; -import { TestSessionManager } from '../test-session/TestSessionManager'; -import { SESSION_STATUS } from '../test-session/TestSessionStatus'; -import { EventEmitter } from '../utils/EventEmitter'; -import { createSessionUrl } from './createSessionUrl'; -import { createDebugSessions } from './createDebugSessions'; -import { TestRunnerServer } from '../server/TestRunnerServer'; -import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; -import { TestRunnerGroupConfig } from '../config/TestRunnerGroupConfig'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { createTestSessions } from './createSessionGroups.js'; +import { TestSession } from '../test-session/TestSession.js'; +import { getTestCoverage, TestCoverage } from '../coverage/getTestCoverage.js'; +import { TestScheduler } from './TestScheduler.js'; +import { TestSessionManager } from '../test-session/TestSessionManager.js'; +import { SESSION_STATUS } from '../test-session/TestSessionStatus.js'; +import { EventEmitter } from '../utils/EventEmitter.js'; +import { createSessionUrl } from './createSessionUrl.js'; +import { createDebugSessions } from './createDebugSessions.js'; +import { TestRunnerServer } from '../server/TestRunnerServer.js'; +import { BrowserLauncher } from '../browser-launcher/BrowserLauncher.js'; +import { TestRunnerGroupConfig } from '../config/TestRunnerGroupConfig.js'; interface EventMap { 'test-run-started': { testRun: number }; diff --git a/packages/test-runner-core/src/runner/TestScheduler.ts b/packages/test-runner-core/src/runner/TestScheduler.ts index 845e5d3fa..1df658cc2 100644 --- a/packages/test-runner-core/src/runner/TestScheduler.ts +++ b/packages/test-runner-core/src/runner/TestScheduler.ts @@ -1,11 +1,11 @@ -import { createSessionUrl } from './createSessionUrl'; -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { TestSessionManager } from '../test-session/TestSessionManager'; -import { TestSession, TestResultError } from '../test-session/TestSession'; -import { SESSION_STATUS } from '../test-session/TestSessionStatus'; -import { withTimeout } from '../utils/async'; -import { TestSessionTimeoutHandler } from './TestSessionTimeoutHandler'; -import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; +import { createSessionUrl } from './createSessionUrl.js'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { TestSessionManager } from '../test-session/TestSessionManager.js'; +import { TestSession, TestResultError } from '../test-session/TestSession.js'; +import { SESSION_STATUS } from '../test-session/TestSessionStatus.js'; +import { withTimeout } from '../utils/async.js'; +import { TestSessionTimeoutHandler } from './TestSessionTimeoutHandler.js'; +import { BrowserLauncher } from '../browser-launcher/BrowserLauncher.js'; export class TestScheduler { private config: TestRunnerCoreConfig; diff --git a/packages/test-runner-core/src/runner/TestSessionTimeoutHandler.ts b/packages/test-runner-core/src/runner/TestSessionTimeoutHandler.ts index d1f0a1b4e..4a8db3a0a 100644 --- a/packages/test-runner-core/src/runner/TestSessionTimeoutHandler.ts +++ b/packages/test-runner-core/src/runner/TestSessionTimeoutHandler.ts @@ -1,8 +1,8 @@ -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { TestSessionManager } from '../test-session/TestSessionManager'; -import { TestSession, TestResultError } from '../test-session/TestSession'; -import { SESSION_STATUS } from '../test-session/TestSessionStatus'; -import { TestScheduler } from './TestScheduler'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { TestSessionManager } from '../test-session/TestSessionManager.js'; +import { TestSession, TestResultError } from '../test-session/TestSession.js'; +import { SESSION_STATUS } from '../test-session/TestSessionStatus.js'; +import { TestScheduler } from './TestScheduler.js'; export class TestSessionTimeoutHandler { private timeoutIdsPerSession = new Map(); diff --git a/packages/test-runner-core/src/runner/createSessionGroups.ts b/packages/test-runner-core/src/runner/createSessionGroups.ts index 72de05fde..40d8e134f 100644 --- a/packages/test-runner-core/src/runner/createSessionGroups.ts +++ b/packages/test-runner-core/src/runner/createSessionGroups.ts @@ -1,13 +1,13 @@ import { nanoid } from 'nanoid'; import path from 'path'; -import { SESSION_STATUS } from '../test-session/TestSessionStatus'; -import { TestSession } from '../test-session/TestSession'; -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { TestRunnerGroupConfig } from '../config/TestRunnerGroupConfig'; -import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; -import { collectTestFiles } from './collectTestFiles'; -import { TestSessionGroup } from '../test-session/TestSessionGroup'; +import { SESSION_STATUS } from '../test-session/TestSessionStatus.js'; +import { TestSession } from '../test-session/TestSession.js'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { TestRunnerGroupConfig } from '../config/TestRunnerGroupConfig.js'; +import { BrowserLauncher } from '../browser-launcher/BrowserLauncher.js'; +import { collectTestFiles } from './collectTestFiles.js'; +import { TestSessionGroup } from '../test-session/TestSessionGroup.js'; interface GroupConfigWithoutOptionals extends TestRunnerGroupConfig { name: string; diff --git a/packages/test-runner-core/src/runner/createSessionUrl.ts b/packages/test-runner-core/src/runner/createSessionUrl.ts index 56457d433..b6393fb1b 100644 --- a/packages/test-runner-core/src/runner/createSessionUrl.ts +++ b/packages/test-runner-core/src/runner/createSessionUrl.ts @@ -1,7 +1,7 @@ import path from 'path'; -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { PARAM_SESSION_ID } from '../utils/constants'; -import { BasicTestSession } from '../test-session/BasicTestSession'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { PARAM_SESSION_ID } from '../utils/constants.js'; +import { BasicTestSession } from '../test-session/BasicTestSession.js'; const toBrowserPathRegExp = new RegExp(path.sep === '\\' ? '\\\\' : path.sep, 'g'); diff --git a/packages/test-runner-core/src/server/TestRunnerServer.ts b/packages/test-runner-core/src/server/TestRunnerServer.ts index 3a52b54a0..3268a574f 100644 --- a/packages/test-runner-core/src/server/TestRunnerServer.ts +++ b/packages/test-runner-core/src/server/TestRunnerServer.ts @@ -1,11 +1,11 @@ import { DevServer, Plugin } from '@web/dev-server-core'; import chokidar from 'chokidar'; -import { RunSessions, watchFilesMiddleware } from './middleware/watchFilesMiddleware'; -import { cacheMiddleware } from './middleware/cacheMiddleware'; -import { serveTestRunnerHtmlPlugin } from './plugins/serveTestRunnerHtmlPlugin'; -import { serveTestFrameworkPlugin } from './plugins/serveTestFrameworkPlugin'; -import { testRunnerApiPlugin } from './plugins/api/testRunnerApiPlugin'; +import { RunSessions, watchFilesMiddleware } from './middleware/watchFilesMiddleware.js'; +import { cacheMiddleware } from './middleware/cacheMiddleware.js'; +import { serveTestRunnerHtmlPlugin } from './plugins/serveTestRunnerHtmlPlugin.js'; +import { serveTestFrameworkPlugin } from './plugins/serveTestFrameworkPlugin.js'; +import { testRunnerApiPlugin } from './plugins/api/testRunnerApiPlugin.js'; import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; import { TestSessionManager } from '../test-session/TestSessionManager'; import { TestRunner } from '../runner/TestRunner'; diff --git a/packages/test-runner-core/src/server/middleware/watchFilesMiddleware.ts b/packages/test-runner-core/src/server/middleware/watchFilesMiddleware.ts index 5406b97b8..3975b0151 100644 --- a/packages/test-runner-core/src/server/middleware/watchFilesMiddleware.ts +++ b/packages/test-runner-core/src/server/middleware/watchFilesMiddleware.ts @@ -4,9 +4,9 @@ import debounce from 'debounce'; import path from 'path'; import { FSWatcher } from 'chokidar'; -import { TestSessionManager } from '../../test-session/TestSessionManager'; -import { constants } from '../..'; -import { TestSession } from '../../test-session/TestSession'; +import { TestSessionManager } from '../../test-session/TestSessionManager.js'; +import { constants } from '../../index.js'; +import { TestSession } from '../../test-session/TestSession.js'; const IGNORED_404s = ['favicon.ico']; const { PARAM_SESSION_ID } = constants; diff --git a/packages/test-runner-core/src/server/plugins/api/createSourceMapFunction.ts b/packages/test-runner-core/src/server/plugins/api/createSourceMapFunction.ts index 8bd3e54b8..0b029ef99 100644 --- a/packages/test-runner-core/src/server/plugins/api/createSourceMapFunction.ts +++ b/packages/test-runner-core/src/server/plugins/api/createSourceMapFunction.ts @@ -2,7 +2,7 @@ import path from 'path'; import { SourceMapConverter } from 'convert-source-map'; import { SourceMapConsumer } from 'source-map'; -import { fetchSourceMap } from '../../../utils/fetchSourceMap'; +import { fetchSourceMap } from '../../../utils/fetchSourceMap.js'; import { StackLocation } from '@web/browser-logs'; export type SourceMapFunction = ( diff --git a/packages/test-runner-core/src/server/plugins/api/parseBrowserErrors.ts b/packages/test-runner-core/src/server/plugins/api/parseBrowserErrors.ts index ba3980d8a..37cad5a20 100644 --- a/packages/test-runner-core/src/server/plugins/api/parseBrowserErrors.ts +++ b/packages/test-runner-core/src/server/plugins/api/parseBrowserErrors.ts @@ -1,14 +1,14 @@ import { MapStackLocation, parseStackTrace } from '@web/browser-logs'; -import { MapBrowserUrl } from '@web/browser-logs/src/parseStackTrace'; +import { MapBrowserUrl } from '@web/browser-logs'; -import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig'; +import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig.js'; import { TestResult, TestResultError, TestSession, TestSuiteResult, -} from '../../../test-session/TestSession'; -import { forEachAsync } from '../../../utils/async'; +} from '../../../test-session/TestSession.js'; +import { forEachAsync } from '../../../utils/async.js'; export async function replaceErrorStack( error: TestResultError, diff --git a/packages/test-runner-core/src/server/plugins/api/parseBrowserLogs.ts b/packages/test-runner-core/src/server/plugins/api/parseBrowserLogs.ts index eb1c876fa..ffdf52458 100644 --- a/packages/test-runner-core/src/server/plugins/api/parseBrowserLogs.ts +++ b/packages/test-runner-core/src/server/plugins/api/parseBrowserLogs.ts @@ -1,9 +1,9 @@ import { deserialize, MapStackLocation } from '@web/browser-logs'; -import { MapBrowserUrl } from '@web/browser-logs/src/parseStackTrace'; +import { MapBrowserUrl } from '@web/browser-logs'; -import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig'; -import { TestSession } from '../../../test-session/TestSession'; -import { mapAsync } from '../../../utils/async'; +import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig.js'; +import { TestSession } from '../../../test-session/TestSession.js'; +import { mapAsync } from '../../../utils/async.js'; interface BrowserLog { type: string; diff --git a/packages/test-runner-core/src/server/plugins/api/parseBrowserResult.ts b/packages/test-runner-core/src/server/plugins/api/parseBrowserResult.ts index 389f52b45..05755ef3c 100644 --- a/packages/test-runner-core/src/server/plugins/api/parseBrowserResult.ts +++ b/packages/test-runner-core/src/server/plugins/api/parseBrowserResult.ts @@ -1,11 +1,10 @@ -import { MapStackLocation, StackLocation } from '@web/browser-logs'; -import { MapBrowserUrl } from '@web/browser-logs/src/parseStackTrace'; +import { MapStackLocation, StackLocation, MapBrowserUrl } from '@web/browser-logs'; import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig'; import { TestSession } from '../../../test-session/TestSession'; -import { SourceMapFunction } from './createSourceMapFunction'; -import { parseSessionErrors, parseTestResults } from './parseBrowserErrors'; -import { parseBrowserLogs } from './parseBrowserLogs'; +import { SourceMapFunction } from './createSourceMapFunction.js'; +import { parseSessionErrors, parseTestResults } from './parseBrowserErrors.js'; +import { parseBrowserLogs } from './parseBrowserLogs.js'; function createMapStackLocation(smFn: SourceMapFunction, userAgent: string): MapStackLocation { return async function mapStackLocation(originalLoc: StackLocation) { diff --git a/packages/test-runner-core/src/server/plugins/api/testRunnerApiPlugin.ts b/packages/test-runner-core/src/server/plugins/api/testRunnerApiPlugin.ts index 3a87c322b..01a572099 100644 --- a/packages/test-runner-core/src/server/plugins/api/testRunnerApiPlugin.ts +++ b/packages/test-runner-core/src/server/plugins/api/testRunnerApiPlugin.ts @@ -1,17 +1,17 @@ import { Context, getRequestFilePath, ServerStartParams, WebSocket } from '@web/dev-server-core'; -import { MapBrowserUrl } from '@web/browser-logs/src/parseStackTrace'; +import { MapBrowserUrl } from '@web/browser-logs'; import parse from 'co-body'; -import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig'; -import { TestSessionManager } from '../../../test-session/TestSessionManager'; -import { PARAM_SESSION_ID } from '../../../utils/constants'; -import { TestRunnerPlugin } from '../../TestRunnerPlugin'; -import { SESSION_STATUS } from '../../../test-session/TestSessionStatus'; -import { TestSession } from '../../../test-session/TestSession'; -import { parseBrowserResult } from './parseBrowserResult'; -import { TestRunner } from '../../../runner/TestRunner'; -import { createSourceMapFunction, SourceMapFunction } from './createSourceMapFunction'; -import { DebugTestSession } from '../../../test-session/DebugTestSession'; +import { TestRunnerCoreConfig } from '../../../config/TestRunnerCoreConfig.js'; +import { TestSessionManager } from '../../../test-session/TestSessionManager.js'; +import { PARAM_SESSION_ID } from '../../../utils/constants.js'; +import { TestRunnerPlugin } from '../../TestRunnerPlugin.js'; +import { SESSION_STATUS } from '../../../test-session/TestSessionStatus.js'; +import { TestSession } from '../../../test-session/TestSession.js'; +import { parseBrowserResult } from './parseBrowserResult.js'; +import { TestRunner } from '../../../runner/TestRunner.js'; +import { createSourceMapFunction, SourceMapFunction } from './createSourceMapFunction.js'; +import { DebugTestSession } from '../../../test-session/DebugTestSession.js'; interface SessionMessage extends Record { sessionId: string; diff --git a/packages/test-runner-core/src/server/plugins/serveTestRunnerHtmlPlugin.ts b/packages/test-runner-core/src/server/plugins/serveTestRunnerHtmlPlugin.ts index 5c3518a75..8305ffaae 100644 --- a/packages/test-runner-core/src/server/plugins/serveTestRunnerHtmlPlugin.ts +++ b/packages/test-runner-core/src/server/plugins/serveTestRunnerHtmlPlugin.ts @@ -1,11 +1,11 @@ import { Context, getRequestFilePath } from '@web/dev-server-core'; -import { PARAM_SESSION_ID, PARAM_TEST_FILE } from '../../utils/constants'; -import { TestRunnerCoreConfig } from '../../config/TestRunnerCoreConfig'; -import { createTestFileImportPath } from '../utils'; -import { trackBrowserLogs } from './trackBrowserLogs'; -import { TestSessionManager } from '../../test-session/TestSessionManager'; -import { TestRunnerGroupConfig } from '../../config/TestRunnerGroupConfig'; +import { PARAM_SESSION_ID, PARAM_TEST_FILE } from '../../utils/constants.js'; +import { TestRunnerCoreConfig } from '../../config/TestRunnerCoreConfig.js'; +import { createTestFileImportPath } from '../utils.js'; +import { trackBrowserLogs } from './trackBrowserLogs.js'; +import { TestSessionManager } from '../../test-session/TestSessionManager.js'; +import { TestRunnerGroupConfig } from '../../config/TestRunnerGroupConfig.js'; const iframeModePage = ` diff --git a/packages/test-runner-core/src/server/utils.ts b/packages/test-runner-core/src/server/utils.ts index 5b9d9dc60..5fd567686 100644 --- a/packages/test-runner-core/src/server/utils.ts +++ b/packages/test-runner-core/src/server/utils.ts @@ -1,7 +1,7 @@ import path from 'path'; import { Context } from '@web/dev-server-core'; -import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig'; -import { PARAM_SESSION_ID, PARAM_MANUAL_SESSION } from '../utils/constants'; +import { TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.js'; +import { PARAM_SESSION_ID, PARAM_MANUAL_SESSION } from '../utils/constants.js'; const toBrowserPathRegExp = new RegExp(path.sep === '\\' ? '\\\\' : path.sep, 'g'); const toFilePathRegeExp = new RegExp('/', 'g'); diff --git a/packages/test-runner-core/src/test-helpers.ts b/packages/test-runner-core/src/test-helpers.ts index 3377c3e56..fa87e633b 100644 --- a/packages/test-runner-core/src/test-helpers.ts +++ b/packages/test-runner-core/src/test-helpers.ts @@ -1,11 +1,11 @@ /* eslint-disable no-async-promise-executor, no-inner-declarations */ import { getPortPromise } from 'portfinder'; import path from 'path'; -import { TestRunner, TestRunnerCoreConfig } from './index'; -import { Logger } from './logger/Logger'; -import { TestResult, TestSession, TestSuiteResult } from './test-session/TestSession'; -import { SESSION_STATUS } from './test-session/TestSessionStatus'; -import { TestRunnerGroupConfig } from './config/TestRunnerGroupConfig'; +import { TestRunner, TestRunnerCoreConfig } from './index.js'; +import { Logger } from './logger/Logger.js'; +import { TestResult, TestSession, TestSuiteResult } from './test-session/TestSession.js'; +import { SESSION_STATUS } from './test-session/TestSessionStatus.js'; +import { TestRunnerGroupConfig } from './config/TestRunnerGroupConfig.js'; const logger: Logger = { ...console, diff --git a/packages/test-runner-core/src/test-session/BasicTestSession.ts b/packages/test-runner-core/src/test-session/BasicTestSession.ts index 00eaaed8d..690d5f493 100644 --- a/packages/test-runner-core/src/test-session/BasicTestSession.ts +++ b/packages/test-runner-core/src/test-session/BasicTestSession.ts @@ -1,5 +1,5 @@ import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; -import { TestSessionGroup } from './TestSessionGroup'; +import { TestSessionGroup } from './TestSessionGroup.js'; export interface BasicTestSession { id: string; diff --git a/packages/test-runner-core/src/test-session/DebugTestSession.ts b/packages/test-runner-core/src/test-session/DebugTestSession.ts index 040aa88c6..480284fa9 100644 --- a/packages/test-runner-core/src/test-session/DebugTestSession.ts +++ b/packages/test-runner-core/src/test-session/DebugTestSession.ts @@ -1,4 +1,4 @@ -import { BasicTestSession } from './BasicTestSession'; +import { BasicTestSession } from './BasicTestSession.js'; export interface DebugTestSession extends BasicTestSession { debug: true; diff --git a/packages/test-runner-core/src/test-session/TestSession.ts b/packages/test-runner-core/src/test-session/TestSession.ts index 4d0758068..4f45b041b 100644 --- a/packages/test-runner-core/src/test-session/TestSession.ts +++ b/packages/test-runner-core/src/test-session/TestSession.ts @@ -1,6 +1,6 @@ import { CoverageMapData } from 'istanbul-lib-coverage'; -import { TestSessionStatus } from './TestSessionStatus'; -import { BasicTestSession } from './BasicTestSession'; +import { TestSessionStatus } from './TestSessionStatus.js'; +import { BasicTestSession } from './BasicTestSession.js'; export interface TestResultError { message: string; diff --git a/packages/test-runner-core/src/test-session/TestSessionManager.ts b/packages/test-runner-core/src/test-session/TestSessionManager.ts index f4c5ac4c8..b8edf7344 100644 --- a/packages/test-runner-core/src/test-session/TestSessionManager.ts +++ b/packages/test-runner-core/src/test-session/TestSessionManager.ts @@ -1,9 +1,9 @@ -import { TestSession } from './TestSession'; -import { TestSessionStatus } from './TestSessionStatus'; -import { EventEmitter } from '../utils/EventEmitter'; -import { DebugTestSession } from './DebugTestSession'; -import { TestSessionGroup } from './TestSessionGroup'; -import { BrowserLauncher } from '../browser-launcher/BrowserLauncher'; +import { TestSession } from './TestSession.js'; +import { TestSessionStatus } from './TestSessionStatus.js'; +import { EventEmitter } from '../utils/EventEmitter.js'; +import { DebugTestSession } from './DebugTestSession.js'; +import { TestSessionGroup } from './TestSessionGroup.js'; +import { BrowserLauncher } from '../browser-launcher/BrowserLauncher.js'; interface EventMap { 'session-status-updated': TestSession; diff --git a/packages/test-runner-core/src/utils/fetchSourceMap.ts b/packages/test-runner-core/src/utils/fetchSourceMap.ts index 50a8d0567..b9fc58623 100644 --- a/packages/test-runner-core/src/utils/fetchSourceMap.ts +++ b/packages/test-runner-core/src/utils/fetchSourceMap.ts @@ -2,7 +2,7 @@ import { mapFileCommentRegex, fromSource, SourceMapConverter, fromJSON } from 'c import path from 'path'; import { RequestOptions } from 'http'; -import { request } from './request'; +import { request } from './request.js'; function is2xxResponse(status?: number) { return typeof status === 'number' && status >= 200 && status < 300; diff --git a/packages/test-runner-core/src/utils/isTestFilePath.ts b/packages/test-runner-core/src/utils/isTestFilePath.ts index f92e6777a..aa8faefa3 100644 --- a/packages/test-runner-core/src/utils/isTestFilePath.ts +++ b/packages/test-runner-core/src/utils/isTestFilePath.ts @@ -1,4 +1,4 @@ -import { PARAM_MANUAL_SESSION, PARAM_SESSION_ID } from './constants'; +import { PARAM_MANUAL_SESSION, PARAM_SESSION_ID } from './constants.js'; /** * Returns where a given path points to a test file. This should be diff --git a/packages/test-runner-core/test-helpers.d.ts b/packages/test-runner-core/test-helpers.d.ts index e2073520d..a828b5289 100644 --- a/packages/test-runner-core/test-helpers.d.ts +++ b/packages/test-runner-core/test-helpers.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/test-helpers'; +export * from './dist/test-helpers.js'; diff --git a/packages/test-runner-core/test-helpers.ts b/packages/test-runner-core/test-helpers.ts index e197c490f..14796a1a2 100644 --- a/packages/test-runner-core/test-helpers.ts +++ b/packages/test-runner-core/test-helpers.ts @@ -1 +1 @@ -export { runTests } from './dist/test-helpers'; +export { runTests } from './dist/test-helpers.js'; diff --git a/packages/test-runner-core/test/src/runner/TestRunner.test.ts b/packages/test-runner-core/test/src/runner/TestRunner.test.ts index b057a98b7..6523c8f3d 100644 --- a/packages/test-runner-core/test/src/runner/TestRunner.test.ts +++ b/packages/test-runner-core/test/src/runner/TestRunner.test.ts @@ -3,12 +3,12 @@ import { expect } from 'chai'; import portfinder from 'portfinder'; import path from 'path'; -import { BrowserLauncher } from '../../../src/browser-launcher/BrowserLauncher'; -import { TestRunnerCoreConfig } from '../../../src/config/TestRunnerCoreConfig'; -import { TestRunner } from '../../../src/runner/TestRunner'; -import { Logger } from '../../../src/logger/Logger'; -import { SESSION_STATUS } from '../../../src/test-session/TestSessionStatus'; -import { TestRunnerGroupConfig } from '../../../src'; +import { BrowserLauncher } from '../../../src/browser-launcher/BrowserLauncher.js'; +import { TestRunnerCoreConfig } from '../../../src/config/TestRunnerCoreConfig.js'; +import { TestRunner } from '../../../src/runner/TestRunner.js'; +import { Logger } from '../../../src/logger/Logger.js'; +import { SESSION_STATUS } from '../../../src/test-session/TestSessionStatus.js'; +import { TestRunnerGroupConfig } from '../../../src/index.js'; interface BrowserStubs { stop: hanbi.Stub>; diff --git a/packages/test-runner-core/test/src/runner/TestScheduler.test.ts b/packages/test-runner-core/test/src/runner/TestScheduler.test.ts index 10667aacd..5433c7661 100644 --- a/packages/test-runner-core/test/src/runner/TestScheduler.test.ts +++ b/packages/test-runner-core/test/src/runner/TestScheduler.test.ts @@ -1,13 +1,13 @@ import { expect } from 'chai'; import * as hanbi from 'hanbi'; -import { BrowserLauncher } from '../../../src/browser-launcher/BrowserLauncher'; +import { BrowserLauncher } from '../../../src/browser-launcher/BrowserLauncher.js'; -import { TestRunnerCoreConfig } from '../../../src/config/TestRunnerCoreConfig'; -import { TestScheduler } from '../../../src/runner/TestScheduler'; -import { TestSession } from '../../../src/test-session/TestSession'; -import { TestSessionManager } from '../../../src/test-session/TestSessionManager'; -import { SESSION_STATUS } from '../../../src/test-session/TestSessionStatus'; +import { TestRunnerCoreConfig } from '../../../src/config/TestRunnerCoreConfig.js'; +import { TestScheduler } from '../../../src/runner/TestScheduler.js'; +import { TestSession } from '../../../src/test-session/TestSession.js'; +import { TestSessionManager } from '../../../src/test-session/TestSessionManager.js'; +import { SESSION_STATUS } from '../../../src/test-session/TestSessionStatus.js'; function timeout(ms = 0): Promise { return new Promise(r => setTimeout(r, ms)); diff --git a/packages/test-runner-coverage-v8/index.d.ts b/packages/test-runner-coverage-v8/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-coverage-v8/index.d.ts +++ b/packages/test-runner-coverage-v8/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-coverage-v8/src/index.ts b/packages/test-runner-coverage-v8/src/index.ts index a996ef8b6..306f53086 100644 --- a/packages/test-runner-coverage-v8/src/index.ts +++ b/packages/test-runner-coverage-v8/src/index.ts @@ -7,7 +7,7 @@ import picoMatch from 'picomatch'; import LruCache from 'lru-cache'; import { readFile } from 'node:fs/promises'; -import { toFilePath } from './utils'; +import { toFilePath } from './utils.js'; type V8Coverage = Profiler.ScriptCoverage; type Matcher = (test: string) => boolean; diff --git a/packages/test-runner-junit-reporter/index.d.ts b/packages/test-runner-junit-reporter/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-junit-reporter/index.d.ts +++ b/packages/test-runner-junit-reporter/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-junit-reporter/src/index.ts b/packages/test-runner-junit-reporter/src/index.ts index dbfe4a39e..2dff2aea2 100644 --- a/packages/test-runner-junit-reporter/src/index.ts +++ b/packages/test-runner-junit-reporter/src/index.ts @@ -1 +1 @@ -export { junitReporter } from './junitReporter'; +export { junitReporter } from './junitReporter.js'; diff --git a/packages/test-runner-junit-reporter/test/junitReporter.test.ts b/packages/test-runner-junit-reporter/test/junitReporter.test.ts index c3e075c5d..79e63fed3 100644 --- a/packages/test-runner-junit-reporter/test/junitReporter.test.ts +++ b/packages/test-runner-junit-reporter/test/junitReporter.test.ts @@ -6,7 +6,7 @@ import globby from 'globby'; import { chromeLauncher } from '@web/test-runner-chrome'; import { TestRunnerCoreConfig } from '@web/test-runner-core'; import { runTests } from '@web/test-runner-core/test-helpers'; -import { junitReporter } from '../src/junitReporter'; +import { junitReporter } from '../src/junitReporter.js'; const NON_ZERO_TIME_VALUE_REGEX = /time="((\d\.\d+)|(\d))"/g; diff --git a/packages/test-runner-playwright/index.d.ts b/packages/test-runner-playwright/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-playwright/index.d.ts +++ b/packages/test-runner-playwright/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-playwright/src/PlaywrightLauncher.ts b/packages/test-runner-playwright/src/PlaywrightLauncher.ts index 0d9a83d75..57d4d6ad9 100644 --- a/packages/test-runner-playwright/src/PlaywrightLauncher.ts +++ b/packages/test-runner-playwright/src/PlaywrightLauncher.ts @@ -1,6 +1,6 @@ import playwright, { Browser, Page, LaunchOptions, BrowserContext } from 'playwright'; import { BrowserLauncher, TestRunnerCoreConfig, CoverageMapData } from '@web/test-runner-core'; -import { PlaywrightLauncherPage } from './PlaywrightLauncherPage'; +import { PlaywrightLauncherPage } from './PlaywrightLauncherPage.js'; function capitalize(str: string) { return `${str[0].toUpperCase()}${str.substring(1)}`; diff --git a/packages/test-runner-playwright/src/PlaywrightLauncherPage.ts b/packages/test-runner-playwright/src/PlaywrightLauncherPage.ts index ec42dbd7b..fa4de283a 100644 --- a/packages/test-runner-playwright/src/PlaywrightLauncherPage.ts +++ b/packages/test-runner-playwright/src/PlaywrightLauncherPage.ts @@ -2,7 +2,7 @@ import { Page, BrowserContext } from 'playwright'; import { TestRunnerCoreConfig } from '@web/test-runner-core'; import { V8Coverage, v8ToIstanbul } from '@web/test-runner-coverage-v8'; import { SessionResult } from '@web/test-runner-core'; -import { ProductType } from './PlaywrightLauncher'; +import { ProductType } from './PlaywrightLauncher.js'; export class PlaywrightLauncherPage { private config: TestRunnerCoreConfig; diff --git a/packages/test-runner-playwright/src/index.ts b/packages/test-runner-playwright/src/index.ts index 2717a5b2b..5d82bcf97 100644 --- a/packages/test-runner-playwright/src/index.ts +++ b/packages/test-runner-playwright/src/index.ts @@ -5,7 +5,7 @@ import { ProductType, CreateBrowserContextFn, CreatePageFn, -} from './PlaywrightLauncher'; +} from './PlaywrightLauncher.js'; const validProductTypes: ProductType[] = ['chromium', 'firefox', 'webkit']; diff --git a/packages/test-runner-playwright/test/playwrightLauncher.test.ts b/packages/test-runner-playwright/test/playwrightLauncher.test.ts index 0111129bb..37eceac5c 100644 --- a/packages/test-runner-playwright/test/playwrightLauncher.test.ts +++ b/packages/test-runner-playwright/test/playwrightLauncher.test.ts @@ -1,6 +1,6 @@ import os from 'os'; -import { runIntegrationTests } from '../../../integration/test-runner'; -import { playwrightLauncher } from '../src/index'; +import { runIntegrationTests } from '../../../integration/test-runner/index.js'; +import { playwrightLauncher } from '../src/index.js'; describe('test-runner-playwright chromium', function testRunnerPlaywright() { this.timeout(100000); diff --git a/packages/test-runner-puppeteer/index.d.ts b/packages/test-runner-puppeteer/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-puppeteer/index.d.ts +++ b/packages/test-runner-puppeteer/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-puppeteer/src/index.ts b/packages/test-runner-puppeteer/src/index.ts index 832cd2007..0183fe27f 100644 --- a/packages/test-runner-puppeteer/src/index.ts +++ b/packages/test-runner-puppeteer/src/index.ts @@ -1,2 +1,2 @@ -export { puppeteerLauncher } from './puppeteerLauncher'; +export { puppeteerLauncher } from './puppeteerLauncher.js'; export { devices } from 'puppeteer'; diff --git a/packages/test-runner-puppeteer/test/puppeteerLauncher.test.ts b/packages/test-runner-puppeteer/test/puppeteerLauncher.test.ts index 7f1752d57..718410a81 100644 --- a/packages/test-runner-puppeteer/test/puppeteerLauncher.test.ts +++ b/packages/test-runner-puppeteer/test/puppeteerLauncher.test.ts @@ -1,5 +1,5 @@ -import { runIntegrationTests } from '../../../integration/test-runner'; -import { puppeteerLauncher } from '../src/index'; +import { runIntegrationTests } from '../../../integration/test-runner/index.js'; +import { puppeteerLauncher } from '../src/index.js'; describe('test-runner-puppeteer', function testRunnerPuppeteer() { this.timeout(20000); diff --git a/packages/test-runner-saucelabs/index.d.ts b/packages/test-runner-saucelabs/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-saucelabs/index.d.ts +++ b/packages/test-runner-saucelabs/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-saucelabs/src/SauceLabsLauncher.ts b/packages/test-runner-saucelabs/src/SauceLabsLauncher.ts index df9bd5daf..7704481fb 100644 --- a/packages/test-runner-saucelabs/src/SauceLabsLauncher.ts +++ b/packages/test-runner-saucelabs/src/SauceLabsLauncher.ts @@ -2,7 +2,7 @@ import { TestRunnerCoreConfig } from '@web/test-runner-core'; import { RemoteOptions } from 'webdriverio'; import { WebdriverLauncher } from '@web/test-runner-webdriver'; import ip from 'ip'; -import { SauceLabsLauncherManager } from './SauceLabsLauncherManager'; +import { SauceLabsLauncherManager } from './SauceLabsLauncherManager.js'; const networkAddress = ip.address(); diff --git a/packages/test-runner-saucelabs/src/createSauceLabsLauncher.ts b/packages/test-runner-saucelabs/src/createSauceLabsLauncher.ts index 4eef2f759..ce00a8264 100644 --- a/packages/test-runner-saucelabs/src/createSauceLabsLauncher.ts +++ b/packages/test-runner-saucelabs/src/createSauceLabsLauncher.ts @@ -5,8 +5,8 @@ import { RemoteOptions } from 'webdriverio'; import { Options } from '@wdio/types'; import { nanoid } from 'nanoid'; -import { SauceLabsLauncher } from './SauceLabsLauncher'; -import { SauceLabsLauncherManager } from './SauceLabsLauncherManager'; +import { SauceLabsLauncher } from './SauceLabsLauncher.js'; +import { SauceLabsLauncherManager } from './SauceLabsLauncherManager.js'; export function createSauceLabsLauncher( saucelabsOptions: SauceLabsOptions, diff --git a/packages/test-runner-saucelabs/src/index.ts b/packages/test-runner-saucelabs/src/index.ts index dbe4f3bed..9bed2b762 100644 --- a/packages/test-runner-saucelabs/src/index.ts +++ b/packages/test-runner-saucelabs/src/index.ts @@ -1,3 +1,3 @@ -export { createSauceLabsLauncher } from './createSauceLabsLauncher'; -export type { SauceLabsLauncher } from './SauceLabsLauncher'; -export type { SauceLabsLauncherManager } from './SauceLabsLauncherManager'; +export { createSauceLabsLauncher } from './createSauceLabsLauncher.js'; +export type { SauceLabsLauncher } from './SauceLabsLauncher.js'; +export type { SauceLabsLauncherManager } from './SauceLabsLauncherManager.js'; diff --git a/packages/test-runner-saucelabs/test-remote/saucelabsLauncher.test.ts b/packages/test-runner-saucelabs/test-remote/saucelabsLauncher.test.ts index 73320b7d1..a67b8fe99 100644 --- a/packages/test-runner-saucelabs/test-remote/saucelabsLauncher.test.ts +++ b/packages/test-runner-saucelabs/test-remote/saucelabsLauncher.test.ts @@ -1,5 +1,5 @@ -import { runIntegrationTests } from '../../../integration/test-runner'; -import { createSauceLabsLauncher } from '../src/index'; +import { runIntegrationTests } from '../../../integration/test-runner/index.js'; +import { createSauceLabsLauncher } from '../src/index.js'; if (!process.env.SAUCE_USERNAME) { throw new Error('Missing env var SAUCE_USERNAME'); diff --git a/packages/test-runner-selenium/index.d.ts b/packages/test-runner-selenium/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-selenium/index.d.ts +++ b/packages/test-runner-selenium/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-selenium/src/index.ts b/packages/test-runner-selenium/src/index.ts index d6f156604..5cc923e82 100644 --- a/packages/test-runner-selenium/src/index.ts +++ b/packages/test-runner-selenium/src/index.ts @@ -1 +1 @@ -export { seleniumLauncher, SeleniumLauncher } from './seleniumLauncher'; +export { seleniumLauncher, SeleniumLauncher } from './seleniumLauncher.js'; diff --git a/packages/test-runner-selenium/src/seleniumLauncher.ts b/packages/test-runner-selenium/src/seleniumLauncher.ts index d400982b8..296646cb3 100644 --- a/packages/test-runner-selenium/src/seleniumLauncher.ts +++ b/packages/test-runner-selenium/src/seleniumLauncher.ts @@ -1,7 +1,7 @@ import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core'; import { Builder, WebDriver } from 'selenium-webdriver'; -import { getBrowserLabel, getBrowserName } from './utils'; -import { IFrameManager } from './IFrameManager'; +import { getBrowserLabel, getBrowserName } from './utils.js'; +import { IFrameManager } from './IFrameManager.js'; export interface SeleniumLauncherArgs { driverBuilder: Builder; diff --git a/packages/test-runner-visual-regression/index.d.ts b/packages/test-runner-visual-regression/index.d.ts index 5198ffac4..af4b7d8b8 100644 --- a/packages/test-runner-visual-regression/index.d.ts +++ b/packages/test-runner-visual-regression/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './browser/commands'; +export * from './browser/commands.js'; diff --git a/packages/test-runner-visual-regression/plugin.d.ts b/packages/test-runner-visual-regression/plugin.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-visual-regression/plugin.d.ts +++ b/packages/test-runner-visual-regression/plugin.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-visual-regression/src/config.ts b/packages/test-runner-visual-regression/src/config.ts index 60d8bfbf5..ff0a5a471 100644 --- a/packages/test-runner-visual-regression/src/config.ts +++ b/packages/test-runner-visual-regression/src/config.ts @@ -2,8 +2,8 @@ import path from 'path'; import mkdirp from 'mkdirp'; import pixelmatch from 'pixelmatch'; -import { readFile, writeFile, fileExists } from './fs'; -import { pixelMatchDiff } from './pixelMatchDiff'; +import { readFile, writeFile, fileExists } from './fs.js'; +import { pixelMatchDiff } from './pixelMatchDiff.js'; type PixelMatchParams = Parameters; type PixelMatchOptions = PixelMatchParams[5]; diff --git a/packages/test-runner-visual-regression/src/index.ts b/packages/test-runner-visual-regression/src/index.ts index dc7c13cae..47615cb76 100644 --- a/packages/test-runner-visual-regression/src/index.ts +++ b/packages/test-runner-visual-regression/src/index.ts @@ -1 +1 @@ -export { visualRegressionPlugin } from './visualRegressionPlugin'; +export { visualRegressionPlugin } from './visualRegressionPlugin.js'; diff --git a/packages/test-runner-visual-regression/src/pixelMatchDiff.ts b/packages/test-runner-visual-regression/src/pixelMatchDiff.ts index ad18edcb0..3e5be6598 100644 --- a/packages/test-runner-visual-regression/src/pixelMatchDiff.ts +++ b/packages/test-runner-visual-regression/src/pixelMatchDiff.ts @@ -1,7 +1,7 @@ import pixelmatch from 'pixelmatch'; import { PNG, PNGWithMetadata } from 'pngjs'; -import { DiffArgs, DiffResult } from './config'; +import { DiffArgs, DiffResult } from './config.js'; export function pixelMatchDiff({ baselineImage, image, options }: DiffArgs): DiffResult { let error = ''; diff --git a/packages/test-runner-visual-regression/src/visualDiffCommand.ts b/packages/test-runner-visual-regression/src/visualDiffCommand.ts index 6fdec6120..0cdee0bfa 100644 --- a/packages/test-runner-visual-regression/src/visualDiffCommand.ts +++ b/packages/test-runner-visual-regression/src/visualDiffCommand.ts @@ -1,7 +1,7 @@ import path from 'path'; -import { VisualRegressionPluginOptions, DiffResult } from './config'; -import { VisualRegressionError } from './VisualRegressionError'; +import { VisualRegressionPluginOptions, DiffResult } from './config.js'; +import { VisualRegressionError } from './VisualRegressionError.js'; function resolveImagePath(baseDir: string, name: string) { const finalName = path.extname(name) ? name : `${name}.png`; diff --git a/packages/test-runner-visual-regression/src/visualRegressionPlugin.ts b/packages/test-runner-visual-regression/src/visualRegressionPlugin.ts index 369ec2997..7da044a57 100644 --- a/packages/test-runner-visual-regression/src/visualRegressionPlugin.ts +++ b/packages/test-runner-visual-regression/src/visualRegressionPlugin.ts @@ -3,13 +3,13 @@ import type { ChromeLauncher } from '@web/test-runner-chrome'; import type { PlaywrightLauncher } from '@web/test-runner-playwright'; import type { WebdriverLauncher } from '@web/test-runner-webdriver'; -import { defaultOptions, VisualRegressionPluginOptions } from './config'; +import { defaultOptions, VisualRegressionPluginOptions } from './config.js'; import { visualDiffCommand, VisualDiffCommandContext, VisualDiffCommandResult, -} from './visualDiffCommand'; -import { VisualRegressionError } from './VisualRegressionError'; +} from './visualDiffCommand.js'; +import { VisualRegressionError } from './VisualRegressionError.js'; interface Payload { id: string; diff --git a/packages/test-runner-visual-regression/test/visualRegressionPlugin.test.ts b/packages/test-runner-visual-regression/test/visualRegressionPlugin.test.ts index 986b4e91e..8fa78899d 100644 --- a/packages/test-runner-visual-regression/test/visualRegressionPlugin.test.ts +++ b/packages/test-runner-visual-regression/test/visualRegressionPlugin.test.ts @@ -3,8 +3,8 @@ import { runTests } from '@web/test-runner-core/test-helpers'; import { expect } from 'chai'; import { chromeLauncher } from '@web/test-runner-chrome'; -import { visualRegressionPlugin } from '../src/visualRegressionPlugin'; -import { fileExists } from '../src/fs'; +import { visualRegressionPlugin } from '../src/visualRegressionPlugin.js'; +import { fileExists } from '../src/fs.js'; import { playwrightLauncher } from '@web/test-runner-playwright'; describe('visualRegressionPlugin', function test() { diff --git a/packages/test-runner-webdriver/index.d.ts b/packages/test-runner-webdriver/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner-webdriver/index.d.ts +++ b/packages/test-runner-webdriver/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner-webdriver/src/IFrameManager.ts b/packages/test-runner-webdriver/src/IFrameManager.ts index 6052497a0..cd2ba924e 100644 --- a/packages/test-runner-webdriver/src/IFrameManager.ts +++ b/packages/test-runner-webdriver/src/IFrameManager.ts @@ -1,6 +1,6 @@ import { TestRunnerCoreConfig } from '@web/test-runner-core'; import { Browser, Element } from 'webdriverio'; -import { validateBrowserResult } from './coverage'; +import { validateBrowserResult } from './coverage.js'; /** * Manages tests to be executed in iframes on a page. diff --git a/packages/test-runner-webdriver/src/SessionManager.ts b/packages/test-runner-webdriver/src/SessionManager.ts index e60413408..22d52102f 100644 --- a/packages/test-runner-webdriver/src/SessionManager.ts +++ b/packages/test-runner-webdriver/src/SessionManager.ts @@ -1,6 +1,6 @@ import { TestRunnerCoreConfig } from '@web/test-runner-core'; import { Browser, Element } from 'webdriverio'; -import { validateBrowserResult } from './coverage'; +import { validateBrowserResult } from './coverage.js'; /** * Manages tests to be executed in one session (concurrency: 1). diff --git a/packages/test-runner-webdriver/src/index.ts b/packages/test-runner-webdriver/src/index.ts index 3bcead353..1d92d6b81 100644 --- a/packages/test-runner-webdriver/src/index.ts +++ b/packages/test-runner-webdriver/src/index.ts @@ -1 +1 @@ -export { webdriverLauncher, WebdriverLauncher } from './webdriverLauncher'; +export { webdriverLauncher, WebdriverLauncher } from './webdriverLauncher.js'; diff --git a/packages/test-runner-webdriver/src/webdriverLauncher.ts b/packages/test-runner-webdriver/src/webdriverLauncher.ts index 5d26a407a..5beb4ec6e 100644 --- a/packages/test-runner-webdriver/src/webdriverLauncher.ts +++ b/packages/test-runner-webdriver/src/webdriverLauncher.ts @@ -1,8 +1,8 @@ import { BrowserLauncher, TestRunnerCoreConfig } from '@web/test-runner-core'; import { Browser, remote, RemoteOptions } from 'webdriverio'; -import { IFrameManager } from './IFrameManager'; -import { SessionManager } from './SessionManager'; -import { getBrowserLabel } from './utils'; +import { IFrameManager } from './IFrameManager.js'; +import { SessionManager } from './SessionManager.js'; +import { getBrowserLabel } from './utils.js'; type MouseButton = 'left' | 'middle' | 'right'; diff --git a/packages/test-runner/index.d.ts b/packages/test-runner/index.d.ts index c41020304..06811aaaf 100644 --- a/packages/test-runner/index.d.ts +++ b/packages/test-runner/index.d.ts @@ -1,2 +1,2 @@ // this file is autogenerated with the generate-mjs-dts-entrypoints script -export * from './dist/index'; +export * from './dist/index.js'; diff --git a/packages/test-runner/src/bin.ts b/packages/test-runner/src/bin.ts index 67f9e9e00..b35c793eb 100644 --- a/packages/test-runner/src/bin.ts +++ b/packages/test-runner/src/bin.ts @@ -1,4 +1,4 @@ #!/usr/bin/env node -import { startTestRunner } from './startTestRunner'; +import { startTestRunner } from './startTestRunner.js'; startTestRunner(); diff --git a/packages/test-runner/src/config/collectGroupConfigs.ts b/packages/test-runner/src/config/collectGroupConfigs.ts index 9f3951ac6..02b53e2de 100644 --- a/packages/test-runner/src/config/collectGroupConfigs.ts +++ b/packages/test-runner/src/config/collectGroupConfigs.ts @@ -1,7 +1,7 @@ import { TestRunnerGroupConfig } from '@web/test-runner-core'; import { readConfig, ConfigLoaderError } from '@web/config-loader'; import globby from 'globby'; -import { TestRunnerStartError } from '../TestRunnerStartError'; +import { TestRunnerStartError } from '../TestRunnerStartError.js'; function validateGroupConfig(configFilePath: string, config: Partial) { if (config.browsers != null && !Array.isArray(config.browsers)) { diff --git a/packages/test-runner/src/config/loadLauncher.ts b/packages/test-runner/src/config/loadLauncher.ts index 6937036f9..0d2401914 100644 --- a/packages/test-runner/src/config/loadLauncher.ts +++ b/packages/test-runner/src/config/loadLauncher.ts @@ -1,4 +1,4 @@ -import { TestRunnerStartError } from '../TestRunnerStartError'; +import { TestRunnerStartError } from '../TestRunnerStartError.js'; /* eslint-disable @typescript-eslint/no-var-requires */ const puppeteerBrowsers = ['chrome', 'firefox']; diff --git a/packages/test-runner/src/config/mergeConfigs.ts b/packages/test-runner/src/config/mergeConfigs.ts index a62a241cb..d9b17d99b 100644 --- a/packages/test-runner/src/config/mergeConfigs.ts +++ b/packages/test-runner/src/config/mergeConfigs.ts @@ -1,4 +1,4 @@ -import { TestRunnerConfig } from './TestRunnerConfig'; +import { TestRunnerConfig } from './TestRunnerConfig.js'; const arrayKeys = ['plugins', 'middleware']; diff --git a/packages/test-runner/src/config/parseConfig.ts b/packages/test-runner/src/config/parseConfig.ts index 319985e89..f8f058c5b 100644 --- a/packages/test-runner/src/config/parseConfig.ts +++ b/packages/test-runner/src/config/parseConfig.ts @@ -14,15 +14,15 @@ import { getPortPromise } from 'portfinder'; import path from 'path'; import { cpus } from 'os'; -import { TestRunnerCliArgs } from './readCliArgs'; -import { mergeConfigs } from './mergeConfigs'; -import { TestRunnerConfig } from './TestRunnerConfig'; +import { TestRunnerCliArgs } from './readCliArgs.js'; +import { mergeConfigs } from './mergeConfigs.js'; +import { TestRunnerConfig } from './TestRunnerConfig.js'; import { esbuildPlugin, nodeResolvePlugin } from '@web/dev-server'; -import { TestRunnerStartError } from '../TestRunnerStartError'; -import { collectGroupConfigs } from './collectGroupConfigs'; -import { playwrightLauncher, puppeteerLauncher } from './loadLauncher'; -import { defaultReporter } from '../reporter/defaultReporter'; -import { TestRunnerLogger } from '../logger/TestRunnerLogger'; +import { TestRunnerStartError } from '../TestRunnerStartError.js'; +import { collectGroupConfigs } from './collectGroupConfigs.js'; +import { playwrightLauncher, puppeteerLauncher } from './loadLauncher.js'; +import { defaultReporter } from '../reporter/defaultReporter.js'; +import { TestRunnerLogger } from '../logger/TestRunnerLogger.js'; const secondMs = 1000; const minuteMs = secondMs * 60; diff --git a/packages/test-runner/src/config/readCliArgs.ts b/packages/test-runner/src/config/readCliArgs.ts index 79a1b5053..3a37a223f 100644 --- a/packages/test-runner/src/config/readCliArgs.ts +++ b/packages/test-runner/src/config/readCliArgs.ts @@ -2,7 +2,7 @@ import commandLineArgs from 'command-line-args'; import commandLineUsage, { OptionDefinition } from 'command-line-usage'; import camelCase from 'camelcase'; -import { TestRunnerConfig } from './TestRunnerConfig'; +import { TestRunnerConfig } from './TestRunnerConfig.js'; export interface TestRunnerCliArgs extends Partial< diff --git a/packages/test-runner/src/config/readFileConfig.ts b/packages/test-runner/src/config/readFileConfig.ts index 9e39a7678..863bf9dff 100644 --- a/packages/test-runner/src/config/readFileConfig.ts +++ b/packages/test-runner/src/config/readFileConfig.ts @@ -1,6 +1,6 @@ import { readConfig, ConfigLoaderError } from '@web/config-loader'; -import { TestRunnerStartError } from '../TestRunnerStartError'; +import { TestRunnerStartError } from '../TestRunnerStartError.js'; export interface ReadFileConfigParams { /** diff --git a/packages/test-runner/src/index.ts b/packages/test-runner/src/index.ts index b5bef0d0f..4704f16ad 100644 --- a/packages/test-runner/src/index.ts +++ b/packages/test-runner/src/index.ts @@ -1,11 +1,11 @@ -import type { TestRunnerConfig as FullTestRunnerConfig } from './config/TestRunnerConfig'; +import type { TestRunnerConfig as FullTestRunnerConfig } from './config/TestRunnerConfig.js'; export * from '@web/test-runner-core'; export { chromeLauncher } from '@web/test-runner-chrome'; -export { startTestRunner } from './startTestRunner'; -export { defaultReporter } from './reporter/defaultReporter'; -export { summaryReporter } from './reporter/summaryReporter'; -export { dotReporter } from './reporter/dotReporter'; -export { formatError } from './reporter/reportTestsErrors'; +export { startTestRunner } from './startTestRunner.js'; +export { defaultReporter } from './reporter/defaultReporter.js'; +export { summaryReporter } from './reporter/summaryReporter.js'; +export { dotReporter } from './reporter/dotReporter.js'; +export { formatError } from './reporter/reportTestsErrors.js'; export type TestRunnerConfig = Partial; diff --git a/packages/test-runner/src/reporter/defaultReporter.ts b/packages/test-runner/src/reporter/defaultReporter.ts index 2199d19ca..8294c7dcb 100644 --- a/packages/test-runner/src/reporter/defaultReporter.ts +++ b/packages/test-runner/src/reporter/defaultReporter.ts @@ -1,7 +1,7 @@ import { Logger, Reporter, ReporterArgs, BufferedLogger } from '@web/test-runner-core'; -import { reportTestFileResults } from './reportTestFileResults'; -import { getTestProgressReport } from './getTestProgress'; +import { reportTestFileResults } from './reportTestFileResults.js'; +import { getTestProgressReport } from './getTestProgress.js'; export interface DefaultReporterArgs { reportTestResults?: boolean; diff --git a/packages/test-runner/src/reporter/getTestProgress.ts b/packages/test-runner/src/reporter/getTestProgress.ts index 676071fef..484939b7e 100644 --- a/packages/test-runner/src/reporter/getTestProgress.ts +++ b/packages/test-runner/src/reporter/getTestProgress.ts @@ -8,9 +8,9 @@ import { } from '@web/test-runner-core'; import { bold, gray, green, red } from 'nanocolors'; -import { getPassedFailedSkippedCount } from './utils/getPassedFailedSkippedCount'; -import { getCodeCoverage } from './getCodeCoverage'; -import { renderProgressBar } from './renderProgressBar'; +import { getPassedFailedSkippedCount } from './utils/getPassedFailedSkippedCount.js'; +import { getCodeCoverage } from './getCodeCoverage.js'; +import { renderProgressBar } from './renderProgressBar.js'; export interface TestProgressArgs { browsers: BrowserLauncher[]; diff --git a/packages/test-runner/src/reporter/reportTestFileErrors.ts b/packages/test-runner/src/reporter/reportTestFileErrors.ts index 7df99aba7..6476ab389 100644 --- a/packages/test-runner/src/reporter/reportTestFileErrors.ts +++ b/packages/test-runner/src/reporter/reportTestFileErrors.ts @@ -1,7 +1,7 @@ import { TestSession, TestResultError, Logger } from '@web/test-runner-core'; import { gray, red } from 'nanocolors'; -import { getFailedOnBrowsers } from './utils/getFailedOnBrowsers'; +import { getFailedOnBrowsers } from './utils/getFailedOnBrowsers.js'; function isSameError(a: TestResultError, b: TestResultError) { return a.message === b.message && a.stack === b.stack; diff --git a/packages/test-runner/src/reporter/reportTestFileResults.ts b/packages/test-runner/src/reporter/reportTestFileResults.ts index c8a936588..a14304e4f 100644 --- a/packages/test-runner/src/reporter/reportTestFileResults.ts +++ b/packages/test-runner/src/reporter/reportTestFileResults.ts @@ -1,12 +1,11 @@ -import { TestSession } from '@web/test-runner-core'; +import { TestSession, BufferedLogger } from '@web/test-runner-core'; import { bold, cyan } from 'nanocolors'; import { relative } from 'path'; -import { reportTestsErrors } from './reportTestsErrors'; -import { reportBrowserLogs } from './reportBrowserLogs'; -import { reportRequest404s } from './reportRequest404s'; -import { reportTestFileErrors } from './reportTestFileErrors'; -import { BufferedLogger } from '@web/test-runner-core/src/cli/BufferedLogger'; +import { reportTestsErrors } from './reportTestsErrors.js'; +import { reportBrowserLogs } from './reportBrowserLogs.js'; +import { reportRequest404s } from './reportRequest404s.js'; +import { reportTestFileErrors } from './reportTestFileErrors.js'; export function reportTestFileResults( logger: BufferedLogger, diff --git a/packages/test-runner/src/reporter/reportTestsErrors.ts b/packages/test-runner/src/reporter/reportTestsErrors.ts index b7aa2e437..3002a63e1 100644 --- a/packages/test-runner/src/reporter/reportTestsErrors.ts +++ b/packages/test-runner/src/reporter/reportTestsErrors.ts @@ -2,8 +2,8 @@ import { TestResultError, TestSession, Logger } from '@web/test-runner-core'; import { gray, green, red } from 'nanocolors'; import * as diff from 'diff'; -import { getFailedOnBrowsers } from './utils/getFailedOnBrowsers'; -import { getFlattenedTestResults } from './utils/getFlattenedTestResults'; +import { getFailedOnBrowsers } from './utils/getFailedOnBrowsers.js'; +import { getFlattenedTestResults } from './utils/getFlattenedTestResults.js'; function renderDiff(actual: string, expected: string) { function cleanUp(line: string) { diff --git a/packages/test-runner/src/startTestRunner.ts b/packages/test-runner/src/startTestRunner.ts index d4bac47e3..a22757561 100644 --- a/packages/test-runner/src/startTestRunner.ts +++ b/packages/test-runner/src/startTestRunner.ts @@ -2,12 +2,12 @@ import { TestRunner, TestRunnerCli } from '@web/test-runner-core'; import { red } from 'nanocolors'; -import { TestRunnerConfig } from './config/TestRunnerConfig'; -import { mergeConfigs } from './config/mergeConfigs'; -import { parseConfig } from './config/parseConfig'; -import { readCliArgs } from './config/readCliArgs'; -import { readFileConfig } from './config/readFileConfig'; -import { TestRunnerStartError } from './TestRunnerStartError'; +import { TestRunnerConfig } from './config/TestRunnerConfig.js'; +import { mergeConfigs } from './config/mergeConfigs.js'; +import { parseConfig } from './config/parseConfig.js'; +import { readCliArgs } from './config/readCliArgs.js'; +import { readFileConfig } from './config/readFileConfig.js'; +import { TestRunnerStartError } from './TestRunnerStartError.js'; export interface StartTestRunnerParams { /**