move i18n to core

lib/cmd.js

@@ -1,6 +1,6 @@
 const program = require('commander');
 const Embark = require('../lib/index');
-const i18n = require('./i18n/i18n.js');
+const i18n = require('./core/i18n/i18n.js');
 let embark = new Embark;
 
 class Cmd {

lib/core/i18n/i18n.js

@@ -8,7 +8,7 @@ i18n.configure({
   locales: supported_languages,
   register: global,
   updateFiles: false,
-  directory: path.join(__dirname, 'locales')
+  directory: path.join(__dirname, '../../../', 'locales')
 });
 
 function isSupported(locale) {

lib/versions/npmTimer.js

@@ -1,7 +1,8 @@
 const {PerformanceObserver, performance} = require('perf_hooks');
 require('colors');
 const utils = require('../utils/utils.js');
-const i18n = require('../i18n/i18n.js');
+// TODO: remove this
+const i18n = require('../../core/i18n/i18n.js');
 i18n.setOrDetectLocale('en');
 
 
@@ -13,17 +14,15 @@ class NpmTimer{
     this._showSpinner = options.showSpinner || false;
     this._spinnerStyle = options.spinnerStyle || 'dots';
     this._interval = options.interval || 750;
-    
+
     // define mark and measurement names
     this._startMark = 'downloadStart' + this._packageName + this._version;
     this._ongoingMark = 'downloadOngoingMark' + this._packageName + this._version;
     this._downloadOngoing = 'downloadOngoing' + this._packageName + this._version;
     this._endMark = 'downloadEnd' + this._packageName + this._version;
     this._downloadComplete = 'downloadComplete' + this._packageName + this._version;
-    
-    this.observer.observe({entryTypes: ['measure']});
 
-    
+    this.observer.observe({entryTypes: ['measure']});
   }
 
   get observer(){
@@ -31,7 +30,7 @@ class NpmTimer{
       this._observer = new PerformanceObserver((items) => {
         let entry;
         let strDuration;
-  
+
         // find any download ongoing measurements we've made
         entry = utils.last(items.getEntries().filter(entry => entry.name === this._downloadOngoing));
         if(entry){
@@ -42,14 +41,13 @@ class NpmTimer{
         else{
           // otherwise, find our download complete measurement
           entry = utils.last(items.getEntries().filter(entry => entry.name === this._downloadComplete));
-          
           if(entry){
             strDuration = __('Finished downloading and installing {{packageName}} {{version}} in {{duration}}ms', {packageName: this._packageName, version: this._version, duration: entry.duration});
             performance.clearMarks();
             if(this._spinner) this._spinner.succeed(strDuration);
           }
         }
-        
+
         // log our measurement and make it red if it has taken too long
         if(!this._showSpinner && entry && strDuration){
           if(entry.duration > 4000){
@@ -57,12 +55,12 @@ class NpmTimer{
           }
           this._logger.info(strDuration);
         }
-        
+
       });
     }
     return this._observer;
   }
-  
+
   start(){
     let self = this;
 
@@ -79,7 +77,7 @@ class NpmTimer{
 
     // mark our start time
     performance.mark(this._startMark);
-    
+
     // function that continually updates the console to show user that we're downloading a library
     this._intOngoingDownload = setInterval(
       function(){