1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00

Tools: Renamed package namespace from @joplinapp to @joplin

This commit is contained in:
Laurent Cozic
2020-11-07 15:59:37 +00:00
parent f950e9b03f
commit 04bfbec96b
330 changed files with 1284 additions and 1284 deletions

View File

@@ -12,20 +12,20 @@ import { RenderedBody, defaultRenderedBody } from './utils/types';
import NoteTextViewer from '../../../NoteTextViewer';
import Editor from './Editor';
import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration';
import Setting from '@joplinapp/lib/models/Setting';
import { _ } from '@joplinapp/lib/locale';
import Setting from '@joplin/lib/models/Setting';
import { _ } from '@joplin/lib/locale';
import bridge from '../../../../services/bridge';
import markdownUtils from '@joplinapp/lib/markdownUtils';
import shim from '@joplinapp/lib/shim';
import markdownUtils from '@joplin/lib/markdownUtils';
import shim from '@joplin/lib/shim';
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
const { clipboard } = require('electron');
const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js');
const shared = require('@joplin/lib/components/shared/note-screen-shared.js');
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
const dialogs = require('../../../dialogs');
const { themeStyle } = require('@joplinapp/lib/theme');
const { themeStyle } = require('@joplin/lib/theme');
function markupRenderOptions(override: any = null) {
return { ...override };

View File

@@ -25,9 +25,9 @@ import 'codemirror/keymap/sublime'; // Used for swapLineUp and swapLineDown
import 'codemirror/mode/meta';
// import eventManager from '@joplinapp/lib/eventManager';
// import eventManager from '@joplin/lib/eventManager';
const { reg } = require('@joplinapp/lib/registry.js');
const { reg } = require('@joplin/lib/registry.js');
// Based on http://pypl.github.io/PYPL.html
const topLanguages = [

View File

@@ -1,12 +1,12 @@
import * as React from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import CommandService from '@joplin/lib/services/CommandService';
import ToolbarBase from '../../../ToolbarBase';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import { connect } from 'react-redux';
import { AppState } from '../../../../app';
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
const { buildStyle } = require('@joplinapp/lib/theme');
import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
const { buildStyle } = require('@joplin/lib/theme');
interface ToolbarProps {
themeId: number,

View File

@@ -1,5 +1,5 @@
import { NoteBodyEditorProps } from '../../../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props: NoteBodyEditorProps) {
return buildStyle('CodeMirror', props.themeId, (theme: any) => {

View File

@@ -1,5 +1,5 @@
import { useEffect, useCallback, useRef, useState } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
export function cursorPositionToTextOffset(cursorPos: any, body: string) {
if (!body) return 0;

View File

@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
export default function useEditorSearch(CodeMirror: any) {

View File

@@ -1,6 +1,6 @@
import 'codemirror/addon/mode/multiplex';
import 'codemirror/mode/stex/stex';
import Setting from '@joplinapp/lib/models/Setting';
import Setting from '@joplin/lib/models/Setting';
// Joplin markdown is a the same as markdown mode, but it has configured defaults
// and support for katex math blocks

View File

@@ -1,6 +1,6 @@
import { useEffect } from 'react';
import CommandService from '@joplinapp/lib/services/CommandService';
import shim from '@joplinapp/lib/shim';
import CommandService from '@joplin/lib/services/CommandService';
import shim from '@joplin/lib/shim';
export default function useKeymap(CodeMirror: any) {

View File

@@ -1,4 +1,4 @@
const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplinapp/lib/markdownUtils').default;
const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplin/lib/markdownUtils').default;
// Markdown list indentation.
// If the current line starts with `markup.list` token,

View File

@@ -4,21 +4,21 @@ import { ScrollOptions, ScrollOptionTypes, EditorCommand, NoteBodyEditorProps }
import { resourcesStatus, commandAttachFileToBody, handlePasteEvent } from '../../utils/resourceHandling';
import useScroll from './utils/useScroll';
import styles_ from './styles';
import CommandService from '@joplinapp/lib/services/CommandService';
import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import CommandService from '@joplin/lib/services/CommandService';
import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import ToggleEditorsButton, { Value as ToggleEditorsButtonValue } from '../../../ToggleEditorsButton/ToggleEditorsButton';
import ToolbarButton from '../../../../gui/ToolbarButton/ToolbarButton';
import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration';
import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer';
import { _, closestSupportedLocale } from '@joplinapp/lib/locale';
import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
import { _, closestSupportedLocale } from '@joplin/lib/locale';
import setupContextMenu from './utils/setupContextMenu';
const { MarkupToHtml } = require('@joplinapp/renderer');
const { MarkupToHtml } = require('@joplin/renderer');
const taboverride = require('taboverride');
const { reg } = require('@joplinapp/lib/registry.js');
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const shim = require('@joplinapp/lib/shim').default;
const { themeStyle } = require('@joplinapp/lib/theme');
const { reg } = require('@joplin/lib/registry.js');
const BaseItem = require('@joplin/lib/models/BaseItem');
const shim = require('@joplin/lib/shim').default;
const { themeStyle } = require('@joplin/lib/theme');
const { clipboard } = require('electron');
const supportedLocales = require('./supportedLocales');

View File

@@ -1,5 +1,5 @@
import { NoteBodyEditorProps } from '../../../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props:NoteBodyEditorProps) {
return buildStyle(['TinyMCE', props.style.width, props.style.height], props.themeId, (theme:any) => {

View File

@@ -1,7 +1,7 @@
import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService';
import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService';
import bridge from '../../../../../services/bridge';
import { menuItems, ContextMenuOptions, ContextMenuItemType } from '../../../utils/contextMenu';
const Resource = require('@joplinapp/lib/models/Resource');
const Resource = require('@joplin/lib/models/Resource');
// x and y are the absolute coordinates, as returned by the context-menu event
// handler on the webContent. This function will return null if the point is

View File

@@ -1,5 +1,5 @@
import { useEffect, useCallback, useRef } from 'react';
import shim from '@joplinapp/lib/shim';
import shim from '@joplin/lib/shim';
interface HookDependencies {
editor:any,

View File

@@ -15,28 +15,28 @@ import useFormNote, { OnLoadEvent } from './utils/useFormNote';
import useFolder from './utils/useFolder';
import styles_ from './styles';
import { NoteEditorProps, FormNote, ScrollOptions, ScrollOptionTypes, OnChangeEvent, NoteBodyEditorProps } from './utils/types';
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import CommandService from '@joplinapp/lib/services/CommandService';
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import CommandService from '@joplin/lib/services/CommandService';
import ToolbarButton from '../ToolbarButton/ToolbarButton';
import Button, { ButtonLevel } from '../Button/Button';
import eventManager from '@joplinapp/lib/eventManager';
import eventManager from '@joplin/lib/eventManager';
import { AppState } from '../../app';
import ToolbarButtonUtils from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import { _ } from '@joplinapp/lib/locale';
import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext';
import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils';
import { _ } from '@joplin/lib/locale';
import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext';
import TagList from '../TagList';
import NoteTitleBar from './NoteTitle/NoteTitleBar';
import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils';
import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import usePrevious from '../hooks/usePrevious';
import Setting from '@joplinapp/lib/models/Setting';
import Setting from '@joplin/lib/models/Setting';
const { themeStyle } = require('@joplinapp/lib/theme');
const { substrWithEllipsis } = require('@joplinapp/lib/string-utils');
const { themeStyle } = require('@joplin/lib/theme');
const { substrWithEllipsis } = require('@joplin/lib/string-utils');
const NoteSearchBar = require('../NoteSearchBar.min.js');
const { reg } = require('@joplinapp/lib/registry.js');
const Note = require('@joplinapp/lib/models/Note.js');
const { reg } = require('@joplin/lib/registry.js');
const Note = require('@joplin/lib/models/Note.js');
const bridge = require('electron').remote.require('./bridge').default;
const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher');
const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher');
const NoteRevisionViewer = require('../NoteRevisionViewer.min');
const commands = [

View File

@@ -1,10 +1,10 @@
import * as React from 'react';
import { _ } from '@joplinapp/lib/locale';
import CommandService from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
import CommandService from '@joplin/lib/services/CommandService';
import { ChangeEvent, useCallback } from 'react';
import NoteToolbar from '../../NoteToolbar/NoteToolbar';
import { buildStyle } from '@joplinapp/lib/theme';
import time from '@joplinapp/lib/time';
import { buildStyle } from '@joplin/lib/theme';
import time from '@joplin/lib/time';
interface Props {
themeId: number,

View File

@@ -1,5 +1,5 @@
import { CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
const declarations:CommandDeclaration[] = [
{

View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusElementNoteBody',

View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'focusElementNoteTitle',

View File

@@ -1,5 +1,5 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { _ } from '@joplinapp/lib/locale';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
import { _ } from '@joplin/lib/locale';
export const declaration:CommandDeclaration = {
name: 'showLocalSearch',

View File

@@ -1,4 +1,4 @@
import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService';
import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService';
export const declaration:CommandDeclaration = {
name: 'showRevisions',

View File

@@ -1,6 +1,6 @@
import { NoteEditorProps } from '../utils/types';
const { buildStyle } = require('@joplinapp/lib/theme');
const { buildStyle } = require('@joplin/lib/theme');
export default function styles(props: NoteEditorProps) {
return buildStyle(['NoteEditor'], props.themeId, (theme: any) => {

View File

@@ -1,13 +1,13 @@
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplinapp/lib/locale';
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplin/lib/locale';
const bridge = require('electron').remote.require('./bridge').default;
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const Resource = require('@joplinapp/lib/models/Resource.js');
const Resource = require('@joplin/lib/models/Resource.js');
const fs = require('fs-extra');
const { clipboard } = require('electron');
const { toSystemSlashes } = require('@joplinapp/lib/path-utils');
const { toSystemSlashes } = require('@joplin/lib/path-utils');
export enum ContextMenuItemType {
None = '',

View File

@@ -1,8 +1,8 @@
import { FormNote } from './types';
const HtmlToMd = require('@joplinapp/lib/HtmlToMd');
const Note = require('@joplinapp/lib/models/Note');
const { MarkupToHtml } = require('@joplinapp/renderer');
const HtmlToMd = require('@joplin/lib/HtmlToMd');
const Note = require('@joplin/lib/models/Note');
const { MarkupToHtml } = require('@joplin/renderer');
export async function htmlToMarkdown(markupLanguage: number, html: string, originalCss:string): Promise<string> {
let newBody = '';

View File

@@ -1,14 +1,14 @@
import shim from '@joplinapp/lib/shim';
const Setting = require('@joplinapp/lib/models/Setting').default;
const Note = require('@joplinapp/lib/models/Note.js');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Resource = require('@joplinapp/lib/models/Resource.js');
import shim from '@joplin/lib/shim';
const Setting = require('@joplin/lib/models/Setting').default;
const Note = require('@joplin/lib/models/Note.js');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Resource = require('@joplin/lib/models/Resource.js');
const bridge = require('electron').remote.require('./bridge').default;
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const { reg } = require('@joplinapp/lib/registry.js');
const joplinRendererUtils = require('@joplinapp/renderer').utils;
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const { reg } = require('@joplin/lib/registry.js');
const joplinRendererUtils = require('@joplin/renderer').utils;
const { clipboard } = require('electron');
const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime;
const mimeUtils = require('@joplin/lib/mime-utils.js').mime;
const md5 = require('md5');
export async function handleResourceDownloadMode(noteBody: string) {

View File

@@ -1,7 +1,7 @@
// eslint-disable-next-line no-unused-vars
import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue';
import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils';
import { PluginStates } from '@joplinapp/lib/services/plugins/reducer';
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
export interface ToolbarButtonInfos {
[key:string]: ToolbarButtonInfo;

View File

@@ -1,5 +1,5 @@
import { useCallback } from 'react';
const Note = require('@joplinapp/lib/models/Note.js');
const Note = require('@joplin/lib/models/Note.js');
interface HookDependencies {
editorRef:any,

View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
const Folder = require('@joplinapp/lib/models/Folder');
const Folder = require('@joplin/lib/models/Folder');
interface HookDependencies {
folderId: string,

View File

@@ -1,17 +1,17 @@
import { useState, useEffect, useCallback } from 'react';
import { FormNote, defaultFormNote, ResourceInfos } from './types';
import { clearResourceCache, attachedResources } from './resourceHandling';
import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue';
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
import { handleResourceDownloadMode } from './resourceHandling';
const { MarkupToHtml } = require('@joplinapp/renderer');
const HtmlToHtml = require('@joplinapp/renderer/HtmlToHtml');
const { MarkupToHtml } = require('@joplin/renderer');
const HtmlToHtml = require('@joplin/renderer/HtmlToHtml');
const usePrevious = require('../../hooks/usePrevious').default;
const Note = require('@joplinapp/lib/models/Note');
const Setting = require('@joplinapp/lib/models/Setting').default;
const { reg } = require('@joplinapp/lib/registry.js');
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker.js');
const ResourceEditWatcher = require('@joplinapp/lib/services/ResourceEditWatcher/index').default;
const Note = require('@joplin/lib/models/Note');
const Setting = require('@joplin/lib/models/Setting').default;
const { reg } = require('@joplin/lib/registry.js');
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker.js');
const ResourceEditWatcher = require('@joplin/lib/services/ResourceEditWatcher/index').default;
export interface OnLoadEvent {
formNote: FormNote,

View File

@@ -1,12 +1,12 @@
import { PluginStates } from '@joplinapp/lib/services/plugins/reducer';
import contentScriptsToRendererRules from '@joplinapp/lib/services/plugins/utils/contentScriptsToRendererRules';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
import contentScriptsToRendererRules from '@joplin/lib/services/plugins/utils/contentScriptsToRendererRules';
import { useCallback, useMemo } from 'react';
import { ResourceInfos } from './types';
import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils';
import Setting from '@joplinapp/lib/models/Setting';
import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import Setting from '@joplin/lib/models/Setting';
const { themeStyle } = require('@joplinapp/lib/theme');
const Note = require('@joplinapp/lib/models/Note');
const { themeStyle } = require('@joplin/lib/theme');
const Note = require('@joplin/lib/models/Note');
interface HookDependencies {
themeId: number,

View File

@@ -1,16 +1,16 @@
import { useCallback } from 'react';
import { FormNote } from './types';
import contextMenu from './contextMenu';
import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplinapp/lib/locale';
const BaseItem = require('@joplinapp/lib/models/BaseItem');
const BaseModel = require('@joplinapp/lib/BaseModel').default;
const Resource = require('@joplinapp/lib/models/Resource.js');
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import { _ } from '@joplin/lib/locale';
const BaseItem = require('@joplin/lib/models/BaseItem');
const BaseModel = require('@joplin/lib/BaseModel').default;
const Resource = require('@joplin/lib/models/Resource.js');
const bridge = require('electron').remote.require('./bridge').default;
const { urlDecode } = require('@joplinapp/lib/string-utils');
const urlUtils = require('@joplinapp/lib/urlUtils');
const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js');
const { reg } = require('@joplinapp/lib/registry.js');
const { urlDecode } = require('@joplin/lib/string-utils');
const urlUtils = require('@joplin/lib/urlUtils');
const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js');
const { reg } = require('@joplin/lib/registry.js');
export default function useMessageHandler(scrollWhenReady:any, setScrollWhenReady:Function, editorRef:any, setLocalSearchResultCount:Function, dispatch:Function, formNote:FormNote) {
return useCallback(async (event: any) => {

View File

@@ -1,9 +1,9 @@
import { useEffect } from 'react';
import { FormNote, ScrollOptionTypes } from './types';
import editorCommandDeclarations from '../commands/editorCommandDeclarations';
import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService';
const time = require('@joplinapp/lib/time').default;
const { reg } = require('@joplinapp/lib/registry.js');
import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService';
const time = require('@joplin/lib/time').default;
const { reg } = require('@joplin/lib/registry.js');
const commandsWithDependencies = [
require('../commands/showLocalSearch'),