clickgo 3.0.2-dev3 → 3.0.3-dev4

package/README.md

@@ -5,10 +5,10 @@
 [![npm version](https://img.shields.io/npm/v/clickgo.svg?colorB=brightgreen)](https://www.npmjs.com/package/clickgo "Stable Version")
 [![npm version](https://img.shields.io/npm/v/clickgo/dev.svg)](https://www.npmjs.com/package/clickgo "Development Version")
 [![npm version](https://img.shields.io/npm/v/clickgo/beta.svg)](https://www.npmjs.com/package/clickgo "Beta Version")
-[![License](https://img.shields.io/github/license/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/blob/master/LICENSE)
-[![GitHub issues](https://img.shields.io/github/issues/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/issues)
-[![GitHub Releases](https://img.shields.io/github/release/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/releases "Stable Release")
-[![GitHub Pre-Releases](https://img.shields.io/github/release/maiyun/ClickGo/all.svg)](https://github.com/MaiyunNET/ClickGo/releases "Pre-Release")
+[![License](https://img.shields.io/github/license/maiyun/clickgo.svg)](https://github.com/maiyun/clickgo/blob/master/LICENSE)
+[![GitHub issues](https://img.shields.io/github/issues/maiyun/clickgo.svg)](https://github.com/maiyun/clickgo/issues)
+[![GitHub Releases](https://img.shields.io/github/release/maiyun/clickgo.svg)](https://github.com/maiyun/clickgo/releases "Stable Release")
+[![GitHub Pre-Releases](https://img.shields.io/github/release/maiyun/clickgo/all.svg)](https://github.com/maiyun/clickgo/releases "Pre-Release")
 
 Quickly and easily create a beautiful console interface.
 

package/dist/clickgo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = void 0;
+exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = void 0;
 const version = '3.0.0';
 function getVersion() {
     return version;
@@ -31,15 +31,6 @@ function getSafe() {
     return safe;
 }
 exports.getSafe = getSafe;
-let cdn = '';
-function setCdn(val) {
-    cdn = val;
-}
-exports.setCdn = setCdn;
-function getCdn() {
-    return cdn;
-}
-exports.getCdn = getCdn;
 exports.vue = window.Vue;
 exports.control = require("./lib/control");
 exports.core = require("./lib/core");

package/dist/clickgo.ts

@@ -42,14 +42,6 @@ export function getSafe(): boolean {
     return safe;
 }
 
-let cdn = '';
-export function setCdn(val: string): void {
-    cdn = val;
-}
-export function getCdn(): string {
-    return cdn;
-}
-
 export const vue: import('../types/index').IVueObject = (window as any).Vue;
 
 export * as control from './lib/control';

package/dist/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
+exports.init = exports.getSafe = exports.setSafe = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
 function getVersion() {
     return exports.clickgo.getVersion();
 }
@@ -30,24 +30,16 @@ function getSafe() {
     return exports.clickgo.getSafe();
 }
 exports.getSafe = getSafe;
-function setCdn(val) {
-    exports.clickgo.setCdn(val);
-}
-exports.setCdn = setCdn;
-function getCdn() {
-    return exports.clickgo.getCdn();
-}
-exports.getCdn = getCdn;
-function init(cdn = 'https://cdn.jsdelivr.net') {
+function init() {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const paths = [
-            cdn + '/npm/vue@3.2.31/dist/vue.global.min.js'
+            loader.cdn + '/npm/vue@3.2.31/dist/vue.global.min.js'
         ];
         let ro = true;
         if (!(window.ResizeObserver)) {
             ro = false;
-            paths.push(cdn + '/npm/@juggle/resize-observer@3.3.1/lib/exports/resize-observer.umd.min.js');
+            paths.push(loader.cdn + '/npm/@juggle/resize-observer@3.3.1/lib/exports/resize-observer.umd.min.js');
         }
         yield loader.loadScripts(paths);
         if (!ro) {
@@ -55,22 +47,21 @@ function init(cdn = 'https://cdn.jsdelivr.net') {
             window.ResizeObserver = window.ResizeObserver.ResizeObserver;
         }
         const map = {
-            'jszip': cdn + '/npm/jszip@3.10.0/dist/jszip.min'
+            'jszip': loader.cdn + '/npm/jszip@3.10.0/dist/jszip.min'
         };
         const after = '?' + Math.random().toString();
         const files = yield loader.sniffFiles('clickgo.js', {
             'dir': __dirname + '/',
             'after': after,
-            'afterIgnore': new RegExp('^' + cdn.replace(/\./g, '\\.')),
+            'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')),
             'map': map
         });
         const cg = loader.require('clickgo', files, {
             'dir': __dirname + '/',
             'map': map
         })[0];
-        cg.setCdn(cdn);
         try {
-            const style = yield (yield fetch(__dirname + '/global.css' + (!__dirname.startsWith(cdn) ? after : ''))).text();
+            const style = yield (yield fetch(__dirname + '/global.css' + (!__dirname.startsWith(loader.cdn) ? after : ''))).text();
             (_a = document.getElementById('cg-global')) === null || _a === void 0 ? void 0 : _a.insertAdjacentHTML('afterbegin', style);
         }
         catch (_b) {

package/dist/index.ts

@@ -33,24 +33,17 @@ export function getSafe(): boolean {
     return clickgo.getSafe();
 }
 
-export function setCdn(val: string): void {
-    clickgo.setCdn(val);
-}
-export function getCdn(): string {
-    return clickgo.getCdn();
-}
-
-export async function init(cdn: string = 'https://cdn.jsdelivr.net'): Promise<void> {
+export async function init(): Promise<void> {
     // --- 通过标签加载库 ---
     const paths: string[] = [
-        cdn + '/npm/vue@3.2.31/dist/vue.global.min.js'
+        loader.cdn + '/npm/vue@3.2.31/dist/vue.global.min.js'
     ];
     // --- 判断 ResizeObserver 是否存在 ---
     let ro = true;
     // ResizeObserver = undefined;
     if (!((window as any).ResizeObserver)) {
         ro = false;
-        paths.push(cdn + '/npm/@juggle/resize-observer@3.3.1/lib/exports/resize-observer.umd.min.js');
+        paths.push(loader.cdn + '/npm/@juggle/resize-observer@3.3.1/lib/exports/resize-observer.umd.min.js');
     }
     // --- 加载 vue 以及必要库 ---
     await loader.loadScripts(paths);
@@ -61,24 +54,23 @@ export async function init(cdn: string = 'https://cdn.jsdelivr.net'): Promise<vo
     }
     // --- map 加载库 ---
     const map: Record<string, string> = {
-        'jszip': cdn + '/npm/jszip@3.10.0/dist/jszip.min'
+        'jszip': loader.cdn + '/npm/jszip@3.10.0/dist/jszip.min'
     };
     // --- 加载 clickgo 主程序 ---
     const after = '?' + Math.random().toString();
     const files = await loader.sniffFiles('clickgo.js', {
         'dir': __dirname + '/',
         'after': after,
-        'afterIgnore': new RegExp('^' + cdn.replace(/\./g, '\\.')),
+        'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')),
         'map': map
     });
     const cg = loader.require('clickgo', files, {
         'dir': __dirname + '/',
         'map': map
     })[0] as typeof import('../dist/clickgo');
-    cg.setCdn(cdn);
     // --- 加载 clickgo 的 global css ---
     try {
-        const style = await (await fetch(__dirname + '/global.css' + (!__dirname.startsWith(cdn) ? after : ''))).text();
+        const style = await (await fetch(__dirname + '/global.css' + (!__dirname.startsWith(loader.cdn) ? after : ''))).text();
         document.getElementById('cg-global')?.insertAdjacentHTML('afterbegin', style);
     }
     catch {

package/dist/lib/core.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.removeSystemEventListener = exports.setSystemEventListener = exports.globalEvents = exports.getModule = exports.initModules = exports.regModule = exports.config = void 0;
+exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.removeSystemEventListener = exports.setSystemEventListener = exports.globalEvents = exports.getModule = exports.initModules = exports.regModule = exports.cdn = exports.config = void 0;
 const clickgo = require("../clickgo");
 const fs = require("./fs");
 const form = require("./form");
@@ -34,6 +34,7 @@ exports.config = clickgo.vue.reactive({
     'desktop.wallpaper': null,
     'desktop.path': null
 });
+exports.cdn = '';
 clickgo.vue.watch(exports.config, function () {
     for (const key in configOrigin) {
         if (exports.config[key] !== undefined) {
@@ -87,7 +88,7 @@ const modules = {
         func: function () {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise(function (resolve, reject) {
-                    fetch(clickgo.getCdn() + '/npm/monaco-editor@0.33.0/min/vs/loader.js').then(function (r) {
+                    fetch(loader.cdn + '/npm/monaco-editor@0.33.0/min/vs/loader.js').then(function (r) {
                         return r.blob();
                     }).then(function (b) {
                         return tool.blob2DataUrl(b);

package/dist/lib/core.ts

@@ -40,6 +40,8 @@ export const config: types.IConfig = clickgo.vue.reactive({
     'desktop.path': null
 });
 
+export const cdn = '';
+
 clickgo.vue.watch(config, function() {
     // --- 检测有没有缺少的 config key ---
     for (const key in configOrigin) {
@@ -97,7 +99,7 @@ const modules: Record<string, { func: () => any | Promise<any>; 'obj': null | an
     'monaco': {
         func: async function() {
             return new Promise(function(resolve, reject) {
-                fetch(clickgo.getCdn() + '/npm/monaco-editor@0.33.0/min/vs/loader.js').then(function(r) {
+                fetch(loader.cdn + '/npm/monaco-editor@0.33.0/min/vs/loader.js').then(function(r) {
                     return r.blob();
                 }).then(function(b) {
                     return tool.blob2DataUrl(b);

package/dist/lib/form.js

@@ -1101,9 +1101,6 @@ function create(opt) {
                 getSafe() {
                     return clickgo.getSafe();
                 },
-                getCdn() {
-                    return clickgo.getCdn();
-                },
                 'control': {
                     read: function (blob) {
                         return clickgo.control.read(blob);
@@ -1111,6 +1108,7 @@ function create(opt) {
                 },
                 'core': {
                     'config': clickgo.core.config,
+                    'cdn': loader.cdn,
                     initModules: function (names) {
                         return clickgo.core.initModules(names);
                     },

package/dist/lib/form.ts

@@ -1377,9 +1377,6 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
             getSafe(): boolean {
                 return clickgo.getSafe();
             },
-            getCdn(): string {
-                return clickgo.getCdn();
-            },
             'control': {
                 read: function(blob: Blob): Promise<false | types.TControl> {
                     return clickgo.control.read(blob);
@@ -1387,6 +1384,7 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
             },
             'core': {
                 'config': clickgo.core.config,
+                'cdn': loader.cdn,
                 initModules: function(names: string | string[]): Promise<number> {
                     return clickgo.core.initModules(names);
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.0.2-dev3",
+  "version": "3.0.3-dev4",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -18,7 +18,7 @@
     "native4": "electron ./dist/test/native/index4"
   },
   "devDependencies": {
-    "@litert/loader": "^3.2.0",
+    "@litert/loader": "^3.3.0",
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",

package/types/index.d.ts

@@ -14,10 +14,8 @@ export function getNative(): boolean;
 export function getPlatform(): NodeJS.Platform | 'web';
 export function setSafe(val: boolean): void;
 export function getSafe(): boolean;
-export function setCdn(val: string): void;
-export function getCdn(): string;
 
-export function init(cdn?: string): Promise<void>;
+export function init(): Promise<void>;
 
 // --- core 核心 ---