Changed import statements to require to reduce dependency to Babel

CliClient/app/ResourceServer.js

@@ -1,7 +1,7 @@
-import { _ } from 'lib/locale.js'
-import { Logger } from 'lib/logger.js';
-import { Resource } from 'lib/models/resource.js';
-import { netUtils } from 'lib/net-utils.js'
+const { _ } = require('lib/locale.js');
+const { Logger } = require('lib/logger.js');
+const { Resource } = require('lib/models/resource.js');
+const { netUtils } = require('lib/net-utils.js');
 
 const http = require("http");
 const urlParser = require("url");

CliClient/app/app-gui.js

@@ -1,13 +1,13 @@
-import { Logger } from 'lib/logger.js';
-import { Folder } from 'lib/models/folder.js';
-import { Tag } from 'lib/models/tag.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Note } from 'lib/models/note.js';
-import { Resource } from 'lib/models/resource.js';
-import { cliUtils } from './cli-utils.js';
-import { reducer, defaultState } from 'lib/reducer.js';
-import { reg } from 'lib/registry.js';
-import { _ } from 'lib/locale.js';
+const { Logger } = require('lib/logger.js');
+const { Folder } = require('lib/models/folder.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { cliUtils } = require('./cli-utils.js');
+const { reducer, defaultState } = require('lib/reducer.js');
+const { reg } = require('lib/registry.js');
+const { _ } = require('lib/locale.js');
 
 const chalk = require('chalk');
 const tk = require('terminal-kit');

CliClient/app/app.js

@@ -1,23 +1,23 @@
-import { createStore, applyMiddleware } from 'redux';
-import { reducer, defaultState } from 'lib/reducer.js';
-import { JoplinDatabase } from 'lib/joplin-database.js';
-import { Database } from 'lib/database.js';
-import { FoldersScreenUtils } from 'lib/folders-screen-utils.js';
-import { DatabaseDriverNode } from 'lib/database-driver-node.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
-import { Setting } from 'lib/models/setting.js';
-import { Logger } from 'lib/logger.js';
-import { sprintf } from 'sprintf-js';
-import { reg } from 'lib/registry.js';
-import { fileExtension } from 'lib/path-utils.js';
-import { _, setLocale, defaultLocale, closestSupportedLocale } from 'lib/locale.js';
-import os from 'os';
-import fs from 'fs-extra';
-import { cliUtils } from './cli-utils.js';
+const { createStore, applyMiddleware } = require('redux');
+const { reducer, defaultState } = require('lib/reducer.js');
+const { JoplinDatabase } = require('lib/joplin-database.js');
+const { Database } = require('lib/database.js');
+const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
+const { DatabaseDriverNode } = require('lib/database-driver-node.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { Setting } = require('lib/models/setting.js');
+const { Logger } = require('lib/logger.js');
+const { sprintf } = require('sprintf-js');
+const { reg } = require('lib/registry.js');
+const { fileExtension } = require('lib/path-utils.js');
+const { _, setLocale, defaultLocale, closestSupportedLocale } = require('lib/locale.js');
+const os = require('os');
+const fs = require('fs-extra');
+const { cliUtils } = require('./cli-utils.js');
 const EventEmitter = require('events');
 
 class Application {

CliClient/app/base-command.js

@@ -1,5 +1,5 @@
-import { _ } from 'lib/locale.js';
-import { reg } from 'lib/registry.js';
+const { _ } = require('lib/locale.js');
+const { reg } = require('lib/registry.js');
 
 class BaseCommand {
 

CliClient/app/build-doc.js

@@ -1,10 +1,10 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import fs from 'fs-extra';
-import { fileExtension, basename, dirname } from 'lib/path-utils.js';
-import wrap_ from 'word-wrap';
-import { _, setLocale, languageCode } from 'lib/locale.js';
+const fs = require('fs-extra');
+const { fileExtension, basename, dirname } = require('lib/path-utils.js');
+const wrap_ = require('word-wrap');
+const { _, setLocale, languageCode } = require('lib/locale.js');
 
 const rootDir = dirname(dirname(__dirname));
 const MAX_WIDTH = 78;

CliClient/app/build-translation.js

@@ -7,9 +7,9 @@ const processArgs = process.argv.splice(2, process.argv.length);
 
 const silentLog = processArgs.indexOf('--silent') >= 0;
 
-import { basename, dirname } from 'lib/path-utils.js';
-import fs from 'fs-extra';
-import gettextParser from 'gettext-parser';
+const { basename, dirname } = require('lib/path-utils.js');
+const fs = require('fs-extra');
+const gettextParser = require('gettext-parser');
 
 const rootDir = dirname(dirname(__dirname));
 const cliDir = rootDir + '/CliClient';

CliClient/app/build-website.js

@@ -1,10 +1,10 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import fs from 'fs-extra';
-import { fileExtension, basename, dirname } from 'lib/path-utils.js';
-import { _, setLocale, languageCode } from 'lib/locale.js';
-import marked from 'lib/marked.js';
+const fs = require('fs-extra');
+const { fileExtension, basename, dirname } = require('lib/path-utils.js');
+const { _, setLocale, languageCode } = require('lib/locale.js');
+const marked = require('lib/marked.js');
 
 const headerHtml = `
 <!doctype html>

CliClient/app/cli-integration-tests.js

@@ -3,16 +3,16 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import fs from 'fs-extra';
-import { Logger } from 'lib/logger.js';
-import { dirname } from 'lib/path-utils.js';
-import { DatabaseDriverNode } from 'lib/database-driver-node.js';
-import { JoplinDatabase } from 'lib/joplin-database.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { sprintf } from 'sprintf-js';
+const fs = require('fs-extra');
+const { Logger } = require('lib/logger.js');
+const { dirname } = require('lib/path-utils.js');
+const { DatabaseDriverNode } = require('lib/database-driver-node.js');
+const { JoplinDatabase } = require('lib/joplin-database.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { sprintf } = require('sprintf-js');
 const exec = require('child_process').exec
 
 process.on('unhandledRejection', (reason, p) => {

CliClient/app/cli-utils.js

@@ -1,6 +1,6 @@
-import yargParser from 'yargs-parser';
-import { _ } from 'lib/locale.js';
-import { time } from 'lib/time-utils.js';
+const yargParser = require('yargs-parser');
+const { _ } = require('lib/locale.js');
+const { time } = require('lib/time-utils.js');
 const stringPadding = require('string-padding');
 
 const cliUtils = {};

CliClient/app/command-attach.js

@@ -1,12 +1,12 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Resource } from 'lib/models/resource.js';
-import { uuid } from 'lib/uuid.js';
-import { filename } from 'lib/path-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { uuid } = require('lib/uuid.js');
+const { filename } = require('lib/path-utils.js');
 
 const fs = require('fs-extra');
 const mime = require('mime/lite');

CliClient/app/command-cat.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-config.js

@@ -1,7 +1,7 @@
-import { BaseCommand } from './base-command.js';
-import { _, setLocale } from 'lib/locale.js';
-import { app } from './app.js';
-import { Setting } from 'lib/models/setting.js';
+const { BaseCommand } = require('./base-command.js');
+const { _, setLocale } = require('lib/locale.js');
+const { app } = require('./app.js');
+const { Setting } = require('lib/models/setting.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-cp.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-done.js

@@ -1,10 +1,10 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { time } from 'lib/time-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-dump.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-edit.js

@@ -1,14 +1,14 @@
-import fs from 'fs-extra';
-import { BaseCommand } from './base-command.js';
-import { uuid } from 'lib/uuid.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { BaseModel } from 'lib/base-model.js';
-import { cliUtils } from './cli-utils.js';
-import { time } from 'lib/time-utils.js';
+const fs = require('fs-extra');
+const { BaseCommand } = require('./base-command.js');
+const { uuid } = require('lib/uuid.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseModel } = require('lib/base-model.js');
+const { cliUtils } = require('./cli-utils.js');
+const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-exit.js

@@ -1,6 +1,6 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-export.js

@@ -1,11 +1,11 @@
-import { BaseCommand } from './base-command.js';
-import { Exporter } from 'lib/services/exporter.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Note } from 'lib/models/note.js';
-import { reg } from 'lib/registry.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import fs from 'fs-extra';
+const { BaseCommand } = require('./base-command.js');
+const { Exporter } = require('lib/services/exporter.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
+const { reg } = require('lib/registry.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const fs = require('fs-extra');
 
 class Command extends BaseCommand {
 

CliClient/app/command-geoloc.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-help.js

@@ -1,11 +1,11 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { renderCommandHelp } from './help-utils.js';
-import { Database } from 'lib/database.js';
-import { Setting } from 'lib/models/setting.js';
-import { wrap } from 'lib/string-utils.js';
-import { _ } from 'lib/locale.js';
-import { cliUtils } from './cli-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { renderCommandHelp } = require('./help-utils.js');
+const { Database } = require('lib/database.js');
+const { Setting } = require('lib/models/setting.js');
+const { wrap } = require('lib/string-utils.js');
+const { _ } = require('lib/locale.js');
+const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-import-enex.js

@@ -1,10 +1,10 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Folder } from 'lib/models/folder.js';
-import { importEnex } from 'import-enex';
-import { filename, basename } from 'lib/path-utils.js';
-import { cliUtils } from './cli-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Folder } = require('lib/models/folder.js');
+const { importEnex } = require('import-enex');
+const { filename, basename } = require('lib/path-utils.js');
+const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-ls.js

@@ -1,13 +1,13 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Setting } from 'lib/models/setting.js';
-import { Note } from 'lib/models/note.js';
-import { sprintf } from 'sprintf-js';
-import { time } from 'lib/time-utils.js';
-import { cliUtils } from './cli-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Setting } = require('lib/models/setting.js');
+const { Note } = require('lib/models/note.js');
+const { sprintf } = require('sprintf-js');
+const { time } = require('lib/time-utils.js');
+const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mkbook.js

@@ -1,8 +1,8 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Folder } from 'lib/models/folder.js';
-import { reg } from 'lib/registry.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Folder } = require('lib/models/folder.js');
+const { reg } = require('lib/registry.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mknote.js

@@ -1,7 +1,7 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mktodo.js

@@ -1,7 +1,7 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-mv.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-ren.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-rmbook.js

@@ -1,11 +1,11 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { BaseModel } from 'lib/base-model.js';
-import { cliUtils } from './cli-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-rmnote.js

@@ -1,11 +1,11 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { BaseModel } from 'lib/base-model.js';
-import { cliUtils } from './cli-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseModel } = require('lib/base-model.js');
+const { cliUtils } = require('./cli-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-search.js

@@ -1,12 +1,12 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { sprintf } from 'sprintf-js';
-import { time } from 'lib/time-utils.js';
-import { uuid } from 'lib/uuid.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { sprintf } = require('sprintf-js');
+const { time } = require('lib/time-utils.js');
+const { uuid } = require('lib/uuid.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-set.js

@@ -1,10 +1,10 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { BaseItem } from 'lib/models/base-item.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { BaseItem } = require('lib/models/base-item.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-status.js

@@ -1,9 +1,9 @@
-import { BaseCommand } from './base-command.js';
-import { Database } from 'lib/database.js';
-import { app } from './app.js';
-import { Setting } from 'lib/models/setting.js';
-import { _ } from 'lib/locale.js';
-import { ReportService } from 'lib/services/report.js';
+const { BaseCommand } = require('./base-command.js');
+const { Database } = require('lib/database.js');
+const { app } = require('./app.js');
+const { Setting } = require('lib/models/setting.js');
+const { _ } = require('lib/locale.js');
+const { ReportService } = require('lib/services/report.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-sync.js

@@ -1,13 +1,13 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { OneDriveApiNodeUtils } from './onedrive-api-node-utils.js';
-import { Setting } from 'lib/models/setting.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Synchronizer } from 'lib/synchronizer.js';
-import { reg } from 'lib/registry.js';
-import { cliUtils } from './cli-utils.js';
-import md5 from 'md5';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { OneDriveApiNodeUtils } = require('./onedrive-api-node-utils.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Synchronizer } = require('lib/synchronizer.js');
+const { reg } = require('lib/registry.js');
+const { cliUtils } = require('./cli-utils.js');
+const md5 = require('md5');
 const locker = require('proper-lockfile');
 const fs = require('fs-extra');
 const osTmpdir = require('os-tmpdir');

CliClient/app/command-tag.js

@@ -1,8 +1,8 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { Tag } from 'lib/models/tag.js';
-import { BaseModel } from 'lib/base-model.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { Tag } = require('lib/models/tag.js');
+const { BaseModel } = require('lib/base-model.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-todo.js

@@ -1,10 +1,10 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { time } from 'lib/time-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { time } = require('lib/time-utils.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-undone.js

@@ -1,10 +1,10 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { time } from 'lib/time-utils.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { time } = require('lib/time-utils.js');
 
 const CommandDone = require('./command-done.js');
 

CliClient/app/command-use.js

@@ -1,8 +1,8 @@
-import { BaseCommand } from './base-command.js';
-import { app } from './app.js';
-import { _ } from 'lib/locale.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
+const { BaseCommand } = require('./base-command.js');
+const { app } = require('./app.js');
+const { _ } = require('lib/locale.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
 
 class Command extends BaseCommand {
 

CliClient/app/command-version.js

@@ -1,6 +1,6 @@
-import { BaseCommand } from './base-command.js';
-import { Setting } from 'lib/models/setting.js'
-import { _ } from 'lib/locale.js';
+const { BaseCommand } = require('./base-command.js');
+const { Setting } = require('lib/models/setting.js');
+const { _ } = require('lib/locale.js');
 
 class Command extends BaseCommand {
 

CliClient/app/fuzzing.js

@@ -3,12 +3,12 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import { time } from 'lib/time-utils.js';
-import { Logger } from 'lib/logger.js';
-import { Resource } from 'lib/models/resource.js';
-import { dirname } from 'lib/path-utils.js';
-import { FsDriverNode } from './fs-driver-node.js';
-import lodash from 'lodash';
+const { time } = require('lib/time-utils.js');
+const { Logger } = require('lib/logger.js');
+const { Resource } = require('lib/models/resource.js');
+const { dirname } = require('lib/path-utils.js');
+const { FsDriverNode } = require('./fs-driver-node.js');
+const lodash = require('lodash');
 const exec = require('child_process').exec
 const fs = require('fs-extra');
 

CliClient/app/help-utils.js

@@ -1,11 +1,11 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import fs from 'fs-extra';
-import { wrap } from 'lib/string-utils.js';
-import { Setting } from 'lib/models/setting.js';
-import { fileExtension, basename, dirname } from 'lib/path-utils.js';
-import { _, setLocale, languageCode } from 'lib/locale.js';
+const fs = require('fs-extra');
+const { wrap } = require('lib/string-utils.js');
+const { Setting } = require('lib/models/setting.js');
+const { fileExtension, basename, dirname } = require('lib/path-utils.js');
+const { _, setLocale, languageCode } = require('lib/locale.js');
 
 const rootDir = dirname(dirname(__dirname));
 const MAX_WIDTH = 78;

CliClient/app/import-enex-md-gen.js

@@ -1,4 +1,4 @@
-import stringPadding from 'string-padding';
+const stringPadding = require('string-padding');
 
 const BLOCK_OPEN = "[[BLOCK_OPEN]]";
 const BLOCK_CLOSE = "[[BLOCK_CLOSE]]";

CliClient/app/import-enex.js

@@ -1,16 +1,16 @@
-import { uuid } from 'lib/uuid.js';
-import moment from 'moment';
-import { promiseChain } from 'lib/promise-utils.js';
-import { folderItemFilename } from 'lib/string-utils.js'
-import { BaseModel } from 'lib/base-model.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
-import { Resource } from 'lib/models/resource.js';
-import { Folder } from 'lib/models/folder.js';
-import { enexXmlToMd } from './import-enex-md-gen.js';
-import { time } from 'lib/time-utils.js';
-import Levenshtein from 'levenshtein';
-import jsSHA from "jssha";
+const { uuid } = require('lib/uuid.js');
+const moment = require('moment');
+const { promiseChain } = require('lib/promise-utils.js');
+const { folderItemFilename } = require('lib/string-utils.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { Resource } = require('lib/models/resource.js');
+const { Folder } = require('lib/models/folder.js');
+const { enexXmlToMd } = require('./import-enex-md-gen.js');
+const { time } = require('lib/time-utils.js');
+const Levenshtein = require('levenshtein');
+const jsSHA = require("jssha");
 
 const Promise = require('promise');
 const fs = require('fs-extra');

CliClient/app/main.js

@@ -5,19 +5,19 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import { app } from './app.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Resource } from 'lib/models/resource.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
-import { NoteTag } from 'lib/models/note-tag.js';
-import { Setting } from 'lib/models/setting.js';
-import { Logger } from 'lib/logger.js';
-import { FsDriverNode } from './fs-driver-node.js';
-import { shimInit } from 'lib/shim-init-node.js';
-import { _ } from 'lib/locale.js';
+const { app } = require('./app.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Resource } = require('lib/models/resource.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Setting } = require('lib/models/setting.js');
+const { Logger } = require('lib/logger.js');
+const { FsDriverNode } = require('./fs-driver-node.js');
+const { shimInit } = require('lib/shim-init-node.js');
+const { _ } = require('lib/locale.js');
 
 const fsDriver = new FsDriverNode();
 Logger.fsDriver_ = fsDriver;

CliClient/app/onedrive-api-node-utils.js

@@ -1,5 +1,5 @@
-import { _ } from 'lib/locale.js'
-import { netUtils } from 'lib/net-utils.js'
+const { _ } = require('lib/locale.js');
+const { netUtils } = require('lib/net-utils.js');
 
 const http = require("http");
 const urlParser = require("url");

CliClient/tests/base-model.js

@@ -1,10 +1,10 @@
-import { time } from 'lib/time-utils.js';
-import { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient } from 'test-utils.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { BaseModel } from 'lib/base-model.js';
+const { time } = require('lib/time-utils.js');
+const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient } = require('test-utils.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.error('Unhandled promise rejection at: Promise', p, 'reason:', reason);

CliClient/tests/synchronizer.js

@@ -1,15 +1,15 @@
 require('source-map-support').install();
 require('babel-plugin-transform-runtime');
 
-import { time } from 'lib/time-utils.js';
-import { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId } from 'test-utils.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
-import { Database } from 'lib/database.js';
-import { Setting } from 'lib/models/setting.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { BaseModel } from 'lib/base-model.js';
+const { time } = require('lib/time-utils.js');
+const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId } = require('test-utils.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { Database } = require('lib/database.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

CliClient/tests/test-utils.js

@@ -1,21 +1,21 @@
-import fs from 'fs-extra';
-import { JoplinDatabase } from 'lib/joplin-database.js';
-import { DatabaseDriverNode } from 'lib/database-driver-node.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Folder } from 'lib/models/folder.js';
-import { Note } from 'lib/models/note.js';
-import { Resource } from 'lib/models/resource.js';
-import { Tag } from 'lib/models/tag.js';
-import { NoteTag } from 'lib/models/note-tag.js';
-import { Logger } from 'lib/logger.js';
-import { Setting } from 'lib/models/setting.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Synchronizer } from 'lib/synchronizer.js';
-import { FileApi } from 'lib/file-api.js';
-import { FileApiDriverMemory } from 'lib/file-api-driver-memory.js';
-import { FileApiDriverLocal } from 'lib/file-api-driver-local.js';
-import { FsDriverNode } from '../app/fs-driver-node.js';
-import { time } from 'lib/time-utils.js';
+const fs = require('fs-extra');
+const { JoplinDatabase } = require('lib/joplin-database.js');
+const { DatabaseDriverNode } = require('lib/database-driver-node.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Folder } = require('lib/models/folder.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { Tag } = require('lib/models/tag.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Logger } = require('lib/logger.js');
+const { Setting } = require('lib/models/setting.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Synchronizer } = require('lib/synchronizer.js');
+const { FileApi } = require('lib/file-api.js');
+const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
+const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
+const { FsDriverNode } = require('../app/fs-driver-node.js');
+const { time } = require('lib/time-utils.js');
 
 let databases_ = [];
 let synchronizers_ = [];

ReactNativeClient/index.android.js

@@ -1,3 +1,3 @@
-import { main } from './main.js';
+const { main } = require('./main.js');
 
 main();

ReactNativeClient/index.ios.js

@@ -4,7 +4,7 @@
  * @flow
  */
 
-import React, { Component } from 'react';
+const React = require('react'); const Component = React.Component;
 import {
   AppRegistry,
   StyleSheet,

ReactNativeClient/lib/base-model.js

@@ -1,7 +1,7 @@
-import { Log } from 'lib/log.js';
-import { Database } from 'lib/database.js';
-import { uuid } from 'lib/uuid.js';
-import { time } from 'lib/time-utils.js';
+const { Log } = require('lib/log.js');
+const { Database } = require('lib/database.js');
+const { uuid } = require('lib/uuid.js');
+const { time } = require('lib/time-utils.js');
 
 class BaseModel {
 

ReactNativeClient/lib/components/action-button.js

@@ -1,11 +1,11 @@
-import React, { Component } from 'react';
-import { StyleSheet, Text } from 'react-native';
-import Icon from 'react-native-vector-icons/Ionicons';
-import ReactNativeActionButton from 'react-native-action-button';
-import { connect } from 'react-redux'
-import { globalStyle } from 'lib/components/global-style.js'
-import { Log } from 'lib/log.js'
-import { _ } from 'lib/locale.js'
+const React = require('react'); const Component = React.Component;
+const { StyleSheet, Text } = require('react-native');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const ReactNativeActionButton = require('react-native-action-button').default;
+const { connect } = require('react-redux');
+const { globalStyle } = require('lib/components/global-style.js');
+const { Log } = require('lib/log.js');
+const { _ } = require('lib/locale.js');
 
 const styles = StyleSheet.create({
 	actionButtonIcon: {

ReactNativeClient/lib/components/app-nav.js

@@ -1,10 +1,10 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux'
-import { NotesScreen } from 'lib/components/screens/notes.js';
-import { SearchScreen } from 'lib/components/screens/search.js';
-import { View } from 'react-native';
-import { _ } from 'lib/locale.js';
-import { themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { connect } = require('react-redux');
+const { NotesScreen } = require('lib/components/screens/notes.js');
+const { SearchScreen } = require('lib/components/screens/search.js');
+const { View } = require('react-native');
+const { _ } = require('lib/locale.js');
+const { themeStyle } = require('lib/components/global-style.js');
 
 class AppNavComponent extends Component {
 

ReactNativeClient/lib/components/base-screen.js

@@ -1,6 +1,6 @@
-import React, { Component } from 'react';
-import { StyleSheet } from 'react-native';
-import { globalStyle, themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { StyleSheet } = require('react-native');
+const { globalStyle, themeStyle } = require('lib/components/global-style.js');
 
 const styleObject_ = {
 	screen: {

ReactNativeClient/lib/components/checkbox.js

@@ -1,6 +1,6 @@
-import React, { Component } from 'react';
-import { StyleSheet, TouchableHighlight } from 'react-native';
-import Icon from 'react-native-vector-icons/Ionicons';
+const React = require('react'); const Component = React.Component;
+const { StyleSheet, TouchableHighlight } = require('react-native');
+const Icon = require('react-native-vector-icons/Ionicons').default;
 
 const styles = {
 	checkboxIcon: {

ReactNativeClient/lib/components/global-style.js

@@ -1,4 +1,4 @@
-import { Setting } from 'lib/models/setting.js';
+const { Setting } = require('lib/models/setting.js');
 
 const globalStyle = {
 	fontSize: 16,

ReactNativeClient/lib/components/note-body-viewer.js

@@ -1,10 +1,10 @@
-import React, { Component } from 'react';
-import { WebView, View, Linking } from 'react-native';
-import { globalStyle } from 'lib/components/global-style.js';
-import { Resource } from 'lib/models/resource.js';
-import { shim } from 'lib/shim.js';
-import { reg } from 'lib/registry.js';
-import marked from 'lib/marked.js';
+const React = require('react'); const Component = React.Component;
+const { WebView, View, Linking } = require('react-native');
+const { globalStyle } = require('lib/components/global-style.js');
+const { Resource } = require('lib/models/resource.js');
+const { shim } = require('lib/shim.js');
+const { reg } = require('lib/registry.js');
+const marked = require('lib/marked.js');
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 

ReactNativeClient/lib/components/note-item.js

@@ -1,13 +1,13 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux'
-import { ListView, Text, TouchableHighlight, View, StyleSheet } from 'react-native';
-import { Log } from 'lib/log.js';
-import { _ } from 'lib/locale.js';
-import { Checkbox } from 'lib/components/checkbox.js';
-import { reg } from 'lib/registry.js';
-import { Note } from 'lib/models/note.js';
-import { time } from 'lib/time-utils.js';
-import { globalStyle, themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { connect } = require('react-redux');
+const { ListView, Text, TouchableHighlight, View, StyleSheet } = require('react-native');
+const { Log } = require('lib/log.js');
+const { _ } = require('lib/locale.js');
+const { Checkbox } = require('lib/components/checkbox.js');
+const { reg } = require('lib/registry.js');
+const { Note } = require('lib/models/note.js');
+const { time } = require('lib/time-utils.js');
+const { globalStyle, themeStyle } = require('lib/components/global-style.js');
 
 class NoteItemComponent extends Component {
 

ReactNativeClient/lib/components/note-list.js

@@ -1,15 +1,15 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux'
-import { ListView, Text, TouchableHighlight, Switch, View, StyleSheet } from 'react-native';
-import { Log } from 'lib/log.js';
-import { _ } from 'lib/locale.js';
-import { Checkbox } from 'lib/components/checkbox.js';
-import { NoteItem } from 'lib/components/note-item.js';
-import { reg } from 'lib/registry.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { time } from 'lib/time-utils.js';
-import { themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { connect } = require('react-redux');
+const { ListView, Text, TouchableHighlight, Switch, View, StyleSheet } = require('react-native');
+const { Log } = require('lib/log.js');
+const { _ } = require('lib/locale.js');
+const { Checkbox } = require('lib/components/checkbox.js');
+const { NoteItem } = require('lib/components/note-item.js');
+const { reg } = require('lib/registry.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { time } = require('lib/time-utils.js');
+const { themeStyle } = require('lib/components/global-style.js');
 
 class NoteListComponent extends Component {
 

ReactNativeClient/lib/components/screen-header.js

@@ -1,16 +1,16 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux'
-import { View, Text, Button, StyleSheet, TouchableOpacity, Picker, Image } from 'react-native';
-import Icon from 'react-native-vector-icons/Ionicons';
-import { Log } from 'lib/log.js';
-import { BackButtonService } from 'lib/services/back-button.js';
-import { Menu, MenuOptions, MenuOption, MenuTrigger } from 'react-native-popup-menu';
-import { _ } from 'lib/locale.js';
-import { Setting } from 'lib/models/setting.js';
-import { FileApi } from 'lib/file-api.js';
-import { FileApiDriverOneDrive } from 'lib/file-api-driver-onedrive.js';
-import { reg } from 'lib/registry.js'
-import { themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { connect } = require('react-redux');
+const { View, Text, Button, StyleSheet, TouchableOpacity, Picker, Image } = require('react-native');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const { Log } = require('lib/log.js');
+const { BackButtonService } = require('lib/services/back-button.js');
+const { Menu, MenuOptions, MenuOption, MenuTrigger } = require('react-native-popup-menu');
+const { _ } = require('lib/locale.js');
+const { Setting } = require('lib/models/setting.js');
+const { FileApi } = require('lib/file-api.js');
+const { FileApiDriverOneDrive } = require('lib/file-api-driver-onedrive.js');
+const { reg } = require('lib/registry.js');
+const { themeStyle } = require('lib/components/global-style.js');
 
 // Rather than applying a padding to the whole bar, it is applied to each
 // individual component (button, picker, etc.) so that the touchable areas

ReactNativeClient/lib/components/screens/config.js

@@ -1,11 +1,11 @@
-import React, { Component } from 'react';
-import { View, Switch, Slider, StyleSheet, Picker, Text, Button } from 'react-native';
-import { connect } from 'react-redux'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { _, setLocale } from 'lib/locale.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { themeStyle } from 'lib/components/global-style.js';
-import { Setting } from 'lib/models/setting.js';
+const React = require('react'); const Component = React.Component;
+const { View, Switch, Slider, StyleSheet, Picker, Text, Button } = require('react-native');
+const { connect } = require('react-redux');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { _, setLocale } = require('lib/locale.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { themeStyle } = require('lib/components/global-style.js');
+const { Setting } = require('lib/models/setting.js');
 
 class ConfigScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/folder.js

@@ -1,16 +1,16 @@
-import React, { Component } from 'react';
-import { View, Button, TextInput, StyleSheet } from 'react-native';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js'
-import { ActionButton } from 'lib/components/action-button.js';
-import { Folder } from 'lib/models/folder.js'
-import { BaseModel } from 'lib/base-model.js'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { reg } from 'lib/registry.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { dialogs } from 'lib/dialogs.js';
-import { themeStyle } from 'lib/components/global-style.js';
-import { _ } from 'lib/locale.js';
+const React = require('react'); const Component = React.Component;
+const { View, Button, TextInput, StyleSheet } = require('react-native');
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const { ActionButton } = require('lib/components/action-button.js');
+const { Folder } = require('lib/models/folder.js');
+const { BaseModel } = require('lib/base-model.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { reg } = require('lib/registry.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { dialogs } = require('lib/dialogs.js');
+const { themeStyle } = require('lib/components/global-style.js');
+const { _ } = require('lib/locale.js');
 
 class FolderScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/log.js

@@ -1,14 +1,14 @@
-import React, { Component } from 'react';
-import { ListView, View, Text, Button, StyleSheet } from 'react-native';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js'
-import { reg } from 'lib/registry.js'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { time } from 'lib/time-utils'
-import { themeStyle } from 'lib/components/global-style.js';
-import { Logger } from 'lib/logger.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { _ } from 'lib/locale.js';
+const React = require('react'); const Component = React.Component;
+const { ListView, View, Text, Button, StyleSheet } = require('react-native');
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const { reg } = require('lib/registry.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { time } = require('lib/time-utils');
+const { themeStyle } = require('lib/components/global-style.js');
+const { Logger } = require('lib/logger.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { _ } = require('lib/locale.js');
 
 class LogScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/note.js

@@ -1,29 +1,29 @@
-import React, { Component } from 'react';
-import { Keyboard, BackHandler, View, Button, TextInput, WebView, Text, StyleSheet, Linking, Image } from 'react-native';
-import { connect } from 'react-redux'
-import { uuid } from 'lib/uuid.js';
-import { Log } from 'lib/log.js'
-import { Note } from 'lib/models/note.js'
-import { Resource } from 'lib/models/resource.js'
-import { Folder } from 'lib/models/folder.js'
-import { BackButtonService } from 'lib/services/back-button.js';
-import { BaseModel } from 'lib/base-model.js'
-import { ActionButton } from 'lib/components/action-button.js';
-import Icon from 'react-native-vector-icons/Ionicons';
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { time } from 'lib/time-utils.js';
-import { Checkbox } from 'lib/components/checkbox.js'
-import { _ } from 'lib/locale.js';
-import { reg } from 'lib/registry.js';
-import { shim } from 'lib/shim.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { dialogs } from 'lib/dialogs.js';
-import { globalStyle, themeStyle } from 'lib/components/global-style.js';
-import DialogBox from 'react-native-dialogbox';
-import { NoteBodyViewer } from 'lib/components/note-body-viewer.js';
-import RNFetchBlob from 'react-native-fetch-blob';
-import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker';
-import ImageResizer from 'react-native-image-resizer';
+const React = require('react'); const Component = React.Component;
+const { Keyboard, BackHandler, View, Button, TextInput, WebView, Text, StyleSheet, Linking, Image } = require('react-native');
+const { connect } = require('react-redux');
+const { uuid } = require('lib/uuid.js');
+const { Log } = require('lib/log.js');
+const { Note } = require('lib/models/note.js');
+const { Resource } = require('lib/models/resource.js');
+const { Folder } = require('lib/models/folder.js');
+const { BackButtonService } = require('lib/services/back-button.js');
+const { BaseModel } = require('lib/base-model.js');
+const { ActionButton } = require('lib/components/action-button.js');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { time } = require('lib/time-utils.js');
+const { Checkbox } = require('lib/components/checkbox.js');
+const { _ } = require('lib/locale.js');
+const { reg } = require('lib/registry.js');
+const { shim } = require('lib/shim.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { dialogs } = require('lib/dialogs.js');
+const { globalStyle, themeStyle } = require('lib/components/global-style.js');
+const DialogBox = require('react-native-dialogbox').default;
+const { NoteBodyViewer } = require('lib/components/note-body-viewer.js');
+const RNFetchBlob = require('react-native-fetch-blob').default;
+const { DocumentPicker, DocumentPickerUtil } = require('react-native-document-picker');
+const ImageResizer = require('react-native-image-resizer').default;
 
 class NoteScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/notes.js

@@ -1,21 +1,21 @@
-import React, { Component } from 'react';
-import { View, Button, Picker } from 'react-native';
-import { connect } from 'react-redux'
-import { reg } from 'lib/registry.js';
-import { Log } from 'lib/log.js'
-import { NoteList } from 'lib/components/note-list.js'
-import { Folder } from 'lib/models/folder.js'
-import { Tag } from 'lib/models/tag.js'
-import { Note } from 'lib/models/note.js'
-import { Setting } from 'lib/models/setting.js'
-import { themeStyle } from 'lib/components/global-style.js';
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { MenuOption, Text } from 'react-native-popup-menu';
-import { _ } from 'lib/locale.js';
-import { ActionButton } from 'lib/components/action-button.js';
-import { dialogs } from 'lib/dialogs.js';
-import DialogBox from 'react-native-dialogbox';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
+const React = require('react'); const Component = React.Component;
+const { View, Button, Picker } = require('react-native');
+const { connect } = require('react-redux');
+const { reg } = require('lib/registry.js');
+const { Log } = require('lib/log.js');
+const { NoteList } = require('lib/components/note-list.js');
+const { Folder } = require('lib/models/folder.js');
+const { Tag } = require('lib/models/tag.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { themeStyle } = require('lib/components/global-style.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { MenuOption, Text } = require('react-native-popup-menu');
+const { _ } = require('lib/locale.js');
+const { ActionButton } = require('lib/components/action-button.js');
+const { dialogs } = require('lib/dialogs.js');
+const DialogBox = require('react-native-dialogbox').default;
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
 
 class NotesScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/onedrive-login.js

@@ -1,13 +1,13 @@
-import React, { Component } from 'react';
-import { View } from 'react-native';
-import { WebView, Button, Text } from 'react-native';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js'
-import { Setting } from 'lib/models/setting.js'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { reg } from 'lib/registry.js';
-import { _ } from 'lib/locale.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
+const React = require('react'); const Component = React.Component;
+const { View } = require('react-native');
+const { WebView, Button, Text } = require('react-native');
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const { Setting } = require('lib/models/setting.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { reg } = require('lib/registry.js');
+const { _ } = require('lib/locale.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
 
 class OneDriveLoginScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/search.js

@@ -1,13 +1,13 @@
-import React, { Component } from 'react';
-import { ListView, StyleSheet, View, TextInput, FlatList, TouchableHighlight } from 'react-native';
-import { connect } from 'react-redux'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import Icon from 'react-native-vector-icons/Ionicons';
-import { _ } from 'lib/locale.js';
-import { Note } from 'lib/models/note.js';
-import { NoteItem } from 'lib/components/note-item.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { ListView, StyleSheet, View, TextInput, FlatList, TouchableHighlight } = require('react-native');
+const { connect } = require('react-redux');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const { _ } = require('lib/locale.js');
+const { Note } = require('lib/models/note.js');
+const { NoteItem } = require('lib/components/note-item.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { themeStyle } = require('lib/components/global-style.js');
 
 class SearchScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/screens/status.js

@@ -1,19 +1,19 @@
-import React, { Component } from 'react';
-import { ListView, StyleSheet, View, Text, Button, FlatList } from 'react-native';
-import { Setting } from 'lib/models/setting.js';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js'
-import { reg } from 'lib/registry.js'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { time } from 'lib/time-utils'
-import { Logger } from 'lib/logger.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Database } from 'lib/database.js';
-import { Folder } from 'lib/models/folder.js';
-import { ReportService } from 'lib/services/report.js';
-import { _ } from 'lib/locale.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { globalStyle, themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { ListView, StyleSheet, View, Text, Button, FlatList } = require('react-native');
+const { Setting } = require('lib/models/setting.js');
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const { reg } = require('lib/registry.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { time } = require('lib/time-utils');
+const { Logger } = require('lib/logger.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Database } = require('lib/database.js');
+const { Folder } = require('lib/models/folder.js');
+const { ReportService } = require('lib/services/report.js');
+const { _ } = require('lib/locale.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { globalStyle, themeStyle } = require('lib/components/global-style.js');
 
 const styles = StyleSheet.create({
 	body: {

ReactNativeClient/lib/components/screens/tag.js

@@ -1,13 +1,13 @@
-import React, { Component } from 'react';
-import { ListView, StyleSheet, View, TextInput, FlatList, TouchableHighlight } from 'react-native';
-import { connect } from 'react-redux'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import Icon from 'react-native-vector-icons/Ionicons';
-import { _ } from 'lib/locale.js';
-import { Note } from 'lib/models/note.js';
-import { NoteItem } from 'lib/components/note-item.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { globalStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { ListView, StyleSheet, View, TextInput, FlatList, TouchableHighlight } = require('react-native');
+const { connect } = require('react-redux');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const { _ } = require('lib/locale.js');
+const { Note } = require('lib/models/note.js');
+const { NoteItem } = require('lib/components/note-item.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { globalStyle } = require('lib/components/global-style.js');
 
 let styles = {
 	body: {

ReactNativeClient/lib/components/screens/welcome.js

@@ -1,12 +1,12 @@
-import React, { Component } from 'react';
-import { View, Text, StyleSheet } from 'react-native';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js'
-import { ScreenHeader } from 'lib/components/screen-header.js';
-import { ActionButton } from 'lib/components/action-button.js';
-import { BaseScreenComponent } from 'lib/components/base-screen.js';
-import { _ } from 'lib/locale.js';
-import { themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { View, Text, StyleSheet } = require('react-native');
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const { ScreenHeader } = require('lib/components/screen-header.js');
+const { ActionButton } = require('lib/components/action-button.js');
+const { BaseScreenComponent } = require('lib/components/base-screen.js');
+const { _ } = require('lib/locale.js');
+const { themeStyle } = require('lib/components/global-style.js');
 
 class WelcomeScreenComponent extends BaseScreenComponent {
 	

ReactNativeClient/lib/components/side-menu-content.js

@@ -1,16 +1,16 @@
-import React, { Component } from 'react';
-import { TouchableOpacity , Button, Text, Image, StyleSheet, ScrollView, View } from 'react-native';
-import { connect } from 'react-redux'
-import Icon from 'react-native-vector-icons/Ionicons';
-import { Log } from 'lib/log.js';
-import { Tag } from 'lib/models/tag.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { FoldersScreenUtils } from 'lib/folders-screen-utils.js'
-import { Synchronizer } from 'lib/synchronizer.js';
-import { reg } from 'lib/registry.js';
-import { _ } from 'lib/locale.js';
-import { globalStyle, themeStyle } from 'lib/components/global-style.js';
+const React = require('react'); const Component = React.Component;
+const { TouchableOpacity , Button, Text, Image, StyleSheet, ScrollView, View } = require('react-native');
+const { connect } = require('react-redux');
+const Icon = require('react-native-vector-icons/Ionicons').default;
+const { Log } = require('lib/log.js');
+const { Tag } = require('lib/models/tag.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { FoldersScreenUtils } = require('lib/folders-screen-utils.js');
+const { Synchronizer } = require('lib/synchronizer.js');
+const { reg } = require('lib/registry.js');
+const { _ } = require('lib/locale.js');
+const { globalStyle, themeStyle } = require('lib/components/global-style.js');
 
 class SideMenuContentComponent extends Component {
 

ReactNativeClient/lib/components/side-menu.js

@@ -1,11 +1,11 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux'
-import { Log } from 'lib/log.js';
-import SideMenu_ from 'react-native-side-menu';
+const React = require('react'); const Component = React.Component;
+const { connect } = require('react-redux');
+const { Log } = require('lib/log.js');
+const SideMenu_ = require('react-native-side-menu').default;
 
 class SideMenuComponent extends SideMenu_ {};
 
-const SideMenu = connect(
+const MySideMenu = connect(
 	(state) => {
 		return {
 			isOpen: state.showSideMenu,
@@ -13,4 +13,4 @@ const SideMenu = connect(
 	}
 )(SideMenuComponent)
 
-export { SideMenu };
+module.exports = { SideMenu: MySideMenu };

ReactNativeClient/lib/database-driver-react-native.js

@@ -1,4 +1,4 @@
-import SQLite from 'react-native-sqlite-storage';
+const SQLite = require('react-native-sqlite-storage');
 
 class DatabaseDriverReactNative {
 

ReactNativeClient/lib/database.js

@@ -1,8 +1,8 @@
-import { uuid } from 'lib/uuid.js';
-import { promiseChain } from 'lib/promise-utils.js';
-import { Logger } from 'lib/logger.js'
-import { time } from 'lib/time-utils.js'
-import { sprintf } from 'sprintf-js';
+const { uuid } = require('lib/uuid.js');
+const { promiseChain } = require('lib/promise-utils.js');
+const { Logger } = require('lib/logger.js');
+const { time } = require('lib/time-utils.js');
+const { sprintf } = require('sprintf-js');
 
 class Database {
 

ReactNativeClient/lib/dialogs.js

@@ -1,5 +1,5 @@
-import DialogBox from 'react-native-dialogbox';
-import { Keyboard } from 'react-native';
+const DialogBox = require('react-native-dialogbox').default;
+const { Keyboard } = require('react-native');
 
 // Add this at the bottom of the component:
 //

ReactNativeClient/lib/file-api-driver-local.js

@@ -1,8 +1,8 @@
-import fs from 'fs-extra';
-import { promiseChain } from 'lib/promise-utils.js';
-import moment from 'moment';
-import { BaseItem } from 'lib/models/base-item.js';
-import { time } from 'lib/time-utils.js';
+const fs = require('fs-extra');
+const { promiseChain } = require('lib/promise-utils.js');
+const moment = require('moment');
+const { BaseItem } = require('lib/models/base-item.js');
+const { time } = require('lib/time-utils.js');
 
 // NOTE: when synchronising with the file system the time resolution is the second (unlike milliseconds for OneDrive for instance).
 // What it means is that if, for example, client 1 changes a note at time t, and client 2 changes the same note within the same second,

ReactNativeClient/lib/file-api-driver-memory.js

@@ -1,4 +1,4 @@
-import { time } from 'lib/time-utils.js';
+const { time } = require('lib/time-utils.js');
 
 class FileApiDriverMemory {
 

ReactNativeClient/lib/file-api-driver-onedrive.js

@@ -1,7 +1,7 @@
-import moment from 'moment';
-import { time } from 'lib/time-utils.js';
-import { dirname, basename } from 'lib/path-utils.js';
-import { OneDriveApi } from 'lib/onedrive-api.js';
+const moment = require('moment');
+const { time } = require('lib/time-utils.js');
+const { dirname, basename } = require('lib/path-utils.js');
+const { OneDriveApi } = require('lib/onedrive-api.js');
 
 class FileApiDriverOneDrive {
 

ReactNativeClient/lib/file-api.js

@@ -1,5 +1,5 @@
-import { isHidden } from 'lib/path-utils.js';
-import { Logger } from 'lib/logger.js';
+const { isHidden } = require('lib/path-utils.js');
+const { Logger } = require('lib/logger.js');
 
 class FileApi {
 

ReactNativeClient/lib/folders-screen-utils.js

@@ -1,4 +1,4 @@
-import { Folder } from 'lib/models/folder.js'
+const { Folder } = require('lib/models/folder.js');
 
 class FoldersScreenUtils {
 

ReactNativeClient/lib/geolocation-node.js

@@ -1,5 +1,5 @@
-import { shim } from 'lib/shim.js'
-import { netUtils } from 'lib/net-utils.js';
+const { shim } = require('lib/shim.js');
+const { netUtils } = require('lib/net-utils.js');
 
 class GeolocationNode {
 

ReactNativeClient/lib/geolocation-react.js

@@ -1,4 +1,4 @@
-import { Setting } from 'lib/models/setting.js';
+const { Setting } = require('lib/models/setting.js');
 
 class GeolocationReact {
 

ReactNativeClient/lib/joplin-database.js

@@ -1,7 +1,7 @@
-import { uuid } from 'lib/uuid.js';
-import { promiseChain } from 'lib/promise-utils.js';
-import { time } from 'lib/time-utils.js'
-import { Database } from 'lib/database.js'
+const { uuid } = require('lib/uuid.js');
+const { promiseChain } = require('lib/promise-utils.js');
+const { time } = require('lib/time-utils.js');
+const { Database } = require('lib/database.js');
 
 const structureSql = `
 CREATE TABLE folders (

ReactNativeClient/lib/locale.js

@@ -1,4 +1,4 @@
-import { sprintf } from 'sprintf-js';
+const { sprintf } = require('sprintf-js');
 
 let codeToLanguageE_ = {};
 codeToLanguageE_["aa"] = "Afar";

ReactNativeClient/lib/logger.js

@@ -1,7 +1,7 @@
-import moment from 'moment';
-import { _ } from 'lib/locale.js';
-import { time } from 'lib/time-utils.js';
-import { FsDriverDummy } from 'lib/fs-driver-dummy.js';
+const moment = require('moment');
+const { _ } = require('lib/locale.js');
+const { time } = require('lib/time-utils.js');
+const { FSdRiverdUmmy } = require('lib/fs-driver-dummy.js');
 
 class Logger {
 

ReactNativeClient/lib/models/base-item.js

@@ -1,9 +1,9 @@
-import { BaseModel } from 'lib/base-model.js';
-import { Database } from 'lib/database.js';
-import { Setting } from 'lib/models/setting.js';
-import { time } from 'lib/time-utils.js';
-import { sprintf } from 'sprintf-js';
-import moment from 'moment';
+const { BaseModel } = require('lib/base-model.js');
+const { Database } = require('lib/database.js');
+const { Setting } = require('lib/models/setting.js');
+const { time } = require('lib/time-utils.js');
+const { sprintf } = require('sprintf-js');
+const moment = require('moment');
 
 class BaseItem extends BaseModel {
 

ReactNativeClient/lib/models/folder.js

@@ -1,14 +1,14 @@
-import { BaseModel } from 'lib/base-model.js';
-import { Log } from 'lib/log.js';
-import { promiseChain } from 'lib/promise-utils.js';
-import { time } from 'lib/time-utils.js';
-import { Note } from 'lib/models/note.js';
-import { Setting } from 'lib/models/setting.js';
-import { Database } from 'lib/database.js';
-import { _ } from 'lib/locale.js';
-import moment from 'moment';
-import { BaseItem } from 'lib/models/base-item.js';
-import lodash from 'lodash';
+const { BaseModel } = require('lib/base-model.js');
+const { Log } = require('lib/log.js');
+const { promiseChain } = require('lib/promise-utils.js');
+const { time } = require('lib/time-utils.js');
+const { Note } = require('lib/models/note.js');
+const { Setting } = require('lib/models/setting.js');
+const { Database } = require('lib/database.js');
+const { _ } = require('lib/locale.js');
+const moment = require('moment');
+const { BaseItem } = require('lib/models/base-item.js');
+const lodash = require('lodash');
 
 class Folder extends BaseItem {
 

ReactNativeClient/lib/models/note-tag.js

@@ -1,6 +1,6 @@
-import { BaseItem } from 'lib/models/base-item.js';
-import { BaseModel } from 'lib/base-model.js';
-import lodash  from 'lodash';
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
+const lodash = require('lodash');
 
 class NoteTag extends BaseItem {
 

ReactNativeClient/lib/models/note.js

@@ -1,14 +1,13 @@
-import { BaseModel } from 'lib/base-model.js';
-import { Log } from 'lib/log.js';
-import { sprintf } from 'sprintf-js';
-import { Folder } from 'lib/models/folder.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Setting } from 'lib/models/setting.js';
-import { shim } from 'lib/shim.js';
-import { time } from 'lib/time-utils.js';
-import { _ } from 'lib/locale.js';
-import moment from 'moment';
-import lodash  from 'lodash';
+const { BaseModel } = require('lib/base-model.js');
+const { Log } = require('lib/log.js');
+const { sprintf } = require('sprintf-js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Setting } = require('lib/models/setting.js');
+const { shim } = require('lib/shim.js');
+const { time } = require('lib/time-utils.js');
+const { _ } = require('lib/locale.js');
+const moment = require('moment');
+const lodash = require('lodash');
 
 class Note extends BaseItem {
 
@@ -188,7 +187,7 @@ class Note extends BaseItem {
 		if (!options.fields) options.fields = this.previewFields();
 		if (!options.uncompletedTodosOnTop) options.uncompletedTodosOnTop = false;
 
-		if (parentId == Folder.conflictFolderId()) {
+		if (parentId == BaseItem.getClass('Folder').conflictFolderId()) {
 			options.conditions.push('is_conflict = 1');
 		} else {
 			options.conditions.push('is_conflict = 0');
@@ -326,7 +325,7 @@ class Note extends BaseItem {
 	}
 
 	static async copyToFolder(noteId, folderId) {
-		if (folderId == Folder.conflictFolderId()) throw new Error(_('Cannot copy note to "%s" notebook', Folder.conflictFolderIdTitle()));
+		if (folderId == this.getClass('Folder').conflictFolderId()) throw new Error(_('Cannot copy note to "%s" notebook', this.getClass('Folder').conflictFolderIdTitle()));
 
 		return Note.duplicate(noteId, {
 			changes: {
@@ -337,7 +336,7 @@ class Note extends BaseItem {
 	}
 
 	static async moveToFolder(noteId, folderId) {
-		if (folderId == Folder.conflictFolderId()) throw new Error(_('Cannot move note to "%s" notebook', Folder.conflictFolderIdTitle()));
+		if (folderId == this.getClass('Folder').conflictFolderId()) throw new Error(_('Cannot move note to "%s" notebook', this.getClass('Folder').conflictFolderIdTitle()));
 
 		// When moving a note to a different folder, the user timestamp is not updated.
 		// However updated_time is updated so that the note can be synced later on.

ReactNativeClient/lib/models/resource.js

@@ -1,11 +1,11 @@
-import { BaseModel } from 'lib/base-model.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { Setting } from 'lib/models/setting.js';
-import { mime } from 'lib/mime-utils.js';
-import { filename } from 'lib/path-utils.js';
-import { FsDriverDummy } from 'lib/fs-driver-dummy.js';
-import { markdownUtils } from 'lib/markdown-utils.js';
-import lodash from 'lodash';
+const { BaseModel } = require('lib/base-model.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { Setting } = require('lib/models/setting.js');
+const { mime } = require('lib/mime-utils.js');
+const { filename } = require('lib/path-utils.js');
+const { FsDriverDummy } = require('lib/fs-driver-dummy.js');
+const { markdownUtils } = require('lib/markdown-utils.js');
+const lodash = require('lodash');
 
 class Resource extends BaseItem {
 

ReactNativeClient/lib/models/setting.js

@@ -1,8 +1,8 @@
-import { BaseModel } from 'lib/base-model.js';
-import { Database } from 'lib/database.js';
-import { Logger } from 'lib/logger.js';
-import { sprintf } from 'sprintf-js';
-import { _, supportedLocalesToLanguages, defaultLocale } from 'lib/locale.js';
+const { BaseModel } = require('lib/base-model.js');
+const { Database } = require('lib/database.js');
+const { Logger } = require('lib/logger.js');
+const { sprintf } = require('sprintf-js');
+const { _, supportedLocalesToLanguages, defaultLocale } = require('lib/locale.js');
 
 class Setting extends BaseModel {
 

ReactNativeClient/lib/models/tag.js

@@ -1,9 +1,9 @@
-import { BaseModel } from 'lib/base-model.js';
-import { BaseItem } from 'lib/models/base-item.js';
-import { NoteTag } from 'lib/models/note-tag.js';
-import { Note } from 'lib/models/note.js';
-import { time } from 'lib/time-utils.js';
-import lodash  from 'lodash';
+const { BaseModel } = require('lib/base-model.js');
+const { BaseItem } = require('lib/models/base-item.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Note } = require('lib/models/note.js');
+const { time } = require('lib/time-utils.js');
+const lodash = require('lodash');
 
 class Tag extends BaseItem {
 

ReactNativeClient/lib/net-utils.js

@@ -1,4 +1,4 @@
-import { shim } from 'lib/shim.js'
+const { shim } = require('lib/shim.js');
 
 const tcpPortUsed = require('tcp-port-used');
 

ReactNativeClient/lib/onedrive-api.js

@@ -1,7 +1,7 @@
-import { shim } from 'lib/shim.js';
-import { stringify } from 'query-string';
-import { time } from 'lib/time-utils.js';
-import { Logger } from 'lib/logger.js'
+const { shim } = require('lib/shim.js');
+const { stringify } = require('query-string');
+const { time } = require('lib/time-utils.js');
+const { Logger } = require('lib/logger.js');
 
 class OneDriveApi {
 

ReactNativeClient/lib/parameters.js

@@ -1,4 +1,4 @@
-import { Setting } from 'lib/models/setting.js';
+const { Setting } = require('lib/models/setting.js');
 
 const parameters_ = {};
 

ReactNativeClient/lib/poor-man-intervals.js

@@ -1,4 +1,4 @@
-import { time } from 'lib/time-utils.js';
+const { time } = require('lib/time-utils.js');
 
 class PoorManIntervals {
 

ReactNativeClient/lib/react-logger.js

@@ -1,4 +1,4 @@
-import { Logger } from 'lib/logger.js';
+const { Logger } = require('lib/logger.js');
 
 class ReactLogger extends Logger {
 

ReactNativeClient/lib/reducer.js

@@ -1,4 +1,4 @@
-import { Note } from 'lib/models/note.js';
+const { Note } = require('lib/models/note.js');
 
 const defaultState = {
 	notes: [],

ReactNativeClient/lib/registry.js

@@ -1,15 +1,15 @@
-import { Logger } from 'lib/logger.js';
-import { Setting } from 'lib/models/setting.js';
-import { OneDriveApi } from 'lib/onedrive-api.js';
-import { parameters } from 'lib/parameters.js';
-import { FileApi } from 'lib/file-api.js';
-import { Database } from 'lib/database.js';
-import { Synchronizer } from 'lib/synchronizer.js';
-import { FileApiDriverOneDrive } from 'lib/file-api-driver-onedrive.js';
-import { shim } from 'lib/shim.js';
-import { time } from 'lib/time-utils.js';
-import { FileApiDriverMemory } from 'lib/file-api-driver-memory.js';
-import { _ } from 'lib/locale.js';
+const { Logger } = require('lib/logger.js');
+const { Setting } = require('lib/models/setting.js');
+const { OneDriveApi } = require('lib/onedrive-api.js');
+const { parameters } = require('lib/parameters.js');
+const { FileApi } = require('lib/file-api.js');
+const { Database } = require('lib/database.js');
+const { Synchronizer } = require('lib/synchronizer.js');
+const { FileApiDriverOneDrive } = require('lib/file-api-driver-onedrive.js');
+const { shim } = require('lib/shim.js');
+const { time } = require('lib/time-utils.js');
+const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
+const { _ } = require('lib/locale.js');
 
 const reg = {};
 

ReactNativeClient/lib/services/back-button.js

@@ -1,4 +1,4 @@
-import { BackHandler } from 'react-native';
+const { BackHandler } = require('react-native');
 
 class BackButtonService {
 

ReactNativeClient/lib/services/exporter.js

@@ -1,12 +1,12 @@
-import { BaseItem } from 'lib/models/base-item.js';
-import { BaseModel } from 'lib/base-model.js';
-import { Resource } from 'lib/models/resource.js';
-import { Folder } from 'lib/models/folder.js';
-import { NoteTag } from 'lib/models/note-tag.js';
-import { Note } from 'lib/models/note.js';
-import { Tag } from 'lib/models/tag.js';
-import { basename } from 'lib/path-utils.js';
-import fs from 'fs-extra';
+const { BaseItem } = require('lib/models/base-item.js');
+const { BaseModel } = require('lib/base-model.js');
+const { Resource } = require('lib/models/resource.js');
+const { Folder } = require('lib/models/folder.js');
+const { NoteTag } = require('lib/models/note-tag.js');
+const { Note } = require('lib/models/note.js');
+const { Tag } = require('lib/models/tag.js');
+const { basename } = require('lib/path-utils.js');
+const fs = require('fs-extra');
 
 class Exporter {