feat(test-runner): reuse common plugins from dev server

modernweb-dev · Dec 13, 2020 · a5dead1 · a5dead1
1 parent 017ea66
commit a5dead1
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 59 deletions.
diff --git a/.changeset/eleven-yaks-live.md b/.changeset/eleven-yaks-live.md
@@ -0,0 +1,5 @@
+---
+'@web/test-runner': patch
+---
+
+reuse common dev server plugins
diff --git a/package.json b/package.json
@@ -15,8 +15,6 @@
     "format": "npm run format:eslint && npm run format:prettier",
     "format:eslint": "eslint --ext .ts,.js,.mjs,.cjs . --fix",
     "format:prettier": "node node_modules/prettier/bin-prettier.js \"**/*.{ts,js,mjs,cjs,md}\" \"**/package.json\" --write --ignore-path .eslintignore",
-    "generate-mjs-dts-entrypoints": "node scripts/generate-mjs-dts-entrypoints.mjs && yarn format",
-    "generate-ts-configs": "node scripts/generate-ts-configs.mjs && yarn format",
     "install-puppeteer-firefox": "cd node_modules/puppeteer && PUPPETEER_PRODUCT=firefox node install.js",
     "lint": "npm run lint:eslint && npm run lint:prettier",
     "lint:eslint": "eslint --ext .ts,.js,.mjs,.cjs .",
@@ -31,7 +29,10 @@
     "test": "yarn test:node && yarn test:browser && node scripts/workspaces-scripts-bin.mjs test:ci",
     "test:browser": "node packages/test-runner/dist/bin.js \"packages/*/test-browser/**/*.test.{js,ts}\"",
     "test:node": "mocha \"packages/*/test/**/*.test.{ts,js,mjs,cjs}\" --require ts-node/register --exit --retries 3",
-    "update-dependency": "node scripts/update-dependency.js"
+    "update": "npm run update:mjs-dts-entrypoints && npm run update:tsconfigs",
+    "update-dependency": "node scripts/update-dependency.js",
+    "update:mjs-dts-entrypoints": "node scripts/generate-mjs-dts-entrypoints.mjs && yarn format",
+    "update:tsconfigs": "node scripts/generate-ts-configs.mjs && yarn format"
   },
   "dependencies": {
     "@d4kmor/cli": "^0.8.0",

diff --git a/packages/dev-server-import-maps/tsconfig.json b/packages/dev-server-import-maps/tsconfig.json
@@ -34,6 +34,9 @@
     {
       "path": "../config-loader/tsconfig.json"
     },
+    {
+      "path": "../dev-server-rollup/tsconfig.json"
+    },
     {
       "path": "../test-runner-playwright/tsconfig.json"
     },
@@ -47,7 +50,7 @@
       "path": "../dev-server-legacy/tsconfig.json"
     },
     {
-      "path": "../dev-server-rollup/tsconfig.json"
+      "path": "../dev-server/tsconfig.json"
     },
     {
       "path": "../test-runner-cli/tsconfig.json"

diff --git a/packages/dev-server/index.mjs b/packages/dev-server/index.mjs
@@ -1,6 +1,12 @@
 // this file is autogenerated with the generate-mjs-dts-entrypoints script
 import cjsEntrypoint from './dist/index.js';
 
-const { startDevServer, mergeConfigs, DevServerStartError } = cjsEntrypoint;
+const {
+  startDevServer,
+  mergeConfigs,
+  DevServerStartError,
+  esbuildPlugin,
+  nodeResolvePlugin,
+} = cjsEntrypoint;
 
-export { startDevServer, mergeConfigs, DevServerStartError };
+export { startDevServer, mergeConfigs, DevServerStartError, esbuildPlugin, nodeResolvePlugin };
diff --git a/packages/test-runner/package.json b/packages/test-runner/package.json
@@ -70,9 +70,8 @@
     "cli"
   ],
   "dependencies": {
-    "@rollup/plugin-node-resolve": "^10.0.0",
     "@web/config-loader": "^0.1.2",
-    "@web/dev-server-rollup": "^0.2.13",
+    "@web/dev-server": "^0.0.29",
     "@web/test-runner-chrome": "^0.7.3",
     "@web/test-runner-cli": "^0.6.13",
     "@web/test-runner-commands": "^0.2.1",

diff --git a/packages/test-runner/src/esbuildPlugin.ts b/packages/test-runner/src/esbuildPlugin.ts
diff --git a/packages/test-runner/src/nodeResolvePlugin.ts b/packages/test-runner/src/nodeResolvePlugin.ts
diff --git a/packages/test-runner/src/startTestRunner.ts b/packages/test-runner/src/startTestRunner.ts
@@ -12,15 +12,15 @@ import {
   emulateMediaPlugin,
   setUserAgentPlugin,
 } from '@web/test-runner-commands/plugins';
+import { esbuildPlugin, nodeResolvePlugin } from '@web/dev-server';
 import { RollupNodeResolveOptions } from '@rollup/plugin-node-resolve';
+
 import { TestRunnerStartError } from './TestRunnerStartError';
 import commandLineArgs from 'command-line-args';
 import chalk from 'chalk';
 
 import { puppeteerLauncher, playwrightLauncher } from './loadLauncher';
 import { collectGroupConfigs } from './collectGroupConfigs';
-import { nodeResolvePlugin } from './nodeResolvePlugin';
-import { esbuildPlugin } from './esbuildPlugin';
 
 export interface TestRunnerConfig extends Partial<TestRunnerCoreConfig> {
   groups?: string | string[] | TestRunnerGroupConfig[];

diff --git a/packages/test-runner/tsconfig.json b/packages/test-runner/tsconfig.json
@@ -34,6 +34,9 @@
     {
       "path": "../config-loader/tsconfig.json"
     },
+    {
+      "path": "../dev-server-rollup/tsconfig.json"
+    },
     {
       "path": "../test-runner-playwright/tsconfig.json"
     },
@@ -47,7 +50,7 @@
       "path": "../dev-server-legacy/tsconfig.json"
     },
     {
-      "path": "../dev-server-rollup/tsconfig.json"
+      "path": "../dev-server/tsconfig.json"
     },
     {
       "path": "../test-runner-cli/tsconfig.json"

diff --git a/tsconfig.json b/tsconfig.json
@@ -49,6 +49,9 @@
     {
       "path": "./packages/dev-server-legacy/tsconfig.json"
     },
+    {
+      "path": "./packages/dev-server/tsconfig.json"
+    },
     {
       "path": "./packages/test-runner-cli/tsconfig.json"
     },
@@ -64,9 +67,6 @@
     {
       "path": "./packages/rollup-plugin-polyfills-loader/tsconfig.json"
     },
-    {
-      "path": "./packages/dev-server/tsconfig.json"
-    },
     {
       "path": "./packages/test-runner-selenium/tsconfig.json"
     },