self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Mobile: Fixed package import issue

Browse Source
This commit is contained in:
Laurent Cozic
2020-12-30 11:51:43 +00:00
parent d76746b8e4
commit d1f8520e6e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.eslintrc.js
View File

@@ -65,7 +65,12 @@ module.exports = {
'no-var': ['error'], 'no-var': ['error'],
'no-new-func': ['error'], 'no-new-func': ['error'],
'import/prefer-default-export': ['error'], 'import/prefer-default-export': ['error'],
'import/first': ['error'],
// This rule should not be enabled since it matters in what order
// imports are done, in particular in relation to the shim.setReact
// call, which should be done first, but this rule might move it down.
// 'import/first': ['error'],
'no-array-constructor': ['error'], 'no-array-constructor': ['error'],
'radix': ['error'], 'radix': ['error'],

8
packages/app-mobile/root.tsx
View File

@@ -1,6 +1,9 @@
const React = require('react');
import shim from '@joplin/lib/shim';
shim.setReact(React);
import setUpQuickActions from './setUpQuickActions'; import setUpQuickActions from './setUpQuickActions';
import PluginAssetsLoader from './PluginAssetsLoader'; import PluginAssetsLoader from './PluginAssetsLoader';
import AlarmService from '@joplin/lib/services/AlarmService'; import AlarmService from '@joplin/lib/services/AlarmService';
import Alarm from '@joplin/lib/models/Alarm'; import Alarm from '@joplin/lib/models/Alarm';
import time from '@joplin/lib/time'; import time from '@joplin/lib/time';
@@ -23,10 +26,7 @@ import KeychainServiceDriverMobile from '@joplin/lib/services/keychain/KeychainS
import { setLocale, closestSupportedLocale, defaultLocale } from '@joplin/lib/locale'; import { setLocale, closestSupportedLocale, defaultLocale } from '@joplin/lib/locale';
import SyncTargetJoplinServer from '@joplin/lib/SyncTargetJoplinServer'; import SyncTargetJoplinServer from '@joplin/lib/SyncTargetJoplinServer';
const React = require('react');
const { AppState, Keyboard, NativeModules, BackHandler, Animated, View, StatusBar } = require('react-native'); const { AppState, Keyboard, NativeModules, BackHandler, Animated, View, StatusBar } = require('react-native');
const shim = require('@joplin/lib/shim').default;
shim.setReact(React);
const DropdownAlert = require('react-native-dropdownalert').default; const DropdownAlert = require('react-native-dropdownalert').default;
const AlarmServiceDriver = require('./services/AlarmServiceDriver').default; const AlarmServiceDriver = require('./services/AlarmServiceDriver').default;