remove xip (#2065)

Co-authored-by: Shane Osbourne <sosbourne@duckduckgo.com>

package.json

@@ -12,7 +12,7 @@
 		"lerna": "^6.1.0"
 	},
 	"dependencies": {
-		"@playwright/test": "^1.37.1",
+		"@playwright/test": "^1.43.0",
 		"rxjs": "^7.5.4",
 		"zod": "^3.22.2"
 	},

packages/browser-sync-client/lib/types.ts

@@ -56,7 +56,6 @@ export interface InitOptions {
     serveStatic: any[];
     scrollElementMapping: any[];
     scrollProportionally: boolean;
-    xip: boolean;
 }
 
 interface ISnippetOptions {

packages/browser-sync-client/lib/types/types.d.ts

@@ -60,7 +60,6 @@ interface IBrowserSyncOptions {
     serveStatic: any[];
     scrollElementMapping: any[];
     scrollProportionally: boolean;
-    xip: boolean;
 }
 interface ISnippetOptions {
     async: boolean;

packages/browser-sync-ui/test/opts.server.json

@@ -27,7 +27,6 @@
     },
     "open": false,
     "browser": "default",
-    "xip": false,
     "hostnameSuffix": false,
     "notify": true,
     "scrollProportionally": true,
@@ -95,4 +94,4 @@
         "path": "/browser-sync/browser-sync-client.js",
         "versioned": "/browser-sync/browser-sync-client.1.8.1.js"
     }
-}
+}

packages/browser-sync/cli-options/opts.start.json

@@ -75,10 +75,6 @@
     "type": "boolean",
     "desc": "Show a directory listing for the server"
   },
-  "xip": {
-    "type": "boolean",
-    "desc": "Use xip.io domain routing"
-  },
   "tunnel": {
     "desc": "Use a public URL"
   },

packages/browser-sync/lib/default-config.js

@@ -303,14 +303,6 @@ module.exports = {
      * @default null
      */
 
-    /**
-     * Some features of Browsersync (such as `xip` & `tunnel`) require an internet connection, but if you're
-     * working offline, you can reduce start-up time by setting this option to `false`
-     * @property online
-     * @type Boolean
-     * @default undefined
-     */
-
     /**
      * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
      * Can be `true`, `local`, `external`, `ui`, `ui-external`, `tunnel` or `false`
@@ -336,15 +328,6 @@ module.exports = {
      */
     cors: false,
 
-    /**
-     * Requires an internet connection - useful for services such as [Typekit](https://typekit.com/)
-     * as it allows you to configure domains such as `*.xip.io` in your kit settings
-     * @property xip
-     * @type Boolean
-     * @default false
-     */
-    xip: false,
-
     hostnameSuffix: false,
 
     /**

packages/browser-sync/lib/utils.ts

@@ -46,14 +46,8 @@ export function getUrlOptions(options: BsTempOptions): Map<string, string> {
     }
 
     const fn: typeof getHostIp = exports.getHostIp;
-    const external = xip(fn(options, devIp()), options);
-    let localhost = "localhost";
-
-    if (options.get("xip")) {
-        localhost = "127.0.0.1";
-    }
-
-    localhost = xip(localhost, options);
+    const external = hostnameSuffix(fn(options, devIp()), options);
+    const localhost = hostnameSuffix("localhost", options);
 
     return Immutable.fromJS(getUrls(external, localhost, scheme, options));
 }
@@ -231,16 +225,13 @@ export function fail(kill, errMessage, cb) {
 }
 
 /**
- * Add support for xip.io urls
+ * hostnameSuffix
  * @param {String} host
  * @param {Object} options
  * @returns {String}
  */
-export function xip(host, options) {
+export function hostnameSuffix(host, options) {
     var suffix = options.get("hostnameSuffix");
-    if (options.get("xip")) {
-        return host + ".xip.io";
-    }
     if (suffix) {
         return host + suffix;
     }

packages/browser-sync/test/specs/utils/utils.setUrlOptions.js

@@ -48,33 +48,6 @@ describe("Utils: creating URLs", function() {
             external: "http://" + external + ":3000"
         });
     });
-    it("should return the external/local with xip", function() {
-        var [opts, errors] = merge({
-            port: 3000,
-            server: true,
-            https: true,
-            online: true,
-            xip: true
-        });
-        var out = utils.getUrlOptions(opts);
-        assert.equal(out.get("local"), "https://127.0.0.1.xip.io:3000");
-        assert.equal(
-            out.get("external"),
-            "https://" + external + ".xip.io:3000"
-        );
-    });
-    it("should return the URLs when OFFLINE & XIP set", function() {
-        var [opts, errors] = merge({
-            port: 3000,
-            server: true,
-            scheme: "http",
-            online: false,
-            xip: true
-        });
-        assert.deepEqual(utils.getUrlOptions(opts).toJS(), {
-            local: "http://localhost:3000"
-        });
-    });
     it("should NOT ALLOW 'listen' and 'host' options if they differ", function() {
         var [opts, errors] = merge({
             port: 3000,