refactor(nms): Move babel-register out of fbc_js_core

Signed-off-by: Thomas Schmitt <thomas.schmitt@tngtech.com>
magma · May 10, 2022 · 197b842 · 197b842
1 parent 59843c3
commit 197b842
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 35 deletions.
diff --git a/nms/.eslintrc.js b/nms/.eslintrc.js
@@ -255,9 +255,9 @@ module.exports = {
       files: [
         '.eslintrc.js',
         'babel.config.js',
+        'babelRegister.js',
         'jest.config.js',
         'jest.*.config.js',
-        'fbc_js_core/babel_register/*.js',
         'fbc_js_core/express_middleware/**/*.js',
         'fbc_js_core/platform_server/**/*.js',
         'fbc_js_core/sequelize_models/**/*.js',

diff --git a/nms/.flowconfig b/nms/.flowconfig
@@ -28,7 +28,7 @@
 // TODO - fix flow error in core packages
 .*/fbc_js_core/ui/insights/Alarms/AlarmApi.js
 .*/fbc_js_core/platform_server/network/routes.js
-.*/fbc_js_core/babel_register
+.*/babelRegister.js
 
 [options]
 esproposal.optional_chaining=enable

diff --git a/nms/README.md b/nms/README.md
@@ -68,7 +68,7 @@ magmalte_1     | [nodemon] to restart at any time, enter `rs`
 magmalte_1     | [nodemon] or send SIGHUP to 48 to restart
 magmalte_1     | [nodemon] watching path(s): config/**/* scripts/**/* server/**/* grafana/**/* alerts/**/*
 magmalte_1     | [nodemon] watching extensions: js,mjs,json
-magmalte_1     | [nodemon] starting `node -r ./fbc_js_core/babel_register/index.js scripts/server.js`
+magmalte_1     | [nodemon] starting `node -r ./babelRegister.js scripts/server.js`
 magmalte_1     | [nodemon] spawning
 magmalte_1     | [nodemon] child pid: 60
 magmalte_1     | [nodemon] watching 39 files

diff --git a/nms/app/common/UserModel.js b/nms/app/common/UserModel.js
diff --git a/nms/fbc_js_core/babel_register/polyfill.js → nms/app/common/polyfill.js b/nms/fbc_js_core/babel_register/polyfill.js → nms/app/common/polyfill.js
diff --git a/nms/app/host.js b/nms/app/host.js
@@ -14,7 +14,7 @@
  * @format
  */
 
-import '../fbc_js_core/babel_register/polyfill';
+import './common/polyfill';
 
 import Index from './components/host/Index';
 import React from 'react';

diff --git a/nms/app/login.js b/nms/app/login.js
@@ -15,6 +15,8 @@
  */
 'use strict';
 
+import './common/polyfill';
+
 import {} from './common/axiosConfig';
 import LoginForm from '../fbc_js_core/ui/components/auth/LoginForm.js';
 import React from 'react';

diff --git a/nms/app/main.js b/nms/app/main.js
@@ -15,7 +15,7 @@
  */
 'use strict';
 
-import '../fbc_js_core/babel_register/polyfill';
+import './common/polyfill';
 
 import Main from './components/Main';
 import MomentUtils from '@date-io/moment';

diff --git a/nms/fbc_js_core/babel_register/index.js → nms/babelRegister.js b/nms/fbc_js_core/babel_register/index.js → nms/babelRegister.js
diff --git a/nms/fbc_js_core/sequelize_models/dbDataMigration.js b/nms/fbc_js_core/sequelize_models/dbDataMigration.js
@@ -36,7 +36,7 @@
  * --confirm:           skip final confirmation to run migration
  *
  * Example Usage:
- *  $ node -r ../../fbc_js_core/babel_register main.js
+ *  $ node -r ../../babelRegister.js main.js
  *  ? Enter DB host: mariadb
  *  ? Enter DB port: 3306
  *  ? Enter DB database name: nms

diff --git a/nms/fbc_js_core/sequelize_models/sequelizerc.js b/nms/fbc_js_core/sequelize_models/sequelizerc.js
@@ -15,7 +15,7 @@
  */
 
 // $FlowIgnore[untyped-import]
-require('../../fbc_js_core/babel_register');
+require('../../babelRegister');
 
 const path = require('path');
 

diff --git a/nms/nodemon.json b/nms/nodemon.json
@@ -7,5 +7,5 @@
     "grafana/",
     "alerts/"
   ],
-  "exec": "node -r './fbc_js_core/babel_register/index.js'"
+  "exec": "node -r './babelRegister.js'"
 }
diff --git a/nms/package.json b/nms/package.json
@@ -148,14 +148,14 @@
     "test:ci": "NODE_ENV=test jest -w 1 --testPathIgnorePatterns=e2e",
     "flow": "flow",
     "flow-typed-install": "flow-typed --flowVersion $(flow version --json | jq -r .semver) install --",
-    "build": "rimraf static/dist && NODE_ENV=production node -r ./fbc_js_core/babel_register/index.js ./node_modules/webpack/bin/webpack --config ./config/webpack.production.config.js",
-    "cmd": "node -r ./fbc_js_core/babel_register/index.js",
+    "build": "rimraf static/dist && NODE_ENV=production node -r ./babelRegister.js ./node_modules/webpack/bin/webpack --config ./config/webpack.production.config.js",
+    "cmd": "node -r ./babelRegister.js",
     "start": "yarn run start:dev",
     "start:dev": "nodemon scripts/server",
-    "start:prod": "NODE_ENV=production node -r ./fbc_js_core/babel_register/index.js scripts/server",
-    "migrate": "node -r ./fbc_js_core/babel_register/index.js scripts/migrate.js",
-    "setAdminPassword": "node -r ./fbc_js_core/babel_register/index.js scripts/setPassword.js",
-    "createOrganization": "node -r ./fbc_js_core/babel_register/index.js scripts/createOrganization.js",
-    "mockserver": "node -r ./fbc_js_core/babel_register/index.js scripts/mockServer.js"
+    "start:prod": "NODE_ENV=production node -r ./babelRegister.js scripts/server",
+    "migrate": "node -r ./babelRegister.js scripts/migrate.js",
+    "setAdminPassword": "node -r ./babelRegister.js scripts/setPassword.js",
+    "createOrganization": "node -r ./babelRegister.js scripts/createOrganization.js",
+    "mockserver": "node -r ./babelRegister.js scripts/mockServer.js"
   }
 }