refactor: use latest terminology (#3775)

Author: snitin315

.gitignore

@@ -15,7 +15,7 @@ yarn-error.log
 
 .eslintcache
 
-test/fixtures/contentbase-config/public/assets/non-exist.txt
+test/fixtures/static-config/public/assets/non-exist.txt
 test/fixtures/reload-config/main.css
 test/fixtures/reload-config-2/main.css
-!/test/fixtures/contentbase-config/public/node_modules
+!/test/fixtures/static-config/public/node_modules

test/fixtures/historyapifallback-3-config/index.html

@@ -1 +1 @@
-contentBase file
+static file

test/fixtures/contentbase-config/foo.js renamed to test/fixtures/static-config/foo.js

@@ -8,10 +8,7 @@ const Server = require("../../lib/Server");
 const config = require("../fixtures/simple-config/webpack.config");
 const port = require("../ports-map")["host-option"];
 
-const staticDirectory = path.resolve(
-  __dirname,
-  "../fixtures/contentbase-config"
-);
+const staticDirectory = path.resolve(__dirname, "../fixtures/static-config");
 const internalIPv4 = internalIp.v4.sync();
 
 describe("host option", () => {

test/fixtures/contentbase-config/other/foo.html renamed to test/fixtures/static-config/other/foo.html

@@ -5,12 +5,12 @@ const http2 = require("http2");
 const webpack = require("webpack");
 const request = require("supertest");
 const Server = require("../../lib/Server");
-const config = require("../fixtures/contentbase-config/webpack.config");
+const config = require("../fixtures/static-config/webpack.config");
 const port = require("../ports-map")["http2-option"];
 
 const staticDirectory = path.resolve(
   __dirname,
-  "../fixtures/contentbase-config/public"
+  "../fixtures/static-config/public"
 );
 
 describe('"http2" option', () => {

test/fixtures/contentbase-config/public/assets/example.txt renamed to test/fixtures/static-config/public/assets/example.txt

@@ -5,17 +5,17 @@ const fs = require("graceful-fs");
 const request = require("supertest");
 const webpack = require("webpack");
 const Server = require("../../lib/Server");
-const config = require("../fixtures/contentbase-config/webpack.config");
+const config = require("../fixtures/static-config/webpack.config");
 const { skipTestOnWindows } = require("../helpers/conditional-test");
 const port = require("../ports-map")["https-option"];
 
 const httpsCertificateDirectory = path.resolve(
   __dirname,
   "../fixtures/https-certificate"
 );
-const contentBasePublic = path.resolve(
+const staticDirectory = path.resolve(
   __dirname,
-  "../fixtures/contentbase-config/public"
+  "../fixtures/static-config/public"
 );
 
 describe("https option", () => {
@@ -29,7 +29,7 @@ describe("https option", () => {
       server = new Server(
         {
           static: {
-            directory: contentBasePublic,
+            directory: staticDirectory,
             watch: false,
           },
           https: true,
@@ -62,7 +62,7 @@ describe("https option", () => {
       server = new Server(
         {
           static: {
-            directory: contentBasePublic,
+            directory: staticDirectory,
             watch: false,
           },
           https: {
@@ -108,7 +108,7 @@ describe("https option", () => {
 
       server = new Server(
         {
-          static: contentBasePublic,
+          static: staticDirectory,
           https: {
             cacert: path.join(httpsCertificateDirectory, "ca.pem"),
             pfx: path.join(httpsCertificateDirectory, "server.pfx"),
@@ -149,7 +149,7 @@ describe("https option", () => {
       server = new Server(
         {
           static: {
-            directory: contentBasePublic,
+            directory: staticDirectory,
             watch: false,
           },
           https: {
@@ -188,7 +188,7 @@ describe("https option", () => {
       server = new Server(
         {
           static: {
-            directory: contentBasePublic,
+            directory: staticDirectory,
             watch: false,
           },
           https: {
@@ -236,7 +236,7 @@ describe("https option", () => {
       server = new Server(
         {
           static: {
-            directory: contentBasePublic,
+            directory: staticDirectory,
             watch: false,
           },
           https: {

test/fixtures/contentbase-config/public/assets/other.txt renamed to test/fixtures/static-config/public/assets/other.txt

@@ -7,10 +7,7 @@ const Server = require("../../lib/Server");
 const config = require("../fixtures/simple-config/webpack.config");
 const port = require("../ports-map")["port-option"];
 
-const staticDirectory = path.resolve(
-  __dirname,
-  "../fixtures/contentbase-config"
-);
+const staticDirectory = path.resolve(__dirname, "../fixtures/static-config");
 
 describe('"port" option', () => {
   let server = null;

test/fixtures/contentbase-config/public/bar/index.html renamed to test/fixtures/static-config/public/bar/index.html

@@ -6,13 +6,10 @@ const webpack = require("webpack");
 const request = require("supertest");
 const Server = require("../../lib/Server");
 const testServer = require("../helpers/test-server");
-const config = require("../fixtures/contentbase-config/webpack.config");
+const config = require("../fixtures/static-config/webpack.config");
 const port = require("../ports-map")["static-directory-option"];
 
-const staticDirectory = path.resolve(
-  __dirname,
-  "../fixtures/contentbase-config"
-);
+const staticDirectory = path.resolve(__dirname, "../fixtures/static-config");
 const publicDirectory = path.resolve(staticDirectory, "public");
 const otherPublicDirectory = path.resolve(staticDirectory, "other");
 

test/fixtures/contentbase-config/public/foo.wasm renamed to test/fixtures/static-config/public/foo.wasm

@@ -4,13 +4,10 @@ const path = require("path");
 const request = require("supertest");
 const webpack = require("webpack");
 const Server = require("../../lib/Server");
-const config = require("../fixtures/contentbase-config/webpack.config");
+const config = require("../fixtures/static-config/webpack.config");
 const port = require("../ports-map")["static-public-path-option"];
 
-const staticDirectory = path.resolve(
-  __dirname,
-  "../fixtures/contentbase-config"
-);
+const staticDirectory = path.resolve(__dirname, "../fixtures/static-config");
 const publicDirectory = path.resolve(staticDirectory, "public");
 const otherPublicDirectory = path.resolve(staticDirectory, "other");
 const staticPublicPath = "/serve-content-base-at-this-url";

test/fixtures/contentbase-config/public/index.html renamed to test/fixtures/static-config/public/index.html

@@ -5,13 +5,10 @@ const webpack = require("webpack");
 const fs = require("graceful-fs");
 const chokidar = require("chokidar");
 const Server = require("../../lib/Server");
-const config = require("../fixtures/contentbase-config/webpack.config");
+const config = require("../fixtures/static-config/webpack.config");
 const port = require("../ports-map")["watch-files-option"];
 
-const watchDir = path.resolve(
-  __dirname,
-  "../fixtures/contentbase-config/public"
-);
+const watchDir = path.resolve(__dirname, "../fixtures/static-config/public");
 
 describe("'watchFiles' option", () => {
   let server;