Merge pull request #16 from Coding/dashboard

Dashboard

Author: 春秋一语

.babelrc

@@ -12,6 +12,7 @@
       "moduleName": "@babel/runtime"
     }],
     "@babel/plugin-syntax-export-default-from",
+    "@babel/plugin-syntax-dynamic-import",
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
     ["@babel/plugin-proposal-class-properties", { "loose": true }]
   ],

app/changelog.html

@@ -183,6 +183,7 @@
         }
         .intro-pc-head .sub {
             display: flex;
+            justify-content: space-between;
             align-items: center;
             height: 40px;
             padding: 0 30px;
@@ -192,6 +193,10 @@
         .intro-pc-head .sub a {
             color: #e3e6e8;
         }
+        .intro-pc-head .sub .left {
+            display: flex;
+            align-items: center;
+        }
         .intro-pc-head .sub-menu {
             margin-right: 30px;
             position: relative;
@@ -337,7 +342,7 @@
             transition: height .2s ease;
         }
         .intro-mobile-head .dropdown .cs.on .cs-dropdown {
-            height: 250px;
+            height: 300px;
         }
         .intro-mobile-head .dropdown .cs-menu {
             display: flex;
@@ -616,21 +621,26 @@
                 </div>
             </div>
             <div class="sub">
-                <div class="sub-menu">
-                    <a class="post-message" href="https://studio.dev.tencent.com/intro">产品介绍</a>
-                </div>
-                <div class="sub-menu">
-                    <a href="https://studio.dev.tencent.com/dashboard/workspace" target="_blank" rel="noopener">工作空间</a>
-                </div>
-                <div class="sub-menu">
-                    <a class="post-message" href="https://studio.dev.tencent.com/plugins">插件市场</a>
-                </div>
-                <div class="sub-menu on">
-                    <a class="post-message" href="https://studio.dev.tencent.com/changelog">更新日志</a>
+                <div class="left">
+                    <div class="sub-menu">
+                        <a class="post-message" href="https://studio.dev.tencent.com/intro">产品介绍</a>
+                    </div>
+                    <div class="sub-menu">
+                        <a href="https://studio.dev.tencent.com/dashboard/workspace" target="_blank" rel="noopener">工作空间</a>
+                    </div>
+                    <div class="sub-menu">
+                        <a class="post-message" href="https://studio.dev.tencent.com/plugins">插件市场</a>
+                    </div>
+                    <div class="sub-menu on">
+                        <a class="post-message" href="https://studio.dev.tencent.com/changelog">更新日志</a>
+                    </div>
+                    <div class="sub-menu">
+                        <a href="https://studio.qcloud.coding.net/campaign/favorite-plugins/" target="_blank" rel="noopener">插件大赛</a>
+                        <div class="new">NEW</div>
+                    </div>
                 </div>
-                <div class="sub-menu">
-                    <a href="https://studio.qcloud.coding.net/campaign/favorite-plugins/" target="_blank" rel="noopener">插件大赛</a>
-                    <div class="new">NEW</div>
+                <div class="right">
+                    <a href="https://studio.dev.tencent.com/plugins-docs/" target="_blank" rel="noopener noreferrer">插件开发文档</a>
                 </div>
             </div>
         </div>
@@ -665,6 +675,9 @@
                         <div class="cs-menu">
                             <a class="post-message" href="https://studio.dev.tencent.com/plugins">插件市场</a>
                         </div>
+                        <div class="cs-menu">
+                            <a href="https://studio.dev.tencent.com/plugins-docs/" target="_blank" rel="noopener noreferrer">插件开发文档</a>
+                        </div>
                         <div class="cs-menu on">
                             <a class="post-message" href="https://studio.dev.tencent.com/changelog">更新日志</a>
                         </div>

app/commons/File/actions.js

@@ -2,7 +2,6 @@ import flattenDeep from 'lodash/flattenDeep'
 import { registerAction } from 'utils/actions'
 import settings from 'settings'
 import is from 'utils/is'
-import { action, when } from 'mobx'
 import api from 'backendAPI'
 import config from 'config'
 import { showModal } from 'components/Modal/actions'

app/commons/Tab/TabBar.jsx

@@ -1,6 +1,5 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import cx from 'classnames'
 import { observer } from 'mobx-react'
 import { dnd } from 'utils'
 import { defaultProps } from 'utils/decorators'

app/components/Editor/components/EditorWidgets/ModeWidget.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import * as monaco from 'monaco-editor'
+ 
 import config from 'config'
 import cx from 'classnames'
 import modeInfos from 'components/Editor/components/CodeEditor/addons/mode/modeInfos'

app/components/Modal/modals/About.jsx

@@ -1,10 +1,8 @@
+import React from 'react';
 
-import React from 'react'
-import i18n from 'utils/createI18n'
-import { dismissModal } from '../actions'
+const year = new Date().getFullYear();
 
-const Alert = (props) => {
-  const { meta, content } = props
+const Alert = () => {
   return (
     <div className='modal-content about'>
       <div className='title'>
@@ -31,12 +29,12 @@ const Alert = (props) => {
       </div>
       <div className='links'>
         <a href='/intro' className='link-item' target='_blank' rel='noopener noreferrer'>产品介绍</a>
-        <a href='https://coding.net/help/doc/cloud-studio' className='link-item' target='_blank' rel='noopener noreferrer' >帮助文档</a>
+        <a href='https://dev.tencent.com/help/doc/cloud-studio' className='link-item' target='_blank' rel='noopener noreferrer' >帮助文档</a>
         <a href='https://feedback.coding.net' className='link-item' target='_blank' rel='noopener noreferrer'>意见反馈</a>
       </div>
-      Copyright @ 2015-2018. All Rights Reserved. 扣钉网络 版权所有
+      <div>Copyright @ 2015-{year}. All Rights Reserved. 扣钉网络 版权所有</div>
     </div>
   )
 }
 
-export default Alert
+export default Alert;

app/components/MonacoEditor/MonacoReact/BaseDiffEditor.js

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
-import * as monaco from 'monaco-editor'
+ 
 
 import initialOptions from '../monacoDefaultOptions'
 import { findLanguageByextensions } from '../utils/findLanguage'

app/components/MonacoEditor/MonacoReact/BaseEditor.jsx

@@ -13,9 +13,30 @@ import { findLangueByExt } from '../utils/findLanguage'
 import { EditorInfo } from '../state'
 import initialOptions from '../monacoDefaultOptions'
 import registerCustomLanguages from '../languages'
+import { liftOff } from './grammars/configure-tokenizer'
+import { getTheme, getBase } from '../../../extensions/Editor.ext'
+
+import themes from '../themes'
+
+themes.forEach((themeConfig) => {
+  const { name, theme } = themeConfig
+  const transformedTheme = getTheme(theme)
+  const { colors, rules, type } = transformedTheme
+  monaco.editor.defineTheme(name, {
+    base: getBase(type),
+    inherit: true,
+    colors,
+    rules
+  })
+})
+
+// import 'monaco.languages.css'
+// import '../languageServices/css/monaco.contribution'
 
 registerCustomLanguages()
 
+liftOff(monaco)
+
 function noop () {}
 
 const Div = measure('div')

app/components/MonacoEditor/MonacoReact/grammars/configure-tokenizer.js

@@ -0,0 +1,32 @@
+import { loadWASM } from 'onigasm' // peer dependency of 'monaco-textmate'
+import LanguageRegistry from './monaco-textmate-languages'
+import { wireTmGrammars } from './set-grammars'
+
+import languages from './languages'
+
+const grammars = new Map()
+
+languages.forEach((language) => {
+  grammars.set(language.id.toString(), language.scopeName.toString())
+})
+
+let wasmLoaded = false
+
+export async function liftOff (monaco) {
+  if (!wasmLoaded) {
+    // eslint-disable-next-line global-require
+    await loadWASM(require('onigasm/lib/onigasm.wasm')) // See https://www.npmjs.com/package/onigasm#light-it-up
+    wasmLoaded = true
+  } else {
+    return
+  }
+  const registry = new LanguageRegistry({
+    basePath: 'grammarsDefinition',
+    jsonFetcher: async (uri) => {
+      const relativeUri = uri.replace('/grammars', '')
+      const result = require(`./${relativeUri}`)
+      return JSON.stringify(result)
+    },
+  })
+  await wireTmGrammars(monaco, registry, grammars)
+}

app/components/MonacoEditor/MonacoReact/grammars/grammarsDefinition/applescript/applescript.json

@@ -0,0 +1,7 @@
+{
+  "id": "applescript",
+  "extensions": [".scpt"],
+  "aliases": ["AppleScript", "applescript"],
+  "mimeType": ["application/applescript"],
+  "scopeName": "source.applescript"
+}