v1.8.0

im6 · Jul 6, 2021 · 3df1843 · 3df1843
1 parent 0f49c88
commit 3df1843
Show file tree

Hide file tree

Showing 5 changed files with 558 additions and 553 deletions.
diff --git a/package.json b/package.json
@@ -18,16 +18,16 @@
   },
   "dependencies": {
     "dotenv": "^10.0.0",
-    "eslint": "^7.27.0",
+    "eslint": "^7.30.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.3",
     "eslint-plugin-jest": "^24.3.6",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.23.2",
-    "jest": "^27.0.1",
-    "prettier": "^2.3.0",
-    "rxjs": "^7.1.0"
+    "jest": "^27.0.6",
+    "prettier": "^2.3.2",
+    "rxjs": "^7.2.0"
   }
 }
diff --git a/packages/admin/index.js b/packages/admin/index.js
@@ -1,7 +1,8 @@
-const { forkJoin } = require('rxjs');
 const prompts = require('prompts');
 const mysqlObservable = require('mysql-observable');
 
+const { sqlRes$ } = require('./observables');
+
 const githubUrlFormat = /^[a-zA-Z0-9-]+\/[a-zA-Z0-9-.]+$/;
 
 const generatePrompts = ([git, cate]) => {
@@ -135,11 +136,6 @@ const generatePrompts = ([git, cate]) => {
   });
 };
 
-const sqlRes$ = forkJoin([
-  mysqlObservable('SELECT * FROM git'),
-  mysqlObservable('SELECT * FROM category'),
-]);
-
 sqlRes$.subscribe({
   next: (twoTableRows) => {
     generatePrompts(twoTableRows);

diff --git a/packages/admin/observables.js b/packages/admin/observables.js
@@ -0,0 +1,11 @@
+const { forkJoin } = require('rxjs');
+const mysqlObservable = require('mysql-observable');
+
+const sqlRes$ = forkJoin([
+  mysqlObservable('SELECT * FROM git'),
+  mysqlObservable('SELECT * FROM category'),
+]);
+
+module.exports = {
+  sqlRes$,
+};
diff --git a/packages/javascript-fun/package.json b/packages/javascript-fun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-fun",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "source code generator for javascript.fun",
   "engines": {
     "node": ">=12.14.1"