Merge branch 'testmode'

Author: wdamien

gulpfile.babel.js

@@ -14,7 +14,7 @@ const rollup = require("rollup").rollup;
 const babel = require("rollup-plugin-babel");
 const terser = require("rollup-plugin-terser").terser;
 const replace = require("rollup-plugin-replace");
-const browser = require("browser-sync").create();
+const browser = require("browser-sync");
 const Vinyl = require("vinyl");
 const Buffer = require("buffer").Buffer;
 const del = require("del");
@@ -23,6 +23,9 @@ const createHash = require("crypto").createHash;
 const fs = require("fs");
 const basename = require("path").basename;
 
+let js_file = "regexr.js";
+let css_file = "regexr.css";
+
 // constants
 const isProduction = () => process.env.NODE_ENV === "production";
 const pkg = require("./package.json");
@@ -54,15 +57,14 @@ const serverCopyAndWatchGlob = [
 
 // tasks
 gulp.task("serve", () => {
-	browser.init({
-		server: {baseDir: "./"},
-		options: {ignored: "./dev/**/*"}
+	browser({
+		server: { baseDir: "./deploy/" },
 	});
 });
 
 gulp.task("watch", () => {
 	gulp.watch("./dev/src/**/*.js", gulp.series("js", "browserreload"));
-	gulp.watch("./index.html", gulp.series("browserreload"));
+	gulp.watch("./index.html", gulp.series("dev-html", "browserreload"));
 	gulp.watch("./dev/icons/*.svg", gulp.series("icons"));
 	gulp.watch("./dev/inject/*", gulp.series("inject", "browserreload"));
 	gulp.watch("./dev/sass/**/*.scss", gulp.series("sass"));
@@ -98,7 +100,7 @@ gulp.task("js", () => {
 		bundleCache = bundle.cache;
 		return bundle.write({
 			format: "iife",
-			file: "./deploy/regexr.js",
+			file: `./deploy/${js_file}`,
 			name: "regexr",
 			sourcemap: !isProduction()
 		})
@@ -120,7 +122,7 @@ gulp.task("sass-themes", gulp.parallel(themes.map(theme => `sass-${theme}`)));
 
 const defaultSass = () => {
 	const str = buildSass("default")
-		.pipe(rename("regexr.css"))
+		.pipe(rename(css_file))
 		.pipe(gulp.dest("deploy"));
 
 	return isProduction()
@@ -134,8 +136,8 @@ gulp.task("sass", gulp.series(defaultSass, "sass-themes"));
 gulp.task("html", () => {
 	return gulp.src("./index.html")
 		.pipe(template({
-			js_version: createFileHash("deploy/regexr.js"),
-			css_version: createFileHash("deploy/regexr.css")
+			js_file,
+			css_file,
 		}))
 		.pipe(htmlmin({
 			collapseWhitespace: true,
@@ -145,6 +147,29 @@ gulp.task("html", () => {
 		.pipe(gulp.dest("build"));
 });
 
+gulp.task("dev-html", () => {
+	return gulp.src("./index.html")
+		.pipe(template({
+			js_file,
+			css_file,
+		}))
+		.pipe(htmlmin({
+			collapseWhitespace: true,
+			conservativeCollapse: true,
+			removeComments: true
+		}))
+		.pipe(gulp.dest("deploy"));
+});
+
+
+gulp.task("createFileHashes", (cb) => {
+	const js_version = createFileHash(`deploy/regexr.js`);
+	const css_version = createFileHash("deploy/regexr.css");
+	js_file = `deploy/${js_version}.js`;
+	css_file = `deploy/${css_version}.css`;
+	cb();
+});
+
 gulp.task("icons", () => {
 	return gulp.src("dev/icons/*.svg")
 		// strip fill attributes and style tags to facilitate CSS styling:
@@ -197,20 +222,38 @@ gulp.task("copy-server", () => {
 	.pipe(gulp.dest("./build/"));
 });
 
+gulp.task("rename-css", () => {
+	return gulp.src("./build/deploy/regexr.css")
+		.pipe(rename(basename(css_file)))
+		.pipe(gulp.dest("./build/deploy/"));
+});
+
+gulp.task("rename-js", () => {
+	return gulp.src("./build/deploy/regexr.js")
+		.pipe(rename(basename(js_file)))
+		.pipe(gulp.dest("./build/deploy/"));
+});
+
+gulp.task("clean-build", () => {
+	return del([
+		"./build/deploy/regexr.*",
+	]);
+})
 
 gulp.task("build", gulp.parallel("js", "sass"));
 gulp.task("server", gulp.series("copy-server", "watch-server"));
+gulp.task("rename", gulp.parallel("rename-css", "rename-js"));
 
 gulp.task("default",
-	gulp.series("build",
+	gulp.series("build","dev-html",
 		gulp.parallel("serve", "watch")
 	)
 );
 
 gulp.task("deploy",
 	gulp.series(
 		cb => (process.env.NODE_ENV = "production") && cb(),
-		"clean", "build", "html", "copy"
+		"clean", "build", "createFileHashes", "html", "copy", "rename", "clean-build"
 	)
 );
 

index.html

@@ -13,7 +13,7 @@
 	gtag('config', 'UA-3579542-6');
 	</script>
 
-	<link rel="stylesheet" type="text/css" href="deploy/regexr.css?v=<%= css_version %>">
+	<link rel="stylesheet" type="text/css" href="<%= css_file %>">
 
 	<!-- basic meta tags -->
 	<meta name="title" content="RegExr: Learn, Build, & Test RegEx" />
@@ -78,7 +78,7 @@
 				</a></li>
 			</ul>
 		</header>
-		
+
 		<div class="app">
 			<aside class="sidebar">
 				<div class="full">
@@ -117,11 +117,11 @@ <h1 class="label">Menu</h1>
 									.native-js {
 										background: linear-gradient(-30deg, #native_bg_color#E5, #native_bg_color#E5 45%, #native_bg_color# 45%) #fff;
 									}
-						
+
 									.native-details {
 										color: #native_color# !important;
 									}
-						
+
 									.native-details:hover {
 										color: #native_color_hover# !important;
 									}
@@ -140,12 +140,12 @@ <h1 class="label">Menu</h1>
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="min">
 					<ul class="list"></ul>
 				</div>
 			</aside>
-			
+
 			<div class="doc">
 				<div class="blocker"></div>
 				<section class="expression">
@@ -166,7 +166,7 @@ <h1>Expression</h1>
 					</header>
 					<article class="editor"><svg class="icon alert"><use xlink:href="#alert"></use></svg></article>
 				</section>
-				
+
 				<section class="text">
 					<header>
 						<h1>
@@ -204,7 +204,7 @@ <h1>
 						</div>
 					</div>
 				</section>
-				
+
 				<section class="tools">
 					<header>
 						<h1>Tools</h1>
@@ -224,12 +224,12 @@ <h1>Tools</h1>
 		</div>
 	</div>
 	<div id="library" style="display:none;">
-		
+
 		<div id="tooltip" class="tooltip">
 			<svg class="tip"><use xlink:href="#dropdown"></use></svg>
 			<div class="content"></div>
 		</div>
-		
+
 		<div id="tooltip-flavor">
 			<header>
 				<h1>RegEx Engine</h1>
@@ -238,7 +238,7 @@ <h1>RegEx Engine</h1>
 			<hr>
 			<ul class="list"></ul>
 		</div>
-		
+
 		<div id="tooltip-flags">
 			<header>
 				<h1>Expression Flags</h1>
@@ -247,11 +247,11 @@ <h1>Expression Flags</h1>
 			<hr>
 			<ul class="list"></ul>
 		</div>
-		
+
 		<div id="tooltip-testtypes">
 			<ul class="list"></ul>
 		</div>
-		
+
 		<div id="tooltip-signin">
 			<div class="signin">
 				<header>
@@ -283,7 +283,7 @@ <h1>Sign Out</h1>
 				One moment...
 			</div>
 		</div>
-		
+
 		<div id="cheatsheet">
 			<table class="cheatsheet">
 				<tr><th colspan="2" data-id="charclasses">Character classes</th></tr>
@@ -293,23 +293,23 @@ <h1>Sign Out</h1>
 				<tr><td>[abc]</td><td>any of a, b, or c</td></tr>
 				<tr><td>[^abc]</td><td>not a, b, or c</td></tr>
 				<tr><td>[a-g]</td><td>character between a & g</td></tr>
-	
+
 				<tr><th colspan="2" data-id="anchors">Anchors</th></tr>
 				<tr><td>^abc$</td><td>start / end of the string</td></tr>
 				<tr><td>\b  \B</td><td>word, not-word boundary</td></tr>
-	
+
 				<tr><th colspan="2" data-id="escchars">Escaped characters</th></tr>
 				<tr><td>\.  \*  \\</td><td>escaped special characters</td></tr>
 				<tr><td>\t  \n  \r</td><td>tab, linefeed, carriage return</td></tr>
 				<!-- <tr><td>\u00A9</td><td>unicode escaped &copy;</td></tr> -->
-	
+
 				<tr><th colspan="2" data-id="groups">Groups & Lookaround</th></tr>
 				<tr><td>(abc)</td><td>capture group</td></tr>
 				<tr><td>\1</td><td>backreference to group #1</td></tr>
 				<tr><td>(?:abc)</td><td>non-capturing group</td></tr>
 				<tr><td>(?=abc)</td><td>positive lookahead</td></tr>
 				<tr><td>(?!abc)</td><td>negative lookahead</td></tr>
-	
+
 				<tr><th colspan="2" data-id="quants">Quantifiers & Alternation</th></tr>
 				<tr><td>a*  a+  a?</td><td>0 or more, 1 or more, 0 or 1</td></tr>
 				<tr><td>a{5} a{2,}</td><td>exactly five, two or more</td></tr>
@@ -318,7 +318,7 @@ <h1>Sign Out</h1>
 				<tr><td>ab|cd</td><td>match ab or cd</td></tr>
 			</table>
 		</div>
-		
+
 		<div id="community" class="community">
 			<header>
 				<div class="label name"></div>
@@ -346,7 +346,7 @@ <h1>Sign Out</h1>
 			<div class="author"></div>
 			<hr>
 		</div>
-		
+
 		<div id="share">
 			<!-- holds all the elements used in the Save & Share section -->
 			<div id="share_main">
@@ -406,7 +406,7 @@ <h1>Sign Out</h1>
 					</div>
 				</div>
 			</div>
-			
+
 			<div id="share_community">
 				Edit or add extra information to help people find this expression.
 				<div class="inputs">
@@ -442,8 +442,8 @@ <h1><input type="text" class="name" placeholder="Untitled Test"></input></h1>
 			</article>
 		</div>
 	</div>
-	
-	<script src="deploy/regexr.js?v=<%= js_version %>"></script>
+
+	<script src="<%= js_file %>"></script>
 	<script id="phpinject">
 		/** INJECTED BY PHP **/
 		// first param false indicates a local init.

server/actions/account/login.php

@@ -31,19 +31,16 @@ public function execute() {
     function tryLogin($type) {
         $session = new \core\Session($this->db, SESSION_NAME);
         $exception = null;
+        $adapter = null;
 
         $auth = new \core\Authentication();
         try {
             $adapter = $auth->connect($type);
-
-            if (!$adapter->isConnected()) {
-                $adapter->authenticate();
-            }
         } catch (\Exception $ex) {
             $exception = $ex;
         }
 
-        if ($adapter->isConnected()) {
+        if (!is_null($adapter) && $adapter->isConnected()) {
             $userProfile = null;
 
             try {

server/actions/regex/solve.php

@@ -79,7 +79,7 @@ function runTests($tests, $pattern, $modifiers, $global, $requestId) {
             // Stop capturing warnings.
             restore_error_handler();
 
-            if ($match === 1) {
+            if ($match > 0) {
                 $testResults[] = [
                     "id" => $id,
                     "i" => $matches[0][0][1],

server/composer.json

@@ -1,7 +1,7 @@
 {
   "require": {
 		"respect/validation": "1.1.12",
-		"hybridauth/hybridauth": "v3.0.0-rc.9"
+		"hybridauth/hybridauth": "v3.2.0"
   },
   "require-dev": {
   }