[options]")
- .example("Serve a marko file", "$0 component.marko")
- .example("Serve the current directory", "$0 .")
- .validate(function(result) {
- if (result.version) {
- console.log(`v${details.version}`);
- process.exit(0);
- }
-
- if (result.help) {
- this.printUsage();
- process.exit(0);
- }
-
- if (!result.entry) {
- this.printUsage();
- process.exit(1);
- }
-
- const resolved = path.resolve(process.cwd(), result.entry);
- if (fs.existsSync(resolved)) {
- result.entry = resolved;
- } else {
- console.warn("Unable to find file or directory: " + result.entry);
- process.exit(1);
- }
- })
- .onError(function(err) {
- this.printUsage();
-
- if (err) {
- console.log();
- console.log(err);
- }
-
- process.exit(1);
- })
- .parse(cliArgs);
-
- options.nodeArgs = nodeArgs;
-
- return options;
-};
-
-exports.run = async options => {
- const defaultPort = options.port || 3000;
- const port = await getPort(defaultPort);
- const local = `http://localhost:${port}`;
- const network = `http://${address.ip()}:${port}`;
- const location =
- path.relative(process.cwd(), options.entry) || "the current directory";
-
- const server = await serve({ ...options, port });
- const { compiler } = server;
- let startTime = Date.now();
-
- compiler.hooks.watchRun.tap("@marko/serve", () => {
- if (!startTime) {
- startTime = Date.now();
- console.log(chalk.italic("\nCompiling..."));
- }
- });
-
- compiler.hooks.done.tap("@marko/serve", multiStats => {
- if (multiStats.hasErrors()) {
- console.log(`\nCompilation ${chalk.red("failed")}`);
- } else {
- console.log(
- chalk.italic(
- `\nCompiled in ${chalk.bold(prettyMs(Date.now() - startTime))}`
- )
- );
- }
-
- startTime = 0;
- });
-
- if (!options.noBrowser) {
- openBrowser(local);
- }
-
- console.log(`You can now view ${chalk.bold(location)} in your browser`);
-
- if (port !== defaultPort) {
- console.log(
- chalk.red(
- `(Running on port ${chalk.bold(port)} because ${defaultPort} is in use)`
- )
- );
- }
-
- console.log("");
- console.log(` ${chalk.bold("Local Address: ")} ${local}`);
- console.log(` ${chalk.bold("On Your Network:")} ${network}`);
- console.log("");
- console.log(
- chalk.italic(
- `Note that ${chalk.cyan("marko serve")} is only intended for development`
- )
- );
- console.log(
- chalk.italic(
- `You can create a production-ready build using ${chalk.cyan(
- "marko build"
- )}`
- )
- );
- console.log("");
-
- return server;
-};
diff --git a/packages/serve/src/get-port.js b/packages/serve/src/get-port.js
deleted file mode 100644
index 2ae165ee..00000000
--- a/packages/serve/src/get-port.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const net = require("net");
-const MAX_TRIES = 10;
-
-module.exports = desiredPort =>
- new Promise(resolve => {
- let port = desiredPort;
- const server = net
- .createServer()
- .unref()
- .once("listening", () => server.close(() => resolve(port)))
- .on("error", () => {
- if (port === desiredPort + MAX_TRIES) {
- return 0;
- } else {
- server.listen(port++);
- }
- })
- .listen(port);
- });
diff --git a/packages/serve/src/index.js b/packages/serve/src/index.js
deleted file mode 100644
index 36976799..00000000
--- a/packages/serve/src/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-const DevServer = require("webpack-dev-server");
-const SpawnServerPlugin = require("spawn-server-webpack-plugin");
-const { loadWebpackConfig } = require("@marko/build");
-const webpack = require("webpack");
-
-module.exports = ({ entry, port = 3000, verbose, nodeArgs = [] }) => {
- const spawnedServer = new SpawnServerPlugin({
- args: nodeArgs.concat("--enable-source-maps"),
- mainEntry: "index"
- });
- const configs = loadWebpackConfig({
- entry,
- production: false
- });
-
- const serverConfig = configs.find(
- ({ target }) => target === "node" || target === "async-node"
- );
-
- if (serverConfig) {
- serverConfig.plugins = (serverConfig.plugins || []).concat(spawnedServer);
- }
-
- const compiler = webpack(configs);
-
- const devServerConfig = {
- noInfo: true,
- overlay: true,
- host: "0.0.0.0",
- contentBase: false,
- injectClient: ({ target = "web" }) =>
- target === "web" || target.startsWith("browserslist"),
- stats: verbose
- ? { all: true }
- : {
- all: false,
- colors: true,
- errors: true,
- warnings: true
- },
- disableHostCheck: true,
- clientLogLevel: "error",
- headers: { "Access-Control-Allow-Origin": "*" },
- ...spawnedServer.devServerConfig
- };
-
- const server = new DevServer(compiler, devServerConfig);
-
- return new Promise((resolve, reject) =>
- server.listen(port, devServerConfig.host, (_, err) =>
- err ? reject(err) : resolve(server)
- )
- );
-};
diff --git a/packages/serve/test/fixtures/add-route/after-serve-expected.html b/packages/serve/test/fixtures/add-route/after-serve-expected.html
deleted file mode 100644
index cb48807a..00000000
--- a/packages/serve/test/fixtures/add-route/after-serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Index of / Index of / a.marko b.marko Index of / Index of / a.marko Index of / Index of / a.marko Index of /
-
-Index of /
-
-Node.js _VERSION_/ ecstatic server running @ localhost:8378
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/add-route/target/a.marko b/packages/serve/test/fixtures/add-route/target/a.marko
deleted file mode 100644
index db9dff71..00000000
--- a/packages/serve/test/fixtures/add-route/target/a.marko
+++ /dev/null
@@ -1 +0,0 @@
-Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/add-route/test.js b/packages/serve/test/fixtures/add-route/test.js
deleted file mode 100644
index ab06ca9f..00000000
--- a/packages/serve/test/fixtures/add-route/test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-export const test = async ({ page, screenshot, targetPath, isBuild }) => {
- if (!isBuild) {
- fs.writeFileSync(path.join(targetPath, "b.marko"), "UPDATED ");
- // page should automatically reload on change, let's wait
- await new Promise(resolve => page.once("load", resolve));
- await screenshot("after");
- }
-};
diff --git a/packages/serve/test/fixtures/custom-browserslist/.browserslistrc b/packages/serve/test/fixtures/custom-browserslist/.browserslistrc
deleted file mode 100644
index 0bc2b7f8..00000000
--- a/packages/serve/test/fixtures/custom-browserslist/.browserslistrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[production]
-> 1%
-ie 10
-
-[modern]
-last 1 chrome version
-last 1 firefox version
-
-[ssr]
-node 12
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-browserslist/build-expected.html b/packages/serve/test/fixtures/custom-browserslist/build-expected.html
deleted file mode 100644
index 947f37af..00000000
--- a/packages/serve/test/fixtures/custom-browserslist/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-browserslist/serve-expected.html b/packages/serve/test/fixtures/custom-browserslist/serve-expected.html
deleted file mode 100644
index c4676c28..00000000
--- a/packages/serve/test/fixtures/custom-browserslist/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-browserslist/static-expected.html b/packages/serve/test/fixtures/custom-browserslist/static-expected.html
deleted file mode 100644
index 947f37af..00000000
--- a/packages/serve/test/fixtures/custom-browserslist/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-browserslist/target.marko b/packages/serve/test/fixtures/custom-browserslist/target.marko
deleted file mode 100644
index 2631f229..00000000
--- a/packages/serve/test/fixtures/custom-browserslist/target.marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- Hello Marko
-
-
diff --git a/packages/serve/test/fixtures/custom-webpack-config/build-expected.html b/packages/serve/test/fixtures/custom-webpack-config/build-expected.html
deleted file mode 100644
index 03206223..00000000
--- a/packages/serve/test/fixtures/custom-webpack-config/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-webpack-config/serve-expected.html b/packages/serve/test/fixtures/custom-webpack-config/serve-expected.html
deleted file mode 100644
index ca8d95f7..00000000
--- a/packages/serve/test/fixtures/custom-webpack-config/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-webpack-config/static-expected.html b/packages/serve/test/fixtures/custom-webpack-config/static-expected.html
deleted file mode 100644
index 03206223..00000000
--- a/packages/serve/test/fixtures/custom-webpack-config/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/custom-webpack-config/target.marko b/packages/serve/test/fixtures/custom-webpack-config/target.marko
deleted file mode 100644
index 2631f229..00000000
--- a/packages/serve/test/fixtures/custom-webpack-config/target.marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- Hello Marko
-
-
diff --git a/packages/serve/test/fixtures/custom-webpack-config/webpack.config.js b/packages/serve/test/fixtures/custom-webpack-config/webpack.config.js
deleted file mode 100644
index f7cc6717..00000000
--- a/packages/serve/test/fixtures/custom-webpack-config/webpack.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const path = require("path");
-const { configBuilder } = require("@marko/build");
-
-const { getServerConfig, getBrowserConfigs } = configBuilder({
- entry: path.join(__dirname, "target.marko"),
- output: path.join(__dirname, "dist"),
- production: process.env.NODE_ENV === "production"
-});
-
-module.exports = [...getBrowserConfigs(), getServerConfig()];
diff --git a/packages/serve/test/fixtures/directory-index/build-expected.html b/packages/serve/test/fixtures/directory-index/build-expected.html
deleted file mode 100644
index aeccda32..00000000
--- a/packages/serve/test/fixtures/directory-index/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Index of / Index of / foo/ bar.marko Index of / Index of / foo/ bar.marko Index of /
-
-Index of /
-
-Node.js _VERSION_/ ecstatic server running @ localhost:8378
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/directory-index/target/bar.marko b/packages/serve/test/fixtures/directory-index/target/bar.marko
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/serve/test/fixtures/directory-index/target/components/example.marko b/packages/serve/test/fixtures/directory-index/target/components/example.marko
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/serve/test/fixtures/directory-index/target/foo/hello.marko b/packages/serve/test/fixtures/directory-index/target/foo/hello.marko
deleted file mode 100644
index 1fbe372a..00000000
--- a/packages/serve/test/fixtures/directory-index/target/foo/hello.marko
+++ /dev/null
@@ -1 +0,0 @@
-${JSON.stringify(input)}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/image/build-expected.html b/packages/serve/test/fixtures/image/build-expected.html
deleted file mode 100644
index eb0c3d85..00000000
--- a/packages/serve/test/fixtures/image/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello World Hello Marko! Hello World Hello Marko! Hello World Hello Marko! Hello World
-
-
- Hello Marko!
- Document {"params":{"id":"123"},"query":"foo=bar","pathname":"/blog/123"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries-deprecated/serve-expected.html b/packages/serve/test/fixtures/params-and-queries-deprecated/serve-expected.html
deleted file mode 100644
index ef138f4f..00000000
--- a/packages/serve/test/fixtures/params-and-queries-deprecated/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{"id":"123"},"query":"foo=bar","pathname":"/blog/123"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries-deprecated/static-expected.html b/packages/serve/test/fixtures/params-and-queries-deprecated/static-expected.html
deleted file mode 100644
index 5db7bc15..00000000
--- a/packages/serve/test/fixtures/params-and-queries-deprecated/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries-deprecated/target/blog/:id.marko b/packages/serve/test/fixtures/params-and-queries-deprecated/target/blog/:id.marko
deleted file mode 100644
index 596080d7..00000000
--- a/packages/serve/test/fixtures/params-and-queries-deprecated/target/blog/:id.marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- ${JSON.stringify(input)}
-
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries-deprecated/test.js b/packages/serve/test/fixtures/params-and-queries-deprecated/test.js
deleted file mode 100644
index 6d8c5ccc..00000000
--- a/packages/serve/test/fixtures/params-and-queries-deprecated/test.js
+++ /dev/null
@@ -1 +0,0 @@
-export const path = "/blog/123?foo=bar";
diff --git a/packages/serve/test/fixtures/params-and-queries/build-expected.html b/packages/serve/test/fixtures/params-and-queries/build-expected.html
deleted file mode 100644
index 317234e6..00000000
--- a/packages/serve/test/fixtures/params-and-queries/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{"id":"123"},"query":"foo=bar","pathname":"/blog/123"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries/serve-expected.html b/packages/serve/test/fixtures/params-and-queries/serve-expected.html
deleted file mode 100644
index e5aff1a2..00000000
--- a/packages/serve/test/fixtures/params-and-queries/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{"id":"123"},"query":"foo=bar","pathname":"/blog/123"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries/static-expected.html b/packages/serve/test/fixtures/params-and-queries/static-expected.html
deleted file mode 100644
index 5db7bc15..00000000
--- a/packages/serve/test/fixtures/params-and-queries/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries/target/blog/[id].marko b/packages/serve/test/fixtures/params-and-queries/target/blog/[id].marko
deleted file mode 100644
index 596080d7..00000000
--- a/packages/serve/test/fixtures/params-and-queries/target/blog/[id].marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- ${JSON.stringify(input)}
-
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/params-and-queries/test.js b/packages/serve/test/fixtures/params-and-queries/test.js
deleted file mode 100644
index 6d8c5ccc..00000000
--- a/packages/serve/test/fixtures/params-and-queries/test.js
+++ /dev/null
@@ -1 +0,0 @@
-export const path = "/blog/123?foo=bar";
diff --git a/packages/serve/test/fixtures/root-path-folder/build-expected.html b/packages/serve/test/fixtures/root-path-folder/build-expected.html
deleted file mode 100644
index bf72d376..00000000
--- a/packages/serve/test/fixtures/root-path-folder/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{},"pathname":"/"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/root-path-folder/serve-expected.html b/packages/serve/test/fixtures/root-path-folder/serve-expected.html
deleted file mode 100644
index 6a383f9c..00000000
--- a/packages/serve/test/fixtures/root-path-folder/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{},"pathname":"/"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/root-path-folder/static-expected.html b/packages/serve/test/fixtures/root-path-folder/static-expected.html
deleted file mode 100644
index bf72d376..00000000
--- a/packages/serve/test/fixtures/root-path-folder/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document {"params":{},"pathname":"/"}
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/root-path-folder/target/index/index.marko b/packages/serve/test/fixtures/root-path-folder/target/index/index.marko
deleted file mode 100644
index 596080d7..00000000
--- a/packages/serve/test/fixtures/root-path-folder/target/index/index.marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- ${JSON.stringify(input)}
-
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/simple/build-expected.html b/packages/serve/test/fixtures/simple/build-expected.html
deleted file mode 100644
index 03206223..00000000
--- a/packages/serve/test/fixtures/simple/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/simple/serve-expected.html b/packages/serve/test/fixtures/simple/serve-expected.html
deleted file mode 100644
index ca8d95f7..00000000
--- a/packages/serve/test/fixtures/simple/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/simple/static-expected.html b/packages/serve/test/fixtures/simple/static-expected.html
deleted file mode 100644
index 03206223..00000000
--- a/packages/serve/test/fixtures/simple/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Document Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/simple/target.marko b/packages/serve/test/fixtures/simple/target.marko
deleted file mode 100644
index 2631f229..00000000
--- a/packages/serve/test/fixtures/simple/target.marko
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Document
-
-
- Hello Marko
-
-
diff --git a/packages/serve/test/fixtures/update/after-serve-expected.html b/packages/serve/test/fixtures/update/after-serve-expected.html
deleted file mode 100644
index fff658e1..00000000
--- a/packages/serve/test/fixtures/update/after-serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello World
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/update/build-expected.html b/packages/serve/test/fixtures/update/build-expected.html
deleted file mode 100644
index 8ed07e70..00000000
--- a/packages/serve/test/fixtures/update/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/update/serve-expected.html b/packages/serve/test/fixtures/update/serve-expected.html
deleted file mode 100644
index db68ff48..00000000
--- a/packages/serve/test/fixtures/update/serve-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/update/static-expected.html b/packages/serve/test/fixtures/update/static-expected.html
deleted file mode 100644
index 8ed07e70..00000000
--- a/packages/serve/test/fixtures/update/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/update/target.marko b/packages/serve/test/fixtures/update/target.marko
deleted file mode 100644
index b197a6ea..00000000
--- a/packages/serve/test/fixtures/update/target.marko
+++ /dev/null
@@ -1,6 +0,0 @@
-style {
- h1 {
- color: green;
- }
-}
-Hello Marko
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/update/test.js b/packages/serve/test/fixtures/update/test.js
deleted file mode 100644
index 31ac3866..00000000
--- a/packages/serve/test/fixtures/update/test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import fs from "fs";
-
-export const test = async ({ page, screenshot, targetPath, isBuild }) => {
- if (!isBuild) {
- fs.writeFileSync(targetPath, `Hello World `);
- // page should automatically reload on change, let's wait
- await new Promise(resolve => page.once("load", resolve));
- await screenshot("after");
- }
-};
diff --git a/packages/serve/test/index.test.js b/packages/serve/test/index.test.js
deleted file mode 100644
index 0d55e706..00000000
--- a/packages/serve/test/index.test.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import fs from "fs";
-import autotest from "mocha-autotest";
-import puppeteer from "puppeteer";
-import cluster from "cluster";
-import webpack from "webpack";
-import { copy, remove } from "fs-extra";
-import { run } from "../src/cli";
-import { loadWebpackConfig } from "../../build/src/index";
-import { buildStaticSite } from "../../build/src/util";
-
-describe("scope(serve)", function () {
- this.slow(20000);
- this.timeout(60000);
- autotest("fixtures", {
- serve: createTest(async options => {
- const server = await run({ noBrowser: true, ...options });
- return () => new Promise(resolve => server.close(resolve));
- }),
- build: createTest(async (options, { resolve }) => {
- const outputPath = resolve("dist");
-
- await new Promise((resolve, reject) => {
- process.env.NODE_ENV = "production";
- webpack(
- loadWebpackConfig({ output: outputPath, ...options })
- ).run(err => (err ? reject(err) : resolve()));
- });
-
- cluster.setupMaster({
- exec: outputPath,
- execArgv: []
- });
-
- let server;
-
- await new Promise(resolve => {
- server = cluster.fork({ ...process.env, PORT: options.port });
- server.once("listening", resolve);
- });
-
- return () =>
- new Promise(resolve => {
- server.on("exit", resolve);
- server.kill();
- });
- }),
- static: createTest(async (options, { resolve }) => {
- const outputPath = resolve("dist");
- await buildStaticSite({ ...options, output: outputPath });
- const serveExecutable = require.resolve(".bin/http-server");
-
- cluster.setupMaster({
- exec: serveExecutable,
- execArgv: [],
- args: [outputPath, "--port", String(options.port)]
- });
-
- let server;
-
- await new Promise(resolve => {
- server = cluster.fork();
- server.once("listening", resolve);
- });
-
- return () =>
- new Promise(resolve => {
- server.on("exit", resolve);
- server.kill();
- });
- })
- });
-});
-
-function createTest(createServer) {
- return ({ resolve, dir, test, snapshot, mode }) => {
- test(async () => {
- let browser, closeServer, backupPath, targetPath;
- try {
- const mainPath = resolve("test.js");
- const hasMainFile = fs.existsSync(mainPath);
- const targetFilePath = resolve("target.marko");
- const targetDirPath = resolve("target");
- const hasTargetDir = fs.existsSync(targetDirPath);
-
- let options = { port: 8378 };
- let main;
-
- if (hasMainFile) {
- main = require(mainPath);
- options = Object.assign(options, main.options);
- }
-
- options.entry = targetPath = hasTargetDir
- ? targetDirPath
- : targetFilePath;
-
- closeServer = await createServer(options, { resolve });
- browser = await puppeteer.launch({
- args: [
- "--no-sandbox",
- "--disable-dev-shm-usage",
- "--disable-setuid-sandbox"
- ]
- });
- const page = await browser.newPage();
- const screenshot = screenshotUtility.bind(
- null,
- page,
- mode,
- snapshot,
- resolve
- );
- await page.goto(
- `http://localhost:${options.port}${(main && main.path) || "/"}`,
- { waitUntil: "networkidle2" }
- );
-
- await screenshot();
-
- if (main && main.test) {
- await copy(targetPath, (backupPath = resolve("backup")));
- await main.test({
- page,
- screenshot,
- snapshot,
- targetPath,
- isBuild: mode === "build" || mode === "static"
- });
- }
- } finally {
- delete process.env.NODE_ENV;
- Object.keys(require.cache).forEach(key => {
- if (key.startsWith(dir)) {
- delete require.cache[key];
- }
- });
- if (browser) await browser.close();
- if (closeServer) await closeServer();
- if (backupPath) {
- await remove(targetPath);
- await copy(backupPath, targetPath);
- await remove(backupPath);
- }
- }
- });
- };
-}
-
-async function screenshotUtility(page, mode, snapshot, resolve, name, element) {
- const target = element || (await page.$("body"));
- const nameWithMode = `${name || ""}${name && mode ? "-" : ""}${mode || ""}`;
- const screenshotPath = resolve(
- `${nameWithMode && `${nameWithMode}-`}actual.png`
- );
- const assetCode = (
- await page.evaluate(el => el.innerHTML, await page.$("head"))
- ).trim();
- const html = assetCode + (await page.evaluate(el => el.outerHTML, target));
-
- // Cannot screenshot zero size elements, first check body has content
- // before screenshotting.
- if (!/\s*<\/body>/.test(html)) {
- await target.screenshot({ path: screenshotPath });
- }
-
- snapshot(normalizeHashes(html), { name: nameWithMode, ext: ".html" });
-}
-
-function normalizeHashes(html) {
- return html
- .replace(/\d+(\.\d+)*([kmgt]b?)(?=\b)/gi, "_SIZE_")
- .replace(/(v\s*)\d+(\.\d+)*/gi, "_VERSION_")
- .replace(/(\.|\/)[a-f0-9]{8}\./gi, "$1HASH.")
- .replace(/_[0-9a-z]{4}\./gi, "_HASH.");
-}
diff --git a/packages/test/CHANGELOG.md b/packages/test/CHANGELOG.md
deleted file mode 100644
index fd5a501c..00000000
--- a/packages/test/CHANGELOG.md
+++ /dev/null
@@ -1,537 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [10.0.0](https://github.com/marko-js/cli/compare/@marko/test@9.0.2...@marko/test@10.0.0) (2022-10-21)
-
-
-### Bug Fixes
-
-* **test:** make lasso a peerDependency ([098cfaa](https://github.com/marko-js/cli/commit/098cfaa82c378aa38eec4abc1d19b71441551add))
-
-
-### BREAKING CHANGES
-
-* **test:** Lasso is now a peer dependency.
-
-
-
-
-
-## [9.0.2](https://github.com/marko-js/cli/compare/@marko/test@9.0.1...@marko/test@9.0.2) (2022-04-01)
-
-
-### Bug Fixes
-
-* **test:** ensure istanbul transform runs last ([b7b7add](https://github.com/marko-js/cli/commit/b7b7add8e01810adea543e70ccc33670d49283ff))
-
-
-
-
-
-## [9.0.1](https://github.com/marko-js/cli/compare/@marko/test@9.0.0...@marko/test@9.0.1) (2021-09-22)
-
-
-### Bug Fixes
-
-* **test:** issue loading test files ([44e20ea](https://github.com/marko-js/cli/commit/44e20ea0f1b59f1e68aef37f84df7b58ce103e5b))
-
-
-
-
-
-# [9.0.0](https://github.com/marko-js/cli/compare/@marko/test@8.1.0...@marko/test@9.0.0) (2021-09-22)
-
-
-### Features
-
-* **test:** remove deprecated apis ([6bdf774](https://github.com/marko-js/cli/commit/6bdf774b27f7bf4aca7d93adb5d7f6449cd2ff7a))
-
-
-### BREAKING CHANGES
-
-* **test:** legacy render apis are removed
-
-
-
-
-
-# [8.1.0](https://github.com/marko-js/cli/compare/@marko/test@8.0.7...@marko/test@8.1.0) (2021-03-29)
-
-
-### Bug Fixes
-
-* lint errors ([57e87fc](https://github.com/marko-js/cli/commit/57e87fc0027096c8648ac5645db66c0c22889b40))
-* **test:** fix regression with legacy test API ([d94ade1](https://github.com/marko-js/cli/commit/d94ade1e3657fe3bb60326fb999f23621e0e55b0))
-
-
-### Features
-
-* **test:** improve defaults for github actions ([3ac1e1b](https://github.com/marko-js/cli/commit/3ac1e1b0bb232cfec7af9a3480bceeb528d9ce67))
-
-
-
-
-
-## [8.0.7](https://github.com/marko-js/cli/compare/@marko/test@8.0.6...@marko/test@8.0.7) (2021-02-04)
-
-**Note:** Version bump only for package @marko/test
-
-
-
-
-
-## [8.0.6](https://github.com/marko-js/cli/compare/@marko/test@8.0.5...@marko/test@8.0.6) (2021-01-27)
-
-
-### Bug Fixes
-
-* **test:** issue with running using Marko 5 ([7caadb3](https://github.com/marko-js/cli/commit/7caadb351a228eae716d5f07eb49f5148abd9a83))
-
-
-
-
-
-## [8.0.5](https://github.com/marko-js/cli/compare/@marko/test@8.0.4...@marko/test@8.0.5) (2021-01-22)
-
-
-### Bug Fixes
-
-* **test:** working with new wdio and mocha ([87daf1c](https://github.com/marko-js/cli/commit/87daf1c8e7edd3b82869f0617a87279625730808))
-
-
-
-
-
-## [8.0.4](https://github.com/marko-js/cli/compare/@marko/test@8.0.3...@marko/test@8.0.4) (2021-01-22)
-
-
-### Bug Fixes
-
-* **test:** integration with new wdio services ([b22f2e2](https://github.com/marko-js/cli/commit/b22f2e24cf902f01a3d19670c5aeb34f8f384e32))
-* **test:** typo ([56d00d3](https://github.com/marko-js/cli/commit/56d00d3e1fb27f26caa5f674927247fcbe406fee))
-
-
-
-
-
-## [8.0.3](https://github.com/marko-js/cli/compare/@marko/test@8.0.2...@marko/test@8.0.3) (2021-01-22)
-
-
-### Bug Fixes
-
-* **test:** issue with launcher not receiving required/default opts ([ee463be](https://github.com/marko-js/cli/commit/ee463bea133ae999b9a629c21aa354bd03041deb))
-
-
-
-
-
-## [8.0.2](https://github.com/marko-js/cli/compare/@marko/test@8.0.1...@marko/test@8.0.2) (2021-01-22)
-
-
-### Bug Fixes
-
-* **test:** update to work with new wdio launcher api ([1b3e4ba](https://github.com/marko-js/cli/commit/1b3e4ba13ccc6773fb969c9a79d00cccf7976ad0))
-
-
-
-
-
-## [8.0.1](https://github.com/marko-js/cli/compare/@marko/test@8.0.0...@marko/test@8.0.1) (2021-01-22)
-
-
-### Bug Fixes
-
-* **test:** support modern new wdio services ([bd10b6e](https://github.com/marko-js/cli/commit/bd10b6ea9caaf81092b6b4422ea2519d682671f6))
-
-
-
-
-
-# [8.0.0](https://github.com/marko-js/cli/compare/@marko/test@7.1.3...@marko/test@8.0.0) (2021-01-22)
-
-
-### Features
-
-* update deps, support Marko 5 ([c5d34ff](https://github.com/marko-js/cli/commit/c5d34ff58fa34ef545330dfe1231ebac37282895))
-
-
-### BREAKING CHANGES
-
-* Marko 4 support dropped in serve/build
-* Upgraded webdriver version for test
-
-
-
-
-
-## [7.1.3](https://github.com/marko-js/cli/compare/@marko/test@7.1.2...@marko/test@7.1.3) (2020-06-25)
-
-
-### Bug Fixes
-
-* add missing babel runtime dep ([9d04f7c](https://github.com/marko-js/cli/commit/9d04f7cbf4a21aabf01f4aac3aaf2c8a97d31253))
-
-
-
-
-
-## [7.1.2](https://github.com/marko-js/cli/compare/@marko/test@7.1.1...@marko/test@7.1.2) (2020-05-12)
-
-
-### Bug Fixes
-
-* include version flag for all commands ([802de9d](https://github.com/marko-js/cli/commit/802de9daa9e70b2912b5a718352f667d7bc2eb03))
-
-
-
-
-
-## [7.1.1](https://github.com/marko-js/cli/compare/@marko/test@7.1.0...@marko/test@7.1.1) (2020-05-08)
-
-**Note:** Version bump only for package @marko/test
-
-
-
-
-
-# [7.1.0](https://github.com/marko-js/cli/compare/@marko/test@7.0.0...@marko/test@7.1.0) (2020-05-07)
-
-
-### Features
-
-* allow commands to run apart from marko-cli ([#152](https://github.com/marko-js/cli/issues/152)) ([4226988](https://github.com/marko-js/cli/commit/42269889bdf89e3811e465852ad0061e8e06cd03))
-
-
-
-
-
-# [7.0.0](https://github.com/marko-js/cli/compare/@marko/test@6.0.14...@marko/test@7.0.0) (2019-09-19)
-
-
-### Bug Fixes
-
-* **test:** move chromedriver to be a peerDependency ([8289bf2](https://github.com/marko-js/cli/commit/8289bf2))
-
-
-### BREAKING CHANGES
-
-* **test:** chromedriver for the test command is no longer installed by default
-
-
-
-
-
-## [6.0.14](https://github.com/marko-js/cli/compare/@marko/test@6.0.13...@marko/test@6.0.14) (2019-09-04)
-
-
-### Bug Fixes
-
-* **test:** improve stack trace formatting for server & browser ([9c393b8](https://github.com/marko-js/cli/commit/9c393b8))
-
-
-
-
-
-## [6.0.13](https://github.com/marko-js/cli/compare/@marko/test@6.0.12...@marko/test@6.0.13) (2019-08-26)
-
-
-### Bug Fixes
-
-* **test:** skip build meta data for chromedriver ([212272d](https://github.com/marko-js/cli/commit/212272d))
-
-
-
-
-
-## [6.0.12](https://github.com/marko-js/cli/compare/@marko/test@6.0.11...@marko/test@6.0.12) (2019-08-19)
-
-
-### Bug Fixes
-
-* **test:** improve error handling outside of test suite ([272c34a](https://github.com/marko-js/cli/commit/272c34a))
-
-
-
-
-
-## [6.0.11](https://github.com/marko-js/cli/compare/@marko/test@6.0.10...@marko/test@6.0.11) (2019-07-31)
-
-
-### Bug Fixes
-
-* **test:** update chrome options ([2b1af61](https://github.com/marko-js/cli/commit/2b1af61))
-
-
-
-
-
-## [6.0.10](https://github.com/marko-js/cli/compare/@marko/test@6.0.9...@marko/test@6.0.10) (2019-07-30)
-
-
-### Bug Fixes
-
-* **test:** issue with cleanup not happending, upgrade chromedriver ([5c47e7a](https://github.com/marko-js/cli/commit/5c47e7a))
-
-
-
-
-
-## [6.0.9](https://github.com/marko-js/cli/compare/@marko/test@6.0.8...@marko/test@6.0.9) (2019-07-12)
-
-**Note:** Version bump only for package @marko/test
-
-
-
-
-
-## [6.0.8](https://github.com/marko-js/cli/compare/@marko/test@6.0.7...@marko/test@6.0.8) (2019-07-12)
-
-**Note:** Version bump only for package @marko/test
-
-
-
-
-
-## [6.0.7](https://github.com/marko-js/cli/compare/@marko/test@6.0.6...@marko/test@6.0.7) (2019-07-11)
-
-**Note:** Version bump only for package @marko/test
-
-
-
-
-
-## [6.0.6](https://github.com/marko-js/cli/compare/@marko/test@6.0.5...@marko/test@6.0.6) (2019-06-27)
-
-
-### Bug Fixes
-
-* **test:** err.stack not always available in IE11 ([4a6d07e](https://github.com/marko-js/cli/commit/4a6d07e))
-
-
-
-
-
-## [6.0.5](https://github.com/marko-js/cli/compare/@marko/test@6.0.4...@marko/test@6.0.5) (2019-06-27)
-
-
-### Bug Fixes
-
-* **test:** downgrade strip-ansi for improved browser support ([5a3f483](https://github.com/marko-js/cli/commit/5a3f483))
-
-
-
-
-
-## [6.0.4](https://github.com/marko-js/cli/compare/@marko/test@6.0.3...@marko/test@6.0.4) (2019-06-27)
-
-
-### Bug Fixes
-
-* **test:** improve stack traces in browser tests ([a218ff2](https://github.com/marko-js/cli/commit/a218ff2))
-
-
-
-
-
-## [6.0.3](https://github.com/marko-js/cli/compare/@marko/test@6.0.2...@marko/test@6.0.3) (2019-06-27)
-
-
-### Bug Fixes
-
-* **test:** no longer error after tests in some cases ([1849f9a](https://github.com/marko-js/cli/commit/1849f9a))
-
-
-
-
-
-## [6.0.2](https://github.com/marko-js/cli/compare/@marko/test@6.0.1...@marko/test@6.0.2) (2019-06-26)
-
-
-### Bug Fixes
-
-* **test:** try to resize browsers multiple times ([ea1533a](https://github.com/marko-js/cli/commit/ea1533a))
-
-
-
-
-
-## [6.0.1](https://github.com/marko-js/cli/compare/@marko/test@6.0.0...@marko/test@6.0.1) (2019-05-17)
-
-
-### Bug Fixes
-
-* **test:** resize based on viewport instead of window ([a58fdea](https://github.com/marko-js/cli/commit/a58fdea))
-
-
-
-
-
-# [6.0.0](https://github.com/marko-js/cli/compare/@marko/test@5.1.1...@marko/test@6.0.0) (2019-05-16)
-
-
-### Features
-
-* **test:** upgrade wdio ([#130](https://github.com/marko-js/cli/issues/130)) ([ffbdefd](https://github.com/marko-js/cli/commit/ffbdefd))
-
-
-
-
-
-## [5.1.1](https://github.com/marko-js/cli/compare/@marko/test@5.1.0...@marko/test@5.1.1) (2019-03-20)
-
-
-### Bug Fixes
-
-* **test:** remove deprecated inline control flow from test runner ([39c7a1d](https://github.com/marko-js/cli/commit/39c7a1d))
-
-
-
-
-
-# [5.1.0](https://github.com/marko-js/cli/compare/@marko/test@5.0.0...@marko/test@5.1.0) (2019-02-07)
-
-
-### Features
-
-* **test:** add renderAsync method to server context ([#119](https://github.com/marko-js/cli/issues/119)) ([f67224c](https://github.com/marko-js/cli/commit/f67224c))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Utility to test Marko files in both a server and browser environment (bundled with [lasso](https://github.com/lasso-js/lasso)).
-
-## Getting Started
-
-```bash
-npm install @marko/test
-marko-test ./test.js
-```
-
-or
-
-```bash
-npx @marko/test ./test.js
-```
-
-## Usage:
-
-`marko-test` supports glob patterns for locating and running test files.
-
-Run all of the tests in a project/directory:
-
-```bash
-marko-test
-```
-
-> equivalent to: `marko-test **/test.js **/test.*.js **/test/*.js`
-
-Run all of the unit tests for a single UI component:
-
-```bash
-marko-test ./src/components/app-foo/**/test*.js
-```
-
-Run all of the unit tests for all UI components:
-
-```bash
-marko-test ./src/components/**/test*.js
-```
-
-Run only server tests:
-
-```bash
-marko-test ./src/components/**/test*server.js --server
-```
-
-Keep server open after the tests finish and disable headless mode for browser tests:
-
-```bash
-marko-test --debug
-```
-
-All node options are forwarded to the mocha process for server testing, allowing the following:
-
-```bash
-# Will start a debugging session on the spawned mocha process.
-marko-test --server --inspect-brk
-```
-
-## Writing Tests
-
-The test runner (built on top of [mocha](https://mochajs.org/)) will run server tests in a node environment and browser tests will be bundled with lasso and run in a browser using webdriver.io. The test environment is determined based on the test's filename.
-
-The following will run the test in the **node** environment:
-
-- `test.server.js`
-- `test-server.js`
-- `foo.test.server.js`
-- `foo-test-server.js`
-
-All other matched test files run in the **browser** environment:
-
-- `test.js`
-- `test.browser.js`
-- `test-browser.js`
-- `foo.test.browser.js`
-- `foo-test-browser.js`
-
-Below is an example test:
-
-```javascript
-const expect = require("chai").expect;
-const template = require("../index.marko");
-const { render } = require("@marko/testing-library");
-
-it("variant-danger", async function () {
- var { getByRole } = await render(template, { variant: "danger" });
- expect(getByRole("button").getAttribute("class")).to.contain(
- "app-button-danger"
- );
-});
-```
-
-## Code coverage
-
-Use [`nyc`](https://github.com/istanbuljs/nyc) to generate coverage reports. Just prefix any test commands with `nyc`:
-
-```
-nyc marko-test
-```
-
-## `marko-cli.js`
-
-You can provide a package-specific plugin by creating a `marko-cli.js` file at the root of your project:
-
-_my-app/marko-cli.js:_
-
-```javascript
-module.exports = function (markoCli) {
- // ...
-};
-```
-
-A package-specific plugin will automatically be loaded when `marko` is launched.
-
-Some options can be specified on the `config` object that `markoCli` exposes.
-
-For example, shared test dependencies can be specified with the `dependencies` option.
-
-```javascript
-module.exports = function (markoCli) {
- markoCli.config.browserTestDependencies = [
- "bluebird/js/browser/bluebird.core.js",
- "require-run: ./tools/myDependency.js"
- ];
-};
-```
-
-For more info on how to specify dependencies can be found [here](https://github.com/lasso-js/lasso#dependencies).
-
-### Configuring Lasso
-
-Lasso plugins and transforms can also be specified using the `lassoOptions` option.
-
-_my-app/marko-cli.js:_
-
-```javascript
-module.exports = function (markoCli) {
- markoCli.config.lassoOptions = {
- plugins: [
- "lasso-less" // Marko plugin is included by default.
- ],
- require: {
- transforms: [
- {
- transform: "lasso-babel-transform"
- }
- ]
- }
- };
-};
-```
-
-### Configuring Mocha
-
-You can easily configure Mocha for server-side tests using `markoCli.config.mochaOptions`.
-[Supported `mocha` options](https://mochajs.org/#usage), and should be written
-in camel case:
-
-_my-app/marko-cli.js:_
-
-```javascript
-module.exports = function (markoCli) {
- markoCli.config.mochaOptions = {
- timeout: 5000,
- colors: true
- };
-};
-```
-
-### Browser Testing with Webdriver.io
-
-Under the hood `@marko/test` uses [Webdriver.io](http://webdriver.io) to speak to various browsers.
-The test command operates differently than a standard WDIO utility by compiling the tests themselves and running everything in the browser. A websocket is setup with the browser instance to stream logs. A subset of WDIO options are exposed under `markoCli.config.wdioOptions`.
-
-_my-app/marko-cli.js:_
-
-```javascript
-module.exports = function(markoCli) {
- markoCli.config.wdioOptions = {
- /**
- * Capabilities are always run in parallel.
- * By default chromedriver will be used if capabilities are left blank.
- */
- capabilities: ...,
- serverPort: 0, // The port to start the test server on (serves your components).
- idleTimeout: 60000, // Automatically disconnect after 1min of inactivity by default.
- suiteTimeout: 600000, // Automatically disconnect after 10 minutes if the tests have not completed by default.
- viewport: {
- // Configure the screen size for any drivers started (defaults below).
- width: 800,
- height: 600
- }
- /**
- * The launcher option allows you change the WDIO config before running, and cleanup afterward.
- * By default the chromedriver is launched, however if `BROWSERSTACK_USERNAME`, `SAUCE_USERNAME`
- * or `TB_KEY` is found in the environment variables a service for that provider will automatically be used.
- */
- launcher: {
- onPrepare(config, capabilities) {
- // Setup WDIO config.
- },
- onComplete() {
- // Cleanup after tests.
- }
- }
- };
-}
-```
-
-### Chromedriver
-
-As mentioned above [chromedriver](https://www.npmjs.com/package/chromedriver) is used by default for running browser tests. This package is versioned in lockstep with chrome itself and so it is up to you to ensure that you have the appropriate version of `chromedriver` installed to match the version of chrome you have on your local machine.
-
-`chromedriver` is marked as a `peerDependency` of `@marko/test` and so you will need to `npm i chromedriver@YOUR_CHROME_VERSION -D` in order for this to work.
diff --git a/packages/test/package.json b/packages/test/package.json
deleted file mode 100644
index 7d5843ac..00000000
--- a/packages/test/package.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "name": "@marko/test",
- "description": "Utility to test Marko files in both a server and browser environment",
- "version": "10.0.0",
- "bugs": "https://github.com/marko-js/cli/issues/new?template=Bug_report.md",
- "dependencies": {
- "@babel/runtime": "^7.13.10",
- "@lasso/marko-taglib": "^2.0.3",
- "@marko/express": "^1.0.0",
- "@wdio/cli": "^6.0.0",
- "argly": "^1.2.0",
- "async": "^3.2.0",
- "async-exit-hook": "^2.0.1",
- "browser-refresh-taglib": "^1.1.0",
- "chai": "^4.3.4",
- "chalk": "^4.1.0",
- "child-process-promise": "^2.2.1",
- "complain": "^1.6.0",
- "delay": "^5.0.0",
- "engine.io": "^5.0.0",
- "engine.io-client": "^5.0.0",
- "express": "^4.17.1",
- "get-port": "^5.1.1",
- "is-port-free": "^1.0.7",
- "lasso-istanbul-instrument-transform": "^2.0.1",
- "lasso-marko": "^3.0.1",
- "lasso-package-root": "^1.0.1",
- "mocha": "^8.3.2",
- "mz": "^2.7.0",
- "node-fetch": "^2.6.1",
- "p-event": "^4.2.0",
- "parse-node-args": "^1.1.2",
- "raptor-renderer": "^1.5.0",
- "resolve-from": "^5.0.0",
- "strip-ansi": "6.0.0",
- "update-notifier": "^5.1.0",
- "wdio-chromedriver-service": "^6.0.0",
- "webdriverio": "^6.0.0"
- },
- "devDependencies": {
- "lasso": "^3.4.0"
- },
- "peerDependencies": {
- "chromedriver": "*",
- "lasso": "^2 || ^3 || ^4",
- "marko": "^4 || ^5"
- },
- "files": [
- "dist"
- ],
- "homepage": "https://github.com/marko-js/cli/tree/master/packages/test",
- "keywords": [
- "component",
- "marko",
- "test",
- "util",
- "utility"
- ],
- "license": "MIT",
- "main": "dist/index.js",
- "bin": {
- "marko-test": "./dist/bin.js"
- },
- "maintainers": [
- "Patrick Steele-Idem ",
- "Michael Rawlings ",
- "Austin Kelleher ",
- "Dylan Piercey "
- ],
- "repository": {
- "type": "git",
- "url": "https://github.com/marko-js/cli"
- }
-}
diff --git a/packages/test/src/bin.js b/packages/test/src/bin.js
deleted file mode 100644
index d58a2bbb..00000000
--- a/packages/test/src/bin.js
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-const updateNotifier = require("update-notifier");
-const { parse, run } = require("./cli");
-updateNotifier({ pkg: require("../package.json") }).notify();
-run(parse(process.argv.slice(2)));
diff --git a/packages/test/src/cli.js b/packages/test/src/cli.js
deleted file mode 100644
index 34b35813..00000000
--- a/packages/test/src/cli.js
+++ /dev/null
@@ -1,107 +0,0 @@
-const parseNodeArgs = require("parse-node-args");
-const details = require("../package.json");
-const MarkoDevTools = require("./util/MarkoDevTools");
-const markoTest = require(".");
-
-exports.parse = function parse(argv) {
- const { cliArgs, nodeArgs } = parseNodeArgs(argv);
- const options = require("argly")
- .createParser({
- "--help": {
- type: "string",
- description: "Show this help message"
- },
- "--server": {
- type: "boolean",
- description: "Run only server tests"
- },
- "--debug": {
- type: "boolean",
- description:
- "Does not shutdown the test server and disables headless mode for browser tests"
- },
- "--browser": {
- type: "boolean",
- description: "Run only browser tests"
- },
- "--files --file -f *": {
- type: "string[]",
- description: "File patterns to match tests to run"
- },
- "--version -v": {
- type: "boolean",
- descrption: `print ${details.name} version`
- }
- // TODO: Add `--test-template-path` option, which should ultimately map to
- // the `pageTemplate` option in the browser tests runner.
- })
- .usage("Usage: $0 [options]")
- .example("Run all tests", "$0")
- .example(
- "Run all tests for a single component",
- "marko test ./src/components/app-foo/**/test*.js"
- )
- .example(
- "Run all UI component tests",
- "marko test ./src/components/**/test*.js"
- )
- .example(
- "Run only server tests",
- "marko test ./src/components/**/test*server.js --server"
- )
- .example(
- "Run only browser tests",
- "marko test ./src/components/**/test*browser.js --browser"
- )
- .validate(function(result) {
- if (result.version) {
- console.log(`v${details.version}`);
- process.exit(0);
- }
-
- if (result.help) {
- this.printUsage();
- process.exit(0);
- }
- })
- .onError(function(err) {
- this.printUsage();
- console.error(err);
- process.exit(1);
- })
- .parse(cliArgs);
-
- options.patterns = options.files;
- options.nodeArgs = nodeArgs;
- delete options.files;
-
- return options;
-};
-
-exports.run = function run(options) {
- const markoCli = new MarkoDevTools();
- const {
- mochaOptions,
- lassoOptions,
- wdioOptions,
- testMatcher,
- workDir,
- browserTestDependencies
- } = markoCli.config;
-
- return markoTest.run(
- Object.assign(
- {
- mochaOptions,
- lassoOptions,
- wdioOptions,
- testMatcher,
- workDir,
- browserTestDependencies,
- dir: markoCli.cwd,
- cliRoot: markoCli.__dirname
- },
- options
- )
- );
-};
diff --git a/packages/test/src/index.js b/packages/test/src/index.js
deleted file mode 100644
index 149d7697..00000000
--- a/packages/test/src/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const path = require("path");
-const loadTests = require("./util/loadTests");
-const serverTestsRunner = require("./util/server-tests-runner");
-const browserTestsRunner = require("./util/browser-tests-runner");
-
-exports.run = function(options) {
- options.dir = options.dir || process.cwd();
- options.packageName = require(path.join(options.dir, "package.json")).name;
-
- if (options.server == null) {
- if (options.browser == null) {
- options.server = options.browser = true;
- } else {
- options.server = options.browser !== true;
- }
- }
-
- if (options.browser == null) {
- options.browser = options.server !== true;
- }
-
- if (!options.patterns || !options.patterns.length) {
- options.patterns = ["**/test.js", "**/test.*.js", "**/test/*.js"];
- }
-
- if (options.debug) {
- options.mochaOptions = options.mochaOptions || {};
- options.mochaOptions.timeout = 3600000;
- }
-
- return loadTests(options.dir, options.patterns, {
- testMatcher: options.testMatcher
- }).then(tests => {
- let promise = Promise.resolve();
-
- if (options.server) {
- promise = promise.then(() => {
- return serverTestsRunner.run(tests, options);
- });
- }
-
- if (options.browser) {
- promise = promise.then(() => {
- return browserTestsRunner.run(tests, options);
- });
- }
-
- return promise;
- });
-};
diff --git a/packages/test/src/util/MarkoDevTools.js b/packages/test/src/util/MarkoDevTools.js
deleted file mode 100644
index 6861849e..00000000
--- a/packages/test/src/util/MarkoDevTools.js
+++ /dev/null
@@ -1,72 +0,0 @@
-"use strict";
-
-const EventEmitter = require("events").EventEmitter;
-const lassoPackageRoot = require("lasso-package-root");
-const resolveFrom = require("resolve-from");
-const path = require("path");
-
-function getPackagePluginPath(markoCli, fileName) {
- const rootDir = markoCli._rootPackage.__dirname;
- try {
- return require.resolve(path.join(rootDir, fileName));
- } catch (err) {
- // Ignore error. The config file is optional.
- }
-}
-
-class MarkoDevTools extends EventEmitter {
- constructor(cwd) {
- super();
- this.cwd = cwd || process.cwd();
- this.__dirname = __dirname;
- this._rootPackage = lassoPackageRoot.getRootPackage(this.cwd);
- this.config = {
- workDir: path.join(this.packageRoot, ".marko-cli")
- };
-
- this._loadPackagePlugin();
- }
-
- get packageRoot() {
- return this._rootPackage ? this._rootPackage.__dirname : this.cwd;
- }
-
- requireFromRoot(path) {
- var resolvedPath;
-
- try {
- resolvedPath = resolveFrom(this.packageRoot, path);
- } catch (e) {
- // Ignore
- }
-
- return resolvedPath ? require(resolvedPath) : require(path);
- }
-
- configure(config) {
- Object.assign(this.config, config);
- }
-
- get commands() {
- return [];
- }
-
- hasCommand() {
- return false;
- }
-
- runCommand() {}
-
- _loadPackagePlugin() {
- if (this._rootPackage) {
- let packagePluginPath = getPackagePluginPath(this, "marko-cli");
-
- if (packagePluginPath) {
- var plugin = require(packagePluginPath);
- plugin(this);
- }
- }
- }
-}
-
-module.exports = MarkoDevTools;
diff --git a/packages/test/src/util/browser-tests-runner/browser-dependencies/.babelrc b/packages/test/src/util/browser-tests-runner/browser-dependencies/.babelrc
deleted file mode 100644
index 8395fd38..00000000
--- a/packages/test/src/util/browser-tests-runner/browser-dependencies/.babelrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "presets": [
- ["@babel/env", {
- "loose": true,
- "targets": {
- "browsers": ["extends @ebay/browserslist-config"]
- }
- }]
- ]
-}
diff --git a/packages/test/src/util/browser-tests-runner/browser-dependencies/index.js b/packages/test/src/util/browser-tests-runner/browser-dependencies/index.js
deleted file mode 100644
index 3918722f..00000000
--- a/packages/test/src/util/browser-tests-runner/browser-dependencies/index.js
+++ /dev/null
@@ -1,123 +0,0 @@
-const socket = require("engine.io-client")(`ws://${location.host}`);
-const stripAnsi = require("strip-ansi");
-const { inspect } = require("util");
-const path = require("path");
-const INSPECT_OPTIONS = { colors: true };
-const STACK_REGEXP = /(?:https?:\/\/[^:/]+(?::\d+)?\/)?static\/[^/]+\/(.+?)\$[^/]+(.+?)(?=:\d+:\d+)/g;
-
-// Capture client logs and forward to server.
-["log", "info", "warn", "trace", "error"].forEach(method => {
- const fn = console[method] || console.log || (() => {});
- console[method] = (...args) => {
- send(["console", method, args.map(inspectObject)]);
- fn.apply(console, args.map(stripAnsi));
- };
-});
-
-// Forward uncaught excpections.
-window.addEventListener("error", ev => {
- if (!window.__test_result__) {
- window.__test_result__ = { success: false };
- }
-
- console.error(ev.error);
- ev.preventDefault();
-});
-window.addEventListener("beforeunload", () => {
- if (!window.__test_result__) {
- // If the browser navigates before the tests have finished mark the test as failing.
- console.log(
- "\nBrowser unexpectedly navigated during tests." +
- "\n@marko/test does not support navigation.\n"
- );
- window.__test_result__ = { success: false };
- }
-});
-
-require("chai").config.includeStack = true;
-let options;
-
-try {
- options = JSON.parse(decodeURIComponent(window.location.search.slice(1)));
-} catch (_) {
- options = {};
-}
-
-const mocha = require("mocha/mocha");
-
-// Apply mocha options.
-const mochaOptions = {
- ...options.mochaOptions,
- reporter: "spec",
- useColors: true,
- ui: "bdd"
-};
-
-Object.keys(mochaOptions).forEach(key => {
- if (typeof mocha[key] === "function") {
- mocha[key](mochaOptions[key]);
- }
-});
-
-setTimeout(() => {
- if (window.__test_result__) {
- return;
- }
-
- const runner = mocha.run();
- const fails = [];
-
- runner.on("fail", (test, err) => {
- fails.push({
- name: test.title,
- result: false,
- message: err.message,
- stack: err.stack,
- titles: flattenTitles(test)
- });
- });
-
- runner.on("end", () => {
- window.mochaResults = runner.stats;
- window.mochaResults.reports = fails;
- window.__test_result__ = {
- success: !fails.length,
- coverage: window.__coverage__
- };
- });
-});
-
-function send(...args) {
- socket.send(JSON.stringify(args));
-}
-
-function flattenTitles(test) {
- var titles = [];
- while (test.parent.title) {
- titles.push(test.parent.title);
- test = test.parent;
- }
- return titles.reverse();
-}
-
-function inspectObject(val) {
- const result = isObject(val) ? inspect(val, INSPECT_OPTIONS) : val;
-
- if (typeof result === "string") {
- return result.replace(STACK_REGEXP, replaceStaticFilePath);
- }
-
- return result;
-}
-
-function isObject(val) {
- return val !== null && typeof val === "object";
-}
-
-function replaceStaticFilePath(_, pkg, filePath) {
- if (pkg === options.packageName) {
- return path.join(".", filePath);
- }
-
- return path.join("./node_modules", pkg, filePath);
-}
diff --git a/packages/test/src/util/browser-tests-runner/bundler.js b/packages/test/src/util/browser-tests-runner/bundler.js
deleted file mode 100644
index 6c02c0c9..00000000
--- a/packages/test/src/util/browser-tests-runner/bundler.js
+++ /dev/null
@@ -1,78 +0,0 @@
-const path = require("path");
-const lasso = require("lasso");
-const resolveFrom = require("resolve-from");
-const parseRequire = require("lasso/src/resolve/parseRequire");
-const shouldCover = !!process.env.NYC_CONFIG;
-const baseDependencies = [
- requireRunPrefix(require.resolve("./browser-dependencies")),
- "mocha/mocha.css"
-];
-
-exports.create = async (tests, options) => {
- const workDir = options.workDir;
- const outputDir = path.resolve(workDir, "browser-build");
- const testDependencies = tests.map(test => requireRunPrefix(test.file));
- const additionalDependencies = resolveTestDependencies(
- options.browserTestDependencies || [],
- options.dir
- );
- const customLassoOptions = options.lassoOptions || {};
- const lassoOptions = {
- outputDir: path.join(outputDir, "static"),
- urlPrefix: "/static",
- minify: false,
- bundlingEnabled: false,
- fingerprintsEnabled: false,
- ...customLassoOptions,
- require: { transforms: [], ...customLassoOptions.require },
- plugins: ["lasso-marko"].concat(customLassoOptions.plugins || [])
- };
-
- try {
- const markoWidgetsPath = resolveFrom(options.dir, "marko-widgets");
- if (markoWidgetsPath) {
- additionalDependencies.unshift(requireRunPrefix(markoWidgetsPath));
- }
- } catch (e) {
- // Ignore
- }
-
- // Allow for an environment variable or a test runner option
- if (shouldCover || options.testCoverage) {
- lassoOptions.require.transforms.push({
- transform: require("lasso-istanbul-instrument-transform"),
- config: {
- extensions: [".marko", ".js", ".es6"]
- }
- });
- }
-
- return {
- lasso: lasso.create(lassoOptions),
- browserDependencies: [].concat(
- baseDependencies,
- additionalDependencies,
- testDependencies
- )
- };
-};
-
-function resolveTestDependencies(deps, dir) {
- return deps.map(dep => {
- // resolve paths based on the project's directory
- if (typeof dep === "string" || dep instanceof String) {
- const parsed = parseRequire(dep);
- const type = parsed.type;
- const resolved = resolveFrom(dir, parsed.path);
- return type ? `${type}: ${resolved}` : resolved;
- } else if (dep.path) {
- dep.path = resolveFrom(dir, dep.path);
- }
-
- return dep;
- });
-}
-
-function requireRunPrefix(file) {
- return `require-run: ${file}`;
-}
diff --git a/packages/test/src/util/browser-tests-runner/driver.js b/packages/test/src/util/browser-tests-runner/driver.js
deleted file mode 100644
index e7f061f9..00000000
--- a/packages/test/src/util/browser-tests-runner/driver.js
+++ /dev/null
@@ -1,238 +0,0 @@
-const chalk = require("chalk");
-const delay = require("delay");
-const webdriver = require("webdriverio");
-const wdioDefaults = require("./util/wdio-defaults");
-const ensureCalled = require("./util/ensure-called");
-const { env } = process;
-const {
- BUILD_NUMBER = env.TRAVIS_BUILD_NUMBER || env.GITHUB_RUN_NUMBER,
- REPO_SLUG = env.TRAVIS_REPO_SLUG || env.GITHUB_REPOSITORY,
- PULL_REQUEST_SLUG = env.TRAVIS_PULL_REQUEST_SLUG || env.GITHUB_REF
-} = env;
-const TEST_NAME = `${REPO_SLUG} build #${BUILD_NUMBER}${
- PULL_REQUEST_SLUG ? ` (PR: ${PULL_REQUEST_SLUG})` : ""
-}`;
-const DEFAULT_VIEWPORT = {
- width: 800,
- height: 600
-};
-const DEFAULT_TIMEOUTS = {
- idle: 240000,
- suite: 600000
-};
-
-exports.start = async (href, options) => {
- let exitCode = 1;
- const {
- debug,
- packageName,
- mochaOptions,
- wdioOptions: { launcher, ...wdioOptions }
- } = options;
- const {
- viewport = DEFAULT_VIEWPORT,
- suiteTimeout = DEFAULT_TIMEOUTS.suite,
- idleTimeout = DEFAULT_TIMEOUTS.idle
- } = wdioOptions;
- const capabilities = wdioOptions.capabilities.map(cap => ({ ...cap }));
-
- wdioOptions.baseUrl = `${href}?${encodeURIComponent(
- JSON.stringify({ mochaOptions, packageName })
- )}`;
-
- await launcher.onPrepare(wdioOptions, wdioOptions.capabilities);
- await delay(wdioDefaults.startDelay); // Give the launcher some time to init.
- ensureCalled(() =>
- Promise.race([launcher.onComplete(exitCode, wdioOptions), delay(3000)])
- );
-
- return {
- async runTests() {
- const results = {};
- const coverages = [];
-
- for (const capability of capabilities) {
- let closed = false;
- const testName = getTestName(capability);
- console.log(`\n${format(testName, "starting...")}\n`);
- results[testName] = false;
-
- const browser = await webdriver.remote({
- ...wdioOptions,
- capabilities: {
- alwaysMatch: {
- ...capability,
- ...(wdioDefaults.name !== "chromedriver"
- ? {
- name: TEST_NAME,
- build: BUILD_NUMBER
- }
- : {})
- }
- }
- });
-
- ensureCalled(() => closed || browser.deleteSession());
-
- await browser.setTimeout({
- script: idleTimeout,
- implicit: idleTimeout,
- pageLoad: idleTimeout
- });
-
- let resizeAttempts = 2;
- // Some browser chromes change size when the window changes size.
- // Typically this is from going full screen to a smaller window.
- // Resizing twice avoids this issue.
- while (resizeAttempts--) {
- const curViewportSize = await browser.execute(function() {
- var el = document.documentElement;
- return {
- width: window.innerWidth || el.clientWidth,
- height: window.innerHeight || el.clientHeight
- };
- });
-
- if (
- viewport.width !== curViewportSize.width ||
- viewport.height !== curViewportSize.height
- ) {
- const curWindowSize = await (
- browser.getWindowSize || browser.getWindowRect
- ).call(browser);
- const newWidth =
- viewport.width + curWindowSize.width - curViewportSize.width;
- const newHeight =
- viewport.height + curWindowSize.height - curViewportSize.height;
- if (browser.setWindowSize) {
- await browser.setWindowSize(newWidth, newHeight);
- } else {
- await browser.setWindowRect(
- curWindowSize.x,
- curViewportSize.y,
- newWidth,
- newHeight
- );
- }
- } else {
- break;
- }
- }
-
- await browser.url("");
-
- try {
- const { success, coverage } = await waitForResults(browser, {
- suiteTimeout,
- idleTimeout
- });
-
- results[testName] = success;
-
- if (coverage) {
- coverages.push(coverage);
- }
- } catch (error) {
- console.error(error);
- } finally {
- if (await isAlive(browser)) {
- if (debug) {
- // Wait for the driver to die by pinging it every 3 seconds.
- do {
- await delay(3000);
- } while (await isAlive(browser));
- } else {
- await browser.deleteSession();
- }
- }
-
- closed = true;
- }
- }
-
- let success = true;
- console.log(
- "\n" +
- Object.keys(results)
- .map(name => {
- const passed = results[name];
- if (!passed) {
- success = false;
- }
-
- return format(name, passed ? chalk.green("โ") : chalk.red("โ"));
- })
- .join("\n") +
- "\n"
- );
- exitCode = success ? 0 : 1;
-
- return {
- success,
- coverages
- };
- }
- };
-};
-
-async function isAlive(browser) {
- try {
- await browser.getUrl();
- return true;
- } catch (_) {
- return false;
- }
-}
-
-async function waitForResults(browser, { suiteTimeout, idleTimeout }) {
- const endTime = Date.now() + suiteTimeout;
- const execInterval = Math.min(idleTimeout, DEFAULT_TIMEOUTS.idle) * 0.8;
- let result;
-
- do {
- // Some services force a max timeout for async scripts.
- // Below we restart the async script that waits for the tests to be done every 60 seconds.
- // The tests are 'complete' once the global '__test_result__' is set on the window.
- if (endTime < Date.now()) {
- throw new Error(
- '@marko/test: Test suite timed out, use "wdioOptions.suiteTimeout" to increase the delay (default 10 mins).'
- );
- }
-
- result = await browser.executeAsync(function(interval, done) {
- if (window.__test_result__) done(window.__test_result__);
- else {
- var timeout = setTimeout(function() {
- delete window.__test_result__;
- done();
- }, interval);
- Object.defineProperty(window, "__test_result__", {
- configurable: true,
- set: function(result) {
- clearTimeout(timeout);
- timeout = setTimeout(function() {
- done(result);
- }, 0);
- }
- });
- }
- }, execInterval);
- } while (!result);
-
- return result;
-}
-
-function getTestName(capability) {
- const browser = capability.browser || capability.browserName;
- const version =
- capability.browser_version || capability.platformVersion || "latest";
- const platform =
- (capability.os && `${capability.os} ${capability.os_version}`) ||
- capability.platformName;
-
- return `${browser}@${version}${platform ? ` on ${platform}` : ""}`;
-}
-
-function format(name, str) {
- return chalk.bgWhite(` ${chalk.black(chalk.bold(`${name}: ${str}`))} `);
-}
diff --git a/packages/test/src/util/browser-tests-runner/index.js b/packages/test/src/util/browser-tests-runner/index.js
deleted file mode 100644
index c8fbbceb..00000000
--- a/packages/test/src/util/browser-tests-runner/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const fs = require("mz/fs");
-const wdioDefaults = require("./util/wdio-defaults");
-const ensureCalled = require("./util/ensure-called");
-const createBundler = require("./bundler").create;
-const startServer = require("./server").start;
-const startDriver = require("./driver").start;
-
-exports.run = async (tests, options) => {
- tests = tests.filter(isBrowserTest);
-
- if (!tests.length) {
- return;
- }
-
- const wdioOptions = (options.wdioOptions = {
- ...wdioDefaults.defaults,
- ...options.wdioOptions,
- ...wdioDefaults.required
- });
-
- wdioOptions.launcher = wdioDefaults.getLauncher(
- options.dir,
- wdioOptions.capabilities,
- wdioOptions
- );
-
- if (wdioDefaults.name === "chromedriver") {
- const args = wdioOptions.capabilities[0]["goog:chromeOptions"].args;
-
- if (options.debug) {
- args.push("auto-open-devtools-for-tabs");
- } else {
- // Run chromedriver in headless mode unless running with debug option.
- args.push("headless", "disable-gpu");
- }
- }
-
- const bundler = await createBundler(tests, options);
- const server = await startServer(bundler, options);
- const driver = await startDriver(server.href, options);
- const { success, coverages } = await driver.runTests();
-
- await Promise.all([
- ensureCalled(),
- coverages.length &&
- Promise.all(
- coverages.map(coverage =>
- fs.writeFile(
- `./.nyc_output/${Math.floor(Math.random() * 100000000)}.json`,
- JSON.stringify(coverage)
- )
- )
- )
- ]);
-
- process.exit(success ? 0 : 1);
-};
-
-function isBrowserTest(test) {
- return test.env === "browser";
-}
diff --git a/packages/test/src/util/browser-tests-runner/server.js b/packages/test/src/util/browser-tests-runner/server.js
deleted file mode 100644
index a7000730..00000000
--- a/packages/test/src/util/browser-tests-runner/server.js
+++ /dev/null
@@ -1,79 +0,0 @@
-require("marko/node-require").install();
-
-const pEvent = require("p-event");
-const express = require("express");
-const engine = require("engine.io");
-const fetch = require("node-fetch");
-const wdioDefaults = require("./util/wdio-defaults");
-const ensureCalled = require("./util/ensure-called");
-let defaultPageTemplate = require("./template.marko");
-defaultPageTemplate = defaultPageTemplate.default || defaultPageTemplate;
-
-exports.start = async (templateData, options) => {
- const {
- serverPort = await wdioDefaults.getAvailablePort()
- } = options.wdioOptions;
- const pageTemplate = options.pageTemplate || defaultPageTemplate;
- const server = express()
- .use(require("lasso/middleware").serveStatic({ lasso: templateData.lasso }))
- .use(require("@marko/express").default())
- .get("/", (req, res) => {
- res.marko(pageTemplate, templateData);
- })
- .listen(serverPort);
- const wss = engine.attach(server);
-
- try {
- await pEvent(server, "listening");
- } catch (err) {
- if (err.code !== "EADDRINUSE") {
- throw err;
- }
-
- console.error(
- `@marko/test: Unable to start test server on port ${serverPort}.\n` +
- `You can use "wdioOptions.port" to override the port.\n` +
- `Keep in mind that selenium services such as saucelabs, browserstack and ` +
- `testingbot only work with certain ports when testing against Edge, IE and Safari.`
- );
-
- process.exit(1);
- }
-
- const { port } = server.address();
-
- if (!wdioDefaults.isValidPort(port)) {
- console.warn(
- `@marko/test: We noticed you are using port ${port} with the ${wdioDefaults.name} service.\n` +
- `This port is not in the list of known supported ports for that service and ` +
- `may cause issues when testing against Edge, IE and Safari.`
- );
- }
-
- if (options.debug) {
- console.log(`Server running at http://localhost:${port}`);
- }
-
- // Warmup lasso cache.
- const href = `http://localhost:${port}`;
- await (await fetch(href, { method: "GET" })).text();
-
- // Stream logs from client via websocket.
- wss.on("connection", socket =>
- socket.on("message", msg => {
- for (const [type, ...args] of JSON.parse(msg)) {
- if (type === "console") {
- const [method, parts] = args;
- console[method](...parts);
- }
- }
- })
- );
-
- ensureCalled(() => {
- server.close();
- return pEvent(server, "close");
- });
-
- return { href };
-};
diff --git a/packages/test/src/util/browser-tests-runner/template.marko b/packages/test/src/util/browser-tests-runner/template.marko
deleted file mode 100644
index ae6b425c..00000000
--- a/packages/test/src/util/browser-tests-runner/template.marko
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- Marko Widgets Tests
-
-
-
-
- 
- Parent Directory
-
-
- 
- ${dir}/
-
-
- 
- ${file}.marko
-
-
- 
-
-
-
- 
-
@@ -23,32 +15,70 @@
+
+
+ 
+
|
-| [serve](https://github.com/marko-js/cli/blob/master/packages/serve/README.md) | ๐ Serve a Marko application or individual component for local development | 
|
-| [build](https://github.com/marko-js/cli/blob/master/packages/build/README.md) | ๐ฆ Build an optimized Marko application (the production-ready counterpart to `serve`) | 
|
-| [migrate](https://github.com/marko-js/cli/blob/master/packages/migrate/README.md) | ๐งน Update Marko components to remove usage of deprecated apis | 
|
-| [prettyprint](https://github.com/marko-js/cli/blob/master/packages/prettyprint/README.md) | ๐
Reformat Marko source files for consistency and beauty | 
|
-| [test](https://github.com/marko-js/cli/blob/master/packages/test/README.md) | โ
Test marko components in both node and browsers | 
|
+## Usage
-Each command is distrubuted as a separate npm package (`@marko/
-
-
-
-
-
-
a.marko
a.marko
foo/
- 
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/image/static-expected.html b/packages/serve/test/fixtures/image/static-expected.html
deleted file mode 100644
index eb0c3d85..00000000
--- a/packages/serve/test/fixtures/image/static-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/packages/serve/test/fixtures/image/target/logo.png b/packages/serve/test/fixtures/image/target/logo.png
deleted file mode 100644
index ab7fdab4..00000000
Binary files a/packages/serve/test/fixtures/image/target/logo.png and /dev/null differ
diff --git a/packages/serve/test/fixtures/params-and-queries-deprecated/build-expected.html b/packages/serve/test/fixtures/params-and-queries-deprecated/build-expected.html
deleted file mode 100644
index 317234e6..00000000
--- a/packages/serve/test/fixtures/params-and-queries-deprecated/build-expected.html
+++ /dev/null
@@ -1 +0,0 @@
-
-
-