From b05617fa880bce240aeb7dc8d6e603031a3d8d7a Mon Sep 17 00:00:00 2001 From: yyc-git <395976266@qq.com> Date: Fri, 24 Nov 2023 16:52:02 +0800 Subject: [PATCH] feat(uicontrol): add Menu (chore: update package.json->meta3d:publish_dev_auto script) --- .../meta3d-action-publish/package.json | 2 +- contributes/meta3d-action-run/package.json | 2 +- contributes/meta3d-action-stop/package.json | 2 +- .../meta3d-input-runstopbutton/package.json | 2 +- .../meta3d-ui-control-button/package.json | 2 +- .../meta3d-ui-control-game-view/package.json | 2 +- contributes/meta3d-ui-control-menu/.gitignore | 19 ++++ .../meta3d-ui-control-menu/gulpfile.js | 25 +++++ .../meta3d-ui-control-menu/package.json | 2 +- .../meta3d-ui-control-menu/src/Main.ts | 73 +++++++++++++ .../meta3d-ui-control-menu/tsconfig.json | 24 +++++ .../meta3d-ui-control-menu/webpack.config.js | 64 ++++++++++++ .../meta3d-ui-control-scene-view/package.json | 2 +- .../package.json | 6 +- .../meta3d-ui-control-window/package.json | 2 +- defaults/meta3d-type/src/Index.res | 6 ++ defaults/meta3d-type/src/Index.ts | 7 +- .../UIControlProtocolConfigType.res | 2 +- .../contribute/UIControlProtocolConfigType.ts | 2 +- .../lib/es6_global/src/ExtensionManager.bs.js | 10 ++ .../meta3d/lib/js/src/ExtensionManager.bs.js | 10 ++ defaults/meta3d/src/ExtensionManager.res | 14 +++ doc/0.21.0.org | 97 +++++++++++++----- .../meta3d-pipeline-root/package.json | 1 + .../extensions/meta3d-bs-most/package.json | 3 +- .../core/extensions/meta3d-core/package.json | 8 +- .../meta3d-engine-basic/package.json | 2 +- .../meta3d-engine-core/package.json | 1 + .../extensions/meta3d-immutable/package.json | 4 +- .../extensions/meta3d-immutable/src/Main.ts | 2 + .../package.json | 2 +- .../meta3d-bs-most-protocol/package.json | 2 +- .../meta3d-core-protocol/package.json | 3 +- .../meta3d-engine-basic-protocol/package.json | 2 +- .../meta3d-engine-core-protocol/package.json | 2 +- .../meta3d-immutable-protocol/package.json | 4 +- .../src/service/ServiceType.ts | 2 + .../meta3d-pipeline-editor-event/package.json | 2 +- .../extensions/meta3d-event-data/package.json | 3 +- .../meta3d-event-sourcing/package.json | 2 +- .../extensions/meta3d-event/package.json | 3 +- .../meta3d-event-data-protocol/package.json | 2 +- .../meta3d-event-protocol/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../meta3d-export-scene/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../lib/bs/.bsdeps | 2 +- .../lib/bs/.compiler.log | 4 +- .../lib/bs/.ninja_log | 14 +-- .../ServiceType-Meta3dEditorWholeProtocol.cmi | Bin 1797 -> 1797 bytes .../ServiceType-Meta3dEditorWholeProtocol.cmt | Bin 5970 -> 5970 bytes .../meta3d-editor-whole-protocol/package.json | 4 +- .../meta3d-export-scene-protocol/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../meta3d-imgui-webgl1-renderer/package.json | 2 +- .../package.json | 2 +- .../ui/extensions/meta3d-ui/package.json | 1 + .../ui/extensions/meta3d-webgl1/package.json | 1 + .../meta3d-skin-protocol/package.json | 2 +- .../package.json | 2 +- .../meta3d-ui-protocol/package.json | 2 +- .../meta3d-webgl1-protocol/package.json | 2 +- .../package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../meta3d-component-geometry/package.json | 3 +- .../meta3d-component-pbrmaterial/package.json | 3 +- .../package.json | 3 +- .../meta3d-component-transform/package.json | 3 +- .../package.json | 3 +- .../meta3d-pipeline-camera/package.json | 2 +- .../meta3d-pipeline-dispose/package.json | 2 +- .../meta3d-pipeline-transform/package.json | 2 +- .../meta3d-engine-scene/package.json | 2 +- .../meta3d-texture-basicsource/package.json | 3 +- .../meta3d-gameobject-protocol/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../meta3d-engine-scene-protocol/package.json | 2 +- .../package.json | 2 +- .../src/state/StateType.gen.tsx | 2 +- .../meta3d-engine-whole/package.json | 2 +- .../extensions/meta3d-load-glb/package.json | 2 +- .../extensions/meta3d-load-scene/package.json | 2 +- .../meta3d-engine-whole-protocol/package.json | 2 +- .../meta3d-load-glb-protocol/package.json | 2 +- .../meta3d-load-scene-protocol/package.json | 2 +- .../package.json | 2 +- .../meta3d-engine-web-render/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../extensions/meta3d-three-api/package.json | 2 +- .../extensions/meta3d-three/package.json | 2 +- .../package.json | 2 +- .../meta3d-three-api-protocol/package.json | 2 +- .../meta3d-three-protocol/package.json | 2 +- .../element_visual/utils/ElementMRUtils.res | 1 + .../components/UIControlInspector.res | 36 +++++-- .../element_assemble/utils/SpecificUtils.res | 12 ++- .../test/step-definitions/elementMR.steps.res | 6 ++ platform/frontend-utils/src/ErrorUtils.res | 8 ++ .../package.json | 2 +- .../meta3d-action-run-protocol/package.json | 2 +- .../meta3d-action-stop-protocol/package.json | 2 +- .../package.json | 2 +- .../package.json | 3 +- .../package.json | 3 +- .../.gitignore | 19 ++++ .../gulpfile.js | 45 ++++++++ .../meta3d-ui-control-menu-protocol/icon.png | Bin 0 -> 3766 bytes .../package.json | 2 +- .../src/Config.ts | 50 +++++++++ .../src/Index.ts | 22 ++++ .../tsconfig.json | 24 +++++ .../webpack.config.js | 64 ++++++++++++ .../package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- 128 files changed, 743 insertions(+), 143 deletions(-) create mode 100755 contributes/meta3d-ui-control-menu/.gitignore create mode 100755 contributes/meta3d-ui-control-menu/gulpfile.js create mode 100755 contributes/meta3d-ui-control-menu/src/Main.ts create mode 100755 contributes/meta3d-ui-control-menu/tsconfig.json create mode 100755 contributes/meta3d-ui-control-menu/webpack.config.js create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/.gitignore create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/gulpfile.js create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/icon.png create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Config.ts create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Index.ts create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/tsconfig.json create mode 100755 protocols/contribute_protocols/meta3d-ui-control-menu-protocol/webpack.config.js diff --git a/contributes/meta3d-action-publish/package.json b/contributes/meta3d-action-publish/package.json index bfec75026..778a7c391 100755 --- a/contributes/meta3d-action-publish/package.json +++ b/contributes/meta3d-action-publish/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-action-run/package.json b/contributes/meta3d-action-run/package.json index 4fcab565c..156b3352e 100755 --- a/contributes/meta3d-action-run/package.json +++ b/contributes/meta3d-action-run/package.json @@ -12,7 +12,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-action-stop/package.json b/contributes/meta3d-action-stop/package.json index 4d4119c1a..980fa96c1 100755 --- a/contributes/meta3d-action-stop/package.json +++ b/contributes/meta3d-action-stop/package.json @@ -12,7 +12,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-input-runstopbutton/package.json b/contributes/meta3d-input-runstopbutton/package.json index 9a2f1bf26..d34521428 100755 --- a/contributes/meta3d-input-runstopbutton/package.json +++ b/contributes/meta3d-input-runstopbutton/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-ui-control-button/package.json b/contributes/meta3d-ui-control-button/package.json index fa89a5604..07ec92a4e 100755 --- a/contributes/meta3d-ui-control-button/package.json +++ b/contributes/meta3d-ui-control-button/package.json @@ -12,7 +12,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-ui-control-game-view/package.json b/contributes/meta3d-ui-control-game-view/package.json index 25d704d9a..0288d45d9 100755 --- a/contributes/meta3d-ui-control-game-view/package.json +++ b/contributes/meta3d-ui-control-game-view/package.json @@ -12,7 +12,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-ui-control-menu/.gitignore b/contributes/meta3d-ui-control-menu/.gitignore new file mode 100755 index 000000000..27f6619fb --- /dev/null +++ b/contributes/meta3d-ui-control-menu/.gitignore @@ -0,0 +1,19 @@ +.DS_Store +.merlin +.idea/ +.vscode/ +jest_0/ +reference/ +node_modules/ +mine/ + +coverage + +dist/ + +npm-debug + +.bsb.lock + +yarn.lock + diff --git a/contributes/meta3d-ui-control-menu/gulpfile.js b/contributes/meta3d-ui-control-menu/gulpfile.js new file mode 100755 index 000000000..a4c8812fc --- /dev/null +++ b/contributes/meta3d-ui-control-menu/gulpfile.js @@ -0,0 +1,25 @@ +var gulp = require("gulp"); +var path = require("path"); +var publish = require("meta3d-tool-publish") + +gulp.task("publish_local_env", function (done) { + publish.publishContribute( + "local", + path.join(__dirname, "package.json"), + path.join(__dirname, "dist/static/js", "main.js") + ).then(() => { + done() + }) +}); + +gulp.task("publish_production_env", function (done) { + publish.publishContribute( + "production", + path.join(__dirname, "package.json"), + path.join(__dirname, "dist/static/js", "main.js") + ).then(() => { + done() + }) +}); + + diff --git a/contributes/meta3d-ui-control-menu/package.json b/contributes/meta3d-ui-control-menu/package.json index f444c02e4..f1bd69781 100755 --- a/contributes/meta3d-ui-control-menu/package.json +++ b/contributes/meta3d-ui-control-menu/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && npm run meta3d:publish_dev", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-ui-control-menu/src/Main.ts b/contributes/meta3d-ui-control-menu/src/Main.ts new file mode 100755 index 000000000..e5c64b74a --- /dev/null +++ b/contributes/meta3d-ui-control-menu/src/Main.ts @@ -0,0 +1,73 @@ +import { getContribute as getContributeMeta3D, state as meta3dState } from "meta3d-type" +import { inputFunc, specificData, outputData, uiControlName, menuLabel, actionName, state } from "meta3d-ui-control-menu-protocol" +import { service, uiControlContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType" +import type { Map } from "immutable" + +export let getContribute: getContributeMeta3D> = (api) => { + return { + uiControlName: uiControlName, + func: (meta3dState, + _, + { + rect, + label, + items + } + ) => { + let { menu } = api.nullable.getExn(api.getPackageService(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState) + + // let items: Array<[menuLabel, Record]> = [ + // [ + // "编辑", + // { + // "导出事件": exportEventActionName, + // "导出单一事件": exportSingleEventActionName, + // "导入事件": importEventActionName + // } + // ], + // [ + // "发布", + // { + // "本地包": publishActionName + // } + // ], + // [ + // "帮助", + // { + // "关于Meta3D": jumpToLinkActionName + // } + // ], + // ] + + console.log( + rect, + label, + items + + ) + + let data = menu(meta3dState, items.map(([label, secondLevelData]) => [ + label, + api.immutable.createMapOfData(meta3dState, secondLevelData).keySeq().toArray() + ]), "Menu Window", rect) + meta3dState = data[0] + let selectItemLabel = data[1] + + if (api.nullable.isNullable(selectItemLabel)) { + return Promise.resolve([meta3dState, null]) + } + + selectItemLabel = api.nullable.getExn(selectItemLabel) + + let actionNameMap: Map = items.map(([_, secondLevelData]) => api.immutable.createMapOfData(meta3dState, secondLevelData) + ).reduce((result, map) => { + return result.concat(map) + }, api.immutable.createMap(meta3dState)) + + let { trigger } = api.nullable.getExn(api.getPackageService(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState) + + return trigger(meta3dState, "meta3d-event-protocol", api.nullable.getExn(actionNameMap.get(selectItemLabel)), null).then(meta3dState => [meta3dState, null]) + }, + init: (meta3dState) => Promise.resolve(meta3dState) + } +} diff --git a/contributes/meta3d-ui-control-menu/tsconfig.json b/contributes/meta3d-ui-control-menu/tsconfig.json new file mode 100755 index 000000000..a8418c65b --- /dev/null +++ b/contributes/meta3d-ui-control-menu/tsconfig.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "target": "ES6", + "module": "ES6", + "moduleResolution": "node", + "sourceMap": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "jsx": "react", + // "noEmit": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + "noImplicitReturns": true, + "lib": [ + "DOM", + "ESNext", + ], + "types": [], + "strict": true + }, + "include": [ + "./src" + ] +} \ No newline at end of file diff --git a/contributes/meta3d-ui-control-menu/webpack.config.js b/contributes/meta3d-ui-control-menu/webpack.config.js new file mode 100755 index 000000000..1de4da2d5 --- /dev/null +++ b/contributes/meta3d-ui-control-menu/webpack.config.js @@ -0,0 +1,64 @@ +const path = require('path'); +const { CleanWebpackPlugin } = require('clean-webpack-plugin'); + +module.exports = { + entry: "./src/Main.ts", + mode: process.env.NODE_ENV.trim() == 'production' ? 'production' : 'development', + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'static/js/[name].js', + library: { + name: 'Contribute', + type: 'window', + }, + }, + + // Enable sourcemaps for debugging webpack's output. + // devtool: "source-map", + + resolve: { + extensions: ['.ts', '.tsx', '.js', '.jsx', '.scss'], + modules: ['node_modules'] + }, + + module: { + rules: [ + // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'. + { + test: /\.tsx?$/, + exclude: /node_modules/, + use: "ts-loader" + }, + // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'. + { + enforce: 'pre', + test: /\.js$/, + loader: "source-map-loader" + }, + ] + }, + plugins: [ + /** + * All files inside webpack's output.path directory will be removed once, but the + * directory itself will not be. If using webpack 4+'s default configuration, + * everything under /dist/ will be removed. + * Use cleanOnceBeforeBuildPatterns to override this behavior. + * + * During rebuilds, all webpack assets that are not used anymore + * will be removed automatically. + * + * See `Options and Defaults` for information + */ + new CleanWebpackPlugin(), + // new HtmlWebpackPlugin({ + // template: './user.html', + // filename: 'user.html', + // }), + ], + // When importing a module whose path matches one of the following, just + // assume a corresponding global variable exists and use that instead. + // This is important because it allows us to avoid bundling all of our + // dependencies, which allows browsers to cache those libraries between builds. + externals: { + } +}; \ No newline at end of file diff --git a/contributes/meta3d-ui-control-scene-view/package.json b/contributes/meta3d-ui-control-scene-view/package.json index b354dc8ec..d5337c9cb 100755 --- a/contributes/meta3d-ui-control-scene-view/package.json +++ b/contributes/meta3d-ui-control-scene-view/package.json @@ -11,7 +11,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/contributes/meta3d-ui-control-switch-button/package.json b/contributes/meta3d-ui-control-switch-button/package.json index e487848ca..c6569f572 100755 --- a/contributes/meta3d-ui-control-switch-button/package.json +++ b/contributes/meta3d-ui-control-switch-button/package.json @@ -10,8 +10,8 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", -"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], @@ -32,4 +32,4 @@ "webpack": "^5.62.1", "webpack-cli": "^4.9.1" } -} +} \ No newline at end of file diff --git a/contributes/meta3d-ui-control-window/package.json b/contributes/meta3d-ui-control-window/package.json index db9ef3cc8..827efe410 100755 --- a/contributes/meta3d-ui-control-window/package.json +++ b/contributes/meta3d-ui-control-window/package.json @@ -12,7 +12,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/defaults/meta3d-type/src/Index.res b/defaults/meta3d-type/src/Index.res index 7feaa0b65..5678fb68f 100755 --- a/defaults/meta3d-type/src/Index.res +++ b/defaults/meta3d-type/src/Index.res @@ -84,11 +84,17 @@ type nullableAPI = { type list +type arrayData + type map +type dictData + type immutableAPI = { createList: (. state) => list, + createListOfData: (. state, arrayData) => list, createMap: (. state) => map, + createMapOfData: (. state, dictData) => map, } type actionName = string diff --git a/defaults/meta3d-type/src/Index.ts b/defaults/meta3d-type/src/Index.ts index 2e8aa1351..682fe3d6d 100755 --- a/defaults/meta3d-type/src/Index.ts +++ b/defaults/meta3d-type/src/Index.ts @@ -32,7 +32,12 @@ export type nullableAPI = { }; // tslint:disable-next-line:interface-over-type-literal -export type immutableAPI = { createList: (state: state) => List; createMap: (state: state) => Map }; +export type immutableAPI = { + createList: (state: state) => List; + createListOfData: (state: state, data: Array) => List; + createMap: (state: state) => Map + createMapOfData: (state: state, data: Record) => Map +}; // tslint:disable-next-line:interface-over-type-literal export type actionAPI = { getActionState: (state: state, actionName: string) => actionState; setActionState: (state: state, actionName: string, actionState: actionState) => state }; diff --git a/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.res b/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.res index 1b44b460c..92326266d 100755 --- a/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.res +++ b/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.res @@ -21,7 +21,7 @@ type versionRange = string type generateUIControlCommonDataStr = string => string -type uiControlSpecicFieldType = [#string | #imageBase64] +type uiControlSpecicFieldType = [#string | #imageBase64 | #menuItems] type uiControlSpecicFieldValue diff --git a/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.ts b/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.ts index 8e069bb37..7de485fd7 100755 --- a/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.ts +++ b/defaults/meta3d-type/src/contribute/UIControlProtocolConfigType.ts @@ -19,7 +19,7 @@ export type versionRange = string export type generateUIControlCommonDataStr = (rect: string) => string -type uiControlSpecicFieldType = "string" | "imageBase64" +type uiControlSpecicFieldType = "string" | "imageBase64" | "menuItems" type uiControlSpecicFieldValue = any diff --git a/defaults/meta3d/lib/es6_global/src/ExtensionManager.bs.js b/defaults/meta3d/lib/es6_global/src/ExtensionManager.bs.js index 3e20f97ca..47c95bff8 100644 --- a/defaults/meta3d/lib/es6_global/src/ExtensionManager.bs.js +++ b/defaults/meta3d/lib/es6_global/src/ExtensionManager.bs.js @@ -164,11 +164,21 @@ function _buildImmutableAPI(nullableAPI, getPackageService) { let { createList } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) return createList() + }), + createListOfData: (function (state, data){ + let { createListOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createListOfData(data) }), createMap: (function (state){ let { createMap } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) return createMap() + }), + createMapOfData: (function (state, data){ + let { createMapOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createMapOfData(data) }) }; } diff --git a/defaults/meta3d/lib/js/src/ExtensionManager.bs.js b/defaults/meta3d/lib/js/src/ExtensionManager.bs.js index 82e940863..7afbc94ad 100644 --- a/defaults/meta3d/lib/js/src/ExtensionManager.bs.js +++ b/defaults/meta3d/lib/js/src/ExtensionManager.bs.js @@ -164,11 +164,21 @@ function _buildImmutableAPI(nullableAPI, getPackageService) { let { createList } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) return createList() + }), + createListOfData: (function (state, data){ + let { createListOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createListOfData(data) }), createMap: (function (state){ let { createMap } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) return createMap() + }), + createMapOfData: (function (state, data){ + let { createMapOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createMapOfData(data) }) }; } diff --git a/defaults/meta3d/src/ExtensionManager.res b/defaults/meta3d/src/ExtensionManager.res index 2bee53adc..90c650c47 100755 --- a/defaults/meta3d/src/ExtensionManager.res +++ b/defaults/meta3d/src/ExtensionManager.res @@ -228,6 +228,13 @@ let _buildImmutableAPI = (nullableAPI, getPackageService): Meta3dType.Index.immu return createList() } `), + createListOfData: %raw(` + function (state, data){ + let { createListOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createListOfData(data) + } + `), createMap: %raw(` function (state){ let { createMap } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) @@ -235,6 +242,13 @@ let _buildImmutableAPI = (nullableAPI, getPackageService): Meta3dType.Index.immu return createMap() } `), + createMapOfData: %raw(` + function (state, data){ + let { createMapOfData } = nullableAPI.getExn(getPackageService(state, "meta3d-editor-whole-protocol")).core(state).immutable(state) + + return createMapOfData(data) + } + `), } let _buildActionAPI = ( diff --git a/doc/0.21.0.org b/doc/0.21.0.org index 1ac2c097c..aa36e0fe1 100755 --- a/doc/0.21.0.org +++ b/doc/0.21.0.org @@ -913,7 +913,7 @@ TODO pass run test: -** TODO Menu +** DONE Menu Menu->Specific: # set Array> Array<[menuLabel, Record]> @@ -923,14 +923,65 @@ Array<[menuLabel, Record]> TODO use Textarea directly +TODO test run, stop + TODO update core, whole package + + +** TODO fix: change custom action: ui control inspector->event select value not change + + +** TODO fix: import app->start package in ap assemble space->enter Index: should unstart package + + + +** TODO menu add actions + +TODO run test: + publish + ... + + ** TODO Asset separate header, body: header = multiple Image Buttons +** TODO refactor: extract asset package + + +** TODO update drag to Scene View + + + + + + +** TODO SceneTree +separate header, body: + header = multiple Image Buttons + + + +** TODO Inspector +TODO split inspector to multiple ui controls(e.g. Input3Float, Text, InputText, CollapsingHeader) + + +TODO can make inspector show in element visual: + by set uiControlInput to return true + + + +split to Inspector(as container) + multiple Component Inspectors(as member) + + + +Inspector: can edit component;set component's data; +TODO 加入更多的Component Inspector + + ** TODO demo2: ui control: Scene Tree(header+Tree)+Inspector(GameObject Inspector which only has a name) @@ -960,41 +1011,41 @@ DracoKTX2Asset -* TODO UI Control可配置化、抽象化 +# * TODO UI Control可配置化、抽象化 -** TODO Inspector -TODO split inspector to multiple ui controls(e.g. Input3Float, Text, InputText, CollapsingHeader) +# ** TODO Inspector +# TODO split inspector to multiple ui controls(e.g. Input3Float, Text, InputText, CollapsingHeader) -TODO can make inspector show in element visual: - by set uiControlInput to return true +# TODO can make inspector show in element visual: +# by set uiControlInput to return true -split to Inspector(as container) + multiple Component Inspectors(as member) +# split to Inspector(as container) + multiple Component Inspectors(as member) -Inspector: can edit component;set component's data; -TODO 加入更多的Component Inspector +# Inspector: can edit component;set component's data; +# TODO 加入更多的Component Inspector -*** TODO active basic camera view -TODO fix import scene* TODO>active +# *** TODO active basic camera view +# TODO fix import scene* TODO>active -*** TODO add component -**** TODO now only add arcball, basiccameraview, perspective component, no other components -handle event - **** TODO export/import scene/single event: use plugin for GLTFExporter, GLTFLoader to support arcballCameraController - **** TODO publish: bind event when active has arcball +# *** TODO add component +# **** TODO now only add arcball, basiccameraview, perspective component, no other components +# handle event +# **** TODO export/import scene/single event: use plugin for GLTFExporter, GLTFLoader to support arcballCameraController +# **** TODO publish: bind event when active has arcball -** TODO SceneTree -separate header, body: - header = multiple Image Buttons -** TODO Controller -abstract to Switch Button with configable two textures +# ** TODO SceneTree +# separate header, body: +# header = multiple Image Buttons +# ** TODO Controller +# abstract to Switch Button with configable two textures @@ -1058,10 +1109,8 @@ e.g. use import type {List} from "immutable" instead of import {List} from "immu * TODO style: import package: show info under import button like import app +* TODO style: select package: show info under select button * TODO remove meta3d-imgui-webgl1-three-renderer in ui package - -* TODO refactor: extract asset package - diff --git a/packages/core/contributes/meta3d-pipeline-root/package.json b/packages/core/contributes/meta3d-pipeline-root/package.json index b36967d3e..93a46683d 100755 --- a/packages/core/contributes/meta3d-pipeline-root/package.json +++ b/packages/core/contributes/meta3d-pipeline-root/package.json @@ -10,6 +10,7 @@ "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", "webpack": "webpack --config webpack.config.js", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/core/extensions/meta3d-bs-most/package.json b/packages/core/extensions/meta3d-bs-most/package.json index 31bbf3dfc..1019d5b8c 100755 --- a/packages/core/extensions/meta3d-bs-most/package.json +++ b/packages/core/extensions/meta3d-bs-most/package.json @@ -12,7 +12,8 @@ "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "dependencies": { diff --git a/packages/core/extensions/meta3d-core/package.json b/packages/core/extensions/meta3d-core/package.json index 364bb7fac..74931f3fa 100755 --- a/packages/core/extensions/meta3d-core/package.json +++ b/packages/core/extensions/meta3d-core/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-core", - "version": "0.20.1", + "version": "0.20.4", "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307", "protocol": { "name": "meta3d-core-protocol" @@ -9,14 +9,16 @@ "watch": "rescript clean && rescript build -w", "webpack": "webpack --config webpack.config.js", "buildAll:ci": "rescript clean && rescript build", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "dependencies": { - "meta3d-core-protocol": "^0.20.0", "meta3d-bs-most-protocol": "^0.20.0", - "meta3d-engine-core-protocol": "^0.20.0", + "meta3d-core-protocol": "^0.20.0", "meta3d-engine-basic-protocol": "^0.20.0", + "meta3d-engine-core-protocol": "^0.20.0", + "meta3d-immutable-protocol": "^0.20.0", "meta3d-type": "^0.20.0", "rescript": "^10.0.1" }, diff --git a/packages/core/extensions/meta3d-engine-basic/package.json b/packages/core/extensions/meta3d-engine-basic/package.json index 7c9a41320..018d6e525 100755 --- a/packages/core/extensions/meta3d-engine-basic/package.json +++ b/packages/core/extensions/meta3d-engine-basic/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/core/extensions/meta3d-engine-core/package.json b/packages/core/extensions/meta3d-engine-core/package.json index 48c5b6c66..8f69faf2c 100755 --- a/packages/core/extensions/meta3d-engine-core/package.json +++ b/packages/core/extensions/meta3d-engine-core/package.json @@ -12,6 +12,7 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/core/extensions/meta3d-immutable/package.json b/packages/core/extensions/meta3d-immutable/package.json index 5006da34a..806c6dcad 100755 --- a/packages/core/extensions/meta3d-immutable/package.json +++ b/packages/core/extensions/meta3d-immutable/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-immutable", - "version": "0.20.2", + "version": "0.20.6", "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307", "displayName": "immutable", "protocol": { @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/core/extensions/meta3d-immutable/src/Main.ts b/packages/core/extensions/meta3d-immutable/src/Main.ts index 56057bbe6..c9b7c7812 100755 --- a/packages/core/extensions/meta3d-immutable/src/Main.ts +++ b/packages/core/extensions/meta3d-immutable/src/Main.ts @@ -6,7 +6,9 @@ import { List, Map } from "immutable" export let getExtensionService: getExtensionServiceMeta3D = (_api) => { return { createList: () => List(), + createListOfData: (data) => List(data), createMap: () => Map(), + createMapOfData: (data) => Map(data as any), } } diff --git a/packages/core/protocols/contribute_protocols/meta3d-pipeline-root-protocol/package.json b/packages/core/protocols/contribute_protocols/meta3d-pipeline-root-protocol/package.json index 485828c17..05c599185 100755 --- a/packages/core/protocols/contribute_protocols/meta3d-pipeline-root-protocol/package.json +++ b/packages/core/protocols/contribute_protocols/meta3d-pipeline-root-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/core/protocols/extension_protocols/meta3d-bs-most-protocol/package.json b/packages/core/protocols/extension_protocols/meta3d-bs-most-protocol/package.json index e36049892..442257398 100755 --- a/packages/core/protocols/extension_protocols/meta3d-bs-most-protocol/package.json +++ b/packages/core/protocols/extension_protocols/meta3d-bs-most-protocol/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/core/protocols/extension_protocols/meta3d-core-protocol/package.json b/packages/core/protocols/extension_protocols/meta3d-core-protocol/package.json index 3fd90db83..db764d400 100755 --- a/packages/core/protocols/extension_protocols/meta3d-core-protocol/package.json +++ b/packages/core/protocols/extension_protocols/meta3d-core-protocol/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-core-protocol", - "version": "0.20.2", + "version": "0.20.7", "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307", "description": "", "author": "Wonder", @@ -8,6 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, diff --git a/packages/core/protocols/extension_protocols/meta3d-engine-basic-protocol/package.json b/packages/core/protocols/extension_protocols/meta3d-engine-basic-protocol/package.json index 8dae7480d..062575b74 100755 --- a/packages/core/protocols/extension_protocols/meta3d-engine-basic-protocol/package.json +++ b/packages/core/protocols/extension_protocols/meta3d-engine-basic-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/core/protocols/extension_protocols/meta3d-engine-core-protocol/package.json b/packages/core/protocols/extension_protocols/meta3d-engine-core-protocol/package.json index 02f4a02ab..fadfb78d0 100755 --- a/packages/core/protocols/extension_protocols/meta3d-engine-core-protocol/package.json +++ b/packages/core/protocols/extension_protocols/meta3d-engine-core-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/package.json b/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/package.json index 3f40578a5..1a18f8f5b 100755 --- a/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/package.json +++ b/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/package.json @@ -1,13 +1,13 @@ { "name": "meta3d-immutable-protocol", - "version": "0.20.1", + "version": "0.20.4", "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307", "displayName": "immutable protocol", "author": "Wonder", "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/src/service/ServiceType.ts b/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/src/service/ServiceType.ts index 637f62db9..a6efcc5b1 100755 --- a/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/src/service/ServiceType.ts +++ b/packages/core/protocols/extension_protocols/meta3d-immutable-protocol/src/service/ServiceType.ts @@ -2,5 +2,7 @@ import type { List, Map } from 'immutable'; export type service = { createList(): List, + createListOfData(data: Array): List, createMap(): Map, + createMapOfData(data: Record): Map, } diff --git a/packages/editor-whole/contributes/meta3d-pipeline-editor-event/package.json b/packages/editor-whole/contributes/meta3d-pipeline-editor-event/package.json index a05d13c72..fa4e14d8b 100755 --- a/packages/editor-whole/contributes/meta3d-pipeline-editor-event/package.json +++ b/packages/editor-whole/contributes/meta3d-pipeline-editor-event/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/event/extensions/meta3d-event-data/package.json b/packages/editor-whole/event/extensions/meta3d-event-data/package.json index a6103b737..00916e500 100755 --- a/packages/editor-whole/event/extensions/meta3d-event-data/package.json +++ b/packages/editor-whole/event/extensions/meta3d-event-data/package.json @@ -12,7 +12,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "dependencies": { diff --git a/packages/editor-whole/event/extensions/meta3d-event-sourcing/package.json b/packages/editor-whole/event/extensions/meta3d-event-sourcing/package.json index 6b819ea40..039bd7d0b 100755 --- a/packages/editor-whole/event/extensions/meta3d-event-sourcing/package.json +++ b/packages/editor-whole/event/extensions/meta3d-event-sourcing/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/event/extensions/meta3d-event/package.json b/packages/editor-whole/event/extensions/meta3d-event/package.json index d1c158600..02b76d300 100755 --- a/packages/editor-whole/event/extensions/meta3d-event/package.json +++ b/packages/editor-whole/event/extensions/meta3d-event/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "dependencies": { diff --git a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-data-protocol/package.json b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-data-protocol/package.json index 167055cf6..fb9aedaa7 100755 --- a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-data-protocol/package.json +++ b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-data-protocol/package.json @@ -7,7 +7,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-protocol/package.json b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-protocol/package.json index f11882f08..c9f62c588 100755 --- a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-protocol/package.json +++ b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-protocol/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-sourcing-protocol/package.json b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-sourcing-protocol/package.json index 7395f8c6d..b8ed47ccc 100755 --- a/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-sourcing-protocol/package.json +++ b/packages/editor-whole/event/protocols/extension_protocols/meta3d-event-sourcing-protocol/package.json @@ -6,7 +6,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json b/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json index 45e626355..8b10d2a8a 100755 --- a/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json +++ b/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/extensions/meta3d-export-scene/package.json b/packages/editor-whole/extensions/meta3d-export-scene/package.json index 957e7e9bc..7b2014c2e 100755 --- a/packages/editor-whole/extensions/meta3d-export-scene/package.json +++ b/packages/editor-whole/extensions/meta3d-export-scene/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json b/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json index c5d238c00..4c1e48894 100755 --- a/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json +++ b/packages/editor-whole/gameview-render/contributes/meta3d-pipeline-webgl1-three-gameviewrender/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/gameview-render/extensions/meta3d-editor-gameview-render/package.json b/packages/editor-whole/gameview-render/extensions/meta3d-editor-gameview-render/package.json index 29c239190..13f0b0a7d 100755 --- a/packages/editor-whole/gameview-render/extensions/meta3d-editor-gameview-render/package.json +++ b/packages/editor-whole/gameview-render/extensions/meta3d-editor-gameview-render/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/gameview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-gameviewrender-protocol/package.json b/packages/editor-whole/gameview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-gameviewrender-protocol/package.json index 869775706..45adee529 100755 --- a/packages/editor-whole/gameview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-gameviewrender-protocol/package.json +++ b/packages/editor-whole/gameview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-gameviewrender-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/gameview-render/protocols/extension_protocols/meta3d-editor-gameview-render-protocol/package.json b/packages/editor-whole/gameview-render/protocols/extension_protocols/meta3d-editor-gameview-render-protocol/package.json index 671bdf009..dfeceeb9d 100755 --- a/packages/editor-whole/gameview-render/protocols/extension_protocols/meta3d-editor-gameview-render-protocol/package.json +++ b/packages/editor-whole/gameview-render/protocols/extension_protocols/meta3d-editor-gameview-render-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/protocols/contribute_protocols/meta3d-pipeline-editor-event-protocol/package.json b/packages/editor-whole/protocols/contribute_protocols/meta3d-pipeline-editor-event-protocol/package.json index 6a8725b1a..edb8d9932 100755 --- a/packages/editor-whole/protocols/contribute_protocols/meta3d-pipeline-editor-event-protocol/package.json +++ b/packages/editor-whole/protocols/contribute_protocols/meta3d-pipeline-editor-event-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.bsdeps b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.bsdeps index 93d953237..76004ab16 100644 --- a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.bsdeps +++ b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.bsdeps @@ -6,4 +6,4 @@ src 0x1.953dc1dp+30 src/service 0x1.953bb464p+30 src/state 0x1.953bb464p+30 === -/Users/yang/Github/Meta3D/node_modules/rescript/darwin/rescript.exe 0x1.92f29018p+30 +/Users/yang/Github/Meta3D/node_modules/rescript/darwin/rescript.exe 0x1.95811b6p+30 diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.compiler.log b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.compiler.log index 6e29a1686..90cf5990c 100644 --- a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.compiler.log +++ b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.compiler.log @@ -1,2 +1,2 @@ -#Start(1700797062350) -#Done(1700797062394) +#Start(1700813158921) +#Done(1700813158963) diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.ninja_log b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.ninja_log index 0d5e226e8..ebdc8499d 100644 --- a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.ninja_log +++ b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/.ninja_log @@ -1,8 +1,8 @@ # ninja log v6 -0 14 1700797062362993906 src/service/ServiceType.ast 785165cefc5839bb -0 14 1700797062363189830 Meta3dEditorWholeProtocol.cmi 27dde7c45547adb8 -14 20 1700797062370725571 src/service/ServiceType.d 702d225c4edca7ca -21 44 1700797062393772856 src/service/ServiceType-Meta3dEditorWholeProtocol.cmj 27353c2cefaf6d3b -21 44 1700797062393772856 src/service/ServiceType-Meta3dEditorWholeProtocol.cmi 27353c2cefaf6d3b -21 44 1700797062393772856 ../es6_global/src/service/ServiceType.bs.js 27353c2cefaf6d3b -21 44 1700797062393772856 ../js/src/service/ServiceType.bs.js 27353c2cefaf6d3b +0 14 1700813158934385450 src/service/ServiceType.ast 785165cefc5839bb +1 15 1700813158934601036 Meta3dEditorWholeProtocol.cmi 27dde7c45547adb8 +14 20 1700813158941501129 src/service/ServiceType.d 702d225c4edca7ca +20 41 1700813158961316051 src/service/ServiceType-Meta3dEditorWholeProtocol.cmj a7d4bb588703fac2 +20 41 1700813158961316051 src/service/ServiceType-Meta3dEditorWholeProtocol.cmi a7d4bb588703fac2 +20 41 1700813158961316051 ../es6_global/src/service/ServiceType.bs.js a7d4bb588703fac2 +20 41 1700813158961316051 ../js/src/service/ServiceType.bs.js a7d4bb588703fac2 diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/src/service/ServiceType-Meta3dEditorWholeProtocol.cmi b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/lib/bs/src/service/ServiceType-Meta3dEditorWholeProtocol.cmi index 3c3d515e1619e4fb34471bf6135c0f678d43ac77..12b35f5aadd2befa3038b32dcc5974af2777f925 100644 GIT binary patch delta 201 zcmV;)05<=H4uuYoO#u{-P8IVaRgg;2a zxHMp!K>(nj2`5u!a&~EBlTiXAvrz*X0ySGKj6A}DLgEx3gj>q=HE48=a9aAK5&z%hsGpvJprS_MlQ*% z5wqXNUFlL#m&uuYQA}QdsZ8ctT88EM|JAd6e3%bOPxfRwEztbq%*6TI_ssgRr|YoX zd4B21J4Nj`Co{7%nMU>YJ*#7`?iE}7B+q}#hq((D7_;-EfYZkNe0PD zDQ3nNFo9GHGjp>vb4&BhX9P@{Fsz#_DBLc9;V=hQEdg{dZGI$t95VocK@f)-E_<0Q YCdZ3S#0W)TaI2sPx5ESj^jL8O0EXYRhX4Qo delta 445 zcmcblcS&!8FQd>zKQTtZ$pRck8>gEx3h0Ha#SE&z-sZDQ=gXXFxc$Nc8C$|Vq+%e-xFtA z@G!EibYNor`jCN}9f; X94|HzBNTzbt%4rh4igN}W5p2w@nNJr diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/package.json b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/package.json index 46a5a53f6..e1ee7b5fa 100755 --- a/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/package.json +++ b/packages/editor-whole/protocols/extension_protocols/meta3d-editor-whole-protocol/package.json @@ -1,6 +1,6 @@ { "name": "meta3d-editor-whole-protocol", - "version": "0.20.14", + "version": "0.20.16", "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307", "description": "", "author": "Wonder", @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --patch && npm run meta3d:publish_dev", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, diff --git a/packages/editor-whole/protocols/extension_protocols/meta3d-export-scene-protocol/package.json b/packages/editor-whole/protocols/extension_protocols/meta3d-export-scene-protocol/package.json index 23155c664..645461f03 100755 --- a/packages/editor-whole/protocols/extension_protocols/meta3d-export-scene-protocol/package.json +++ b/packages/editor-whole/protocols/extension_protocols/meta3d-export-scene-protocol/package.json @@ -7,7 +7,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json b/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json index b82006b62..cf9abbdbd 100755 --- a/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json +++ b/packages/editor-whole/sceneview-render/contributes/meta3d-pipeline-webgl1-three-sceneviewrender/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/sceneview-render/extensions/meta3d-editor-sceneview-render/package.json b/packages/editor-whole/sceneview-render/extensions/meta3d-editor-sceneview-render/package.json index beb8a40d0..eaccb5473 100755 --- a/packages/editor-whole/sceneview-render/extensions/meta3d-editor-sceneview-render/package.json +++ b/packages/editor-whole/sceneview-render/extensions/meta3d-editor-sceneview-render/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/sceneview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-sceneviewrender-protocol/package.json b/packages/editor-whole/sceneview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-sceneviewrender-protocol/package.json index 4ca214fcb..d9ee4d20f 100755 --- a/packages/editor-whole/sceneview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-sceneviewrender-protocol/package.json +++ b/packages/editor-whole/sceneview-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-sceneviewrender-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/sceneview-render/protocols/extension_protocols/meta3d-editor-sceneview-render-protocol/package.json b/packages/editor-whole/sceneview-render/protocols/extension_protocols/meta3d-editor-sceneview-render-protocol/package.json index 73647a824..350387552 100755 --- a/packages/editor-whole/sceneview-render/protocols/extension_protocols/meta3d-editor-sceneview-render-protocol/package.json +++ b/packages/editor-whole/sceneview-render/protocols/extension_protocols/meta3d-editor-sceneview-render-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json index 6554a4385..0d1b896f3 100755 --- a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json +++ b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-renderer/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-three-renderer/package.json b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-three-renderer/package.json index 1ed9b5b02..bf69192de 100755 --- a/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-three-renderer/package.json +++ b/packages/editor-whole/ui/extensions/meta3d-imgui-webgl1-three-renderer/package.json @@ -11,7 +11,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/extensions/meta3d-ui/package.json b/packages/editor-whole/ui/extensions/meta3d-ui/package.json index 73bdf1bf0..5a1cd4ff1 100755 --- a/packages/editor-whole/ui/extensions/meta3d-ui/package.json +++ b/packages/editor-whole/ui/extensions/meta3d-ui/package.json @@ -13,6 +13,7 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/extensions/meta3d-webgl1/package.json b/packages/editor-whole/ui/extensions/meta3d-webgl1/package.json index a450b9844..b236cd61c 100755 --- a/packages/editor-whole/ui/extensions/meta3d-webgl1/package.json +++ b/packages/editor-whole/ui/extensions/meta3d-webgl1/package.json @@ -10,6 +10,7 @@ "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", "webpack": "webpack --config webpack.config.js", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/protocols/contribute_protocols/meta3d-skin-protocol/package.json b/packages/editor-whole/ui/protocols/contribute_protocols/meta3d-skin-protocol/package.json index 73217744a..5b10842ba 100755 --- a/packages/editor-whole/ui/protocols/contribute_protocols/meta3d-skin-protocol/package.json +++ b/packages/editor-whole/ui/protocols/contribute_protocols/meta3d-skin-protocol/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-imgui-renderer-protocol/package.json b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-imgui-renderer-protocol/package.json index c036045f7..14f2507a0 100755 --- a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-imgui-renderer-protocol/package.json +++ b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-imgui-renderer-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-ui-protocol/package.json b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-ui-protocol/package.json index e63e99309..3a944531a 100755 --- a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-ui-protocol/package.json +++ b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-ui-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-webgl1-protocol/package.json b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-webgl1-protocol/package.json index 055ef1026..b25bfa508 100755 --- a/packages/editor-whole/ui/protocols/extension_protocols/meta3d-webgl1-protocol/package.json +++ b/packages/editor-whole/ui/protocols/extension_protocols/meta3d-webgl1-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-arcballcameracontroller/package.json b/packages/engine-scene/contributes/meta3d-component-arcballcameracontroller/package.json index fc5bd2ff3..486b4faaf 100755 --- a/packages/engine-scene/contributes/meta3d-component-arcballcameracontroller/package.json +++ b/packages/engine-scene/contributes/meta3d-component-arcballcameracontroller/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-basiccameraview/package.json b/packages/engine-scene/contributes/meta3d-component-basiccameraview/package.json index 57d161471..ac22865cc 100755 --- a/packages/engine-scene/contributes/meta3d-component-basiccameraview/package.json +++ b/packages/engine-scene/contributes/meta3d-component-basiccameraview/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-directionlight/package.json b/packages/engine-scene/contributes/meta3d-component-directionlight/package.json index c6f34ad40..5ea045682 100755 --- a/packages/engine-scene/contributes/meta3d-component-directionlight/package.json +++ b/packages/engine-scene/contributes/meta3d-component-directionlight/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-geometry/package.json b/packages/engine-scene/contributes/meta3d-component-geometry/package.json index f6caa8876..3928b3438 100755 --- a/packages/engine-scene/contributes/meta3d-component-geometry/package.json +++ b/packages/engine-scene/contributes/meta3d-component-geometry/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-pbrmaterial/package.json b/packages/engine-scene/contributes/meta3d-component-pbrmaterial/package.json index e4f789181..215be2c34 100755 --- a/packages/engine-scene/contributes/meta3d-component-pbrmaterial/package.json +++ b/packages/engine-scene/contributes/meta3d-component-pbrmaterial/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-perspectivecameraprojection/package.json b/packages/engine-scene/contributes/meta3d-component-perspectivecameraprojection/package.json index 1bebe4b87..6e2b4cc00 100755 --- a/packages/engine-scene/contributes/meta3d-component-perspectivecameraprojection/package.json +++ b/packages/engine-scene/contributes/meta3d-component-perspectivecameraprojection/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-component-transform/package.json b/packages/engine-scene/contributes/meta3d-component-transform/package.json index c752ab1b8..d567c92c1 100755 --- a/packages/engine-scene/contributes/meta3d-component-transform/package.json +++ b/packages/engine-scene/contributes/meta3d-component-transform/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-gameobject-dataoriented/package.json b/packages/engine-scene/contributes/meta3d-gameobject-dataoriented/package.json index 1055be643..6155f674e 100755 --- a/packages/engine-scene/contributes/meta3d-gameobject-dataoriented/package.json +++ b/packages/engine-scene/contributes/meta3d-gameobject-dataoriented/package.json @@ -13,7 +13,8 @@ "test:coverage": "jest --maxWorkers=4 --config jest_coverage.json", "test:ci": "yarn buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/contributes/meta3d-pipeline-camera/package.json b/packages/engine-scene/contributes/meta3d-pipeline-camera/package.json index df7eeb494..6b2234348 100755 --- a/packages/engine-scene/contributes/meta3d-pipeline-camera/package.json +++ b/packages/engine-scene/contributes/meta3d-pipeline-camera/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-scene/contributes/meta3d-pipeline-dispose/package.json b/packages/engine-scene/contributes/meta3d-pipeline-dispose/package.json index e980acf27..d0b4cef0e 100755 --- a/packages/engine-scene/contributes/meta3d-pipeline-dispose/package.json +++ b/packages/engine-scene/contributes/meta3d-pipeline-dispose/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-scene/contributes/meta3d-pipeline-transform/package.json b/packages/engine-scene/contributes/meta3d-pipeline-transform/package.json index ec1522265..b0dc9408c 100755 --- a/packages/engine-scene/contributes/meta3d-pipeline-transform/package.json +++ b/packages/engine-scene/contributes/meta3d-pipeline-transform/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-scene/extensions/meta3d-engine-scene/package.json b/packages/engine-scene/extensions/meta3d-engine-scene/package.json index 9a2ed919d..bc4a84503 100755 --- a/packages/engine-scene/extensions/meta3d-engine-scene/package.json +++ b/packages/engine-scene/extensions/meta3d-engine-scene/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-scene/extensions/meta3d-texture-basicsource/package.json b/packages/engine-scene/extensions/meta3d-texture-basicsource/package.json index f26c342e7..321a6c9e0 100755 --- a/packages/engine-scene/extensions/meta3d-texture-basicsource/package.json +++ b/packages/engine-scene/extensions/meta3d-texture-basicsource/package.json @@ -10,7 +10,8 @@ "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", + "meta3d:publish_dev": "yarn buildAll:ci && cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "yarn buildAll:ci && cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/protocols/contribute_protocols/meta3d-gameobject-protocol/package.json b/packages/engine-scene/protocols/contribute_protocols/meta3d-gameobject-protocol/package.json index 1cf8e808d..eaca2f8ae 100755 --- a/packages/engine-scene/protocols/contribute_protocols/meta3d-gameobject-protocol/package.json +++ b/packages/engine-scene/protocols/contribute_protocols/meta3d-gameobject-protocol/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-camera-protocol/package.json b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-camera-protocol/package.json index ec3ec9486..ad84783c0 100755 --- a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-camera-protocol/package.json +++ b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-camera-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-dispose-protocol/package.json b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-dispose-protocol/package.json index 83b91398e..5a5dae42e 100755 --- a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-dispose-protocol/package.json +++ b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-dispose-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-transform-protocol/package.json b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-transform-protocol/package.json index 5f6926a3e..71101aefa 100755 --- a/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-transform-protocol/package.json +++ b/packages/engine-scene/protocols/contribute_protocols/meta3d-pipeline-transform-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-scene/protocols/extension_protocols/meta3d-engine-scene-protocol/package.json b/packages/engine-scene/protocols/extension_protocols/meta3d-engine-scene-protocol/package.json index 501f5be01..e5f5ffe3d 100755 --- a/packages/engine-scene/protocols/extension_protocols/meta3d-engine-scene-protocol/package.json +++ b/packages/engine-scene/protocols/extension_protocols/meta3d-engine-scene-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/package.json b/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/package.json index 713f826c3..be7c4609a 100755 --- a/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/package.json +++ b/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "rescript clean && rescript build -w", "buildAll:ci": "rescript clean && rescript build", - "meta3d:publish_dev": "yarn buildAll:ci && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_pro": "yarn buildAll:ci && gulp publish_production_env" }, "keywords": [], diff --git a/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/src/state/StateType.gen.tsx b/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/src/state/StateType.gen.tsx index 1811f7e65..6868fbb46 100644 --- a/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/src/state/StateType.gen.tsx +++ b/packages/engine-scene/protocols/extension_protocols/meta3d-texture-basicsource-protocol/src/state/StateType.gen.tsx @@ -2,7 +2,7 @@ /* eslint-disable import/first */ -import type {ImmutableSparseMapType_t as Meta3dCommonlibType_ImmutableSparseMapType_t} from './Meta3dCommonlibType.gen'; +import type {ImmutableSparseMapType_t as Meta3dCommonlibType_ImmutableSparseMapType_t} from 'meta3d-commonlib-type/Meta3dCommonlibType.gen'; import type {htmlImageElement as Dom_htmlImageElement} from './Dom.gen'; diff --git a/packages/engine-whole/extensions/meta3d-engine-whole/package.json b/packages/engine-whole/extensions/meta3d-engine-whole/package.json index 5276d15ed..f7235f839 100755 --- a/packages/engine-whole/extensions/meta3d-engine-whole/package.json +++ b/packages/engine-whole/extensions/meta3d-engine-whole/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-whole/extensions/meta3d-load-glb/package.json b/packages/engine-whole/extensions/meta3d-load-glb/package.json index 328e38bcf..024d4a19f 100755 --- a/packages/engine-whole/extensions/meta3d-load-glb/package.json +++ b/packages/engine-whole/extensions/meta3d-load-glb/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-whole/extensions/meta3d-load-scene/package.json b/packages/engine-whole/extensions/meta3d-load-scene/package.json index 119942f3d..dc834e131 100755 --- a/packages/engine-whole/extensions/meta3d-load-scene/package.json +++ b/packages/engine-whole/extensions/meta3d-load-scene/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/package.json b/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/package.json index ad15b1bec..6a90b0c8c 100755 --- a/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/package.json +++ b/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-whole/protocols/extension_protocols/meta3d-load-glb-protocol/package.json b/packages/engine-whole/protocols/extension_protocols/meta3d-load-glb-protocol/package.json index 693725ebe..6198cf135 100755 --- a/packages/engine-whole/protocols/extension_protocols/meta3d-load-glb-protocol/package.json +++ b/packages/engine-whole/protocols/extension_protocols/meta3d-load-glb-protocol/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-whole/protocols/extension_protocols/meta3d-load-scene-protocol/package.json b/packages/engine-whole/protocols/extension_protocols/meta3d-load-scene-protocol/package.json index 020be7fa9..7d49e1743 100755 --- a/packages/engine-whole/protocols/extension_protocols/meta3d-load-scene-protocol/package.json +++ b/packages/engine-whole/protocols/extension_protocols/meta3d-load-scene-protocol/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json b/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json index d5c54d78c..a113c50ff 100755 --- a/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json +++ b/packages/engine-whole/web-render/contributes/meta3d-pipeline-webgl1-three-webrender/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-whole/web-render/extensions/meta3d-engine-web-render/package.json b/packages/engine-whole/web-render/extensions/meta3d-engine-web-render/package.json index 98ac88ca0..689480105 100755 --- a/packages/engine-whole/web-render/extensions/meta3d-engine-web-render/package.json +++ b/packages/engine-whole/web-render/extensions/meta3d-engine-web-render/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/engine-whole/web-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-webrender-protocol/package.json b/packages/engine-whole/web-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-webrender-protocol/package.json index 1b8e5c112..b86d24bfa 100755 --- a/packages/engine-whole/web-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-webrender-protocol/package.json +++ b/packages/engine-whole/web-render/protocols/contribute_protocols/meta3d-pipeline-webgl1-three-webrender-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/engine-whole/web-render/protocols/extension_protocols/meta3d-engine-web-render-protocol/package.json b/packages/engine-whole/web-render/protocols/extension_protocols/meta3d-engine-web-render-protocol/package.json index efabcc91f..7cd6f43f6 100755 --- a/packages/engine-whole/web-render/protocols/extension_protocols/meta3d-engine-web-render-protocol/package.json +++ b/packages/engine-whole/web-render/protocols/extension_protocols/meta3d-engine-web-render-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/three/extensions/meta3d-scenegraph-converter-three/package.json b/packages/three/extensions/meta3d-scenegraph-converter-three/package.json index 175e2cd90..e672fedb8 100755 --- a/packages/three/extensions/meta3d-scenegraph-converter-three/package.json +++ b/packages/three/extensions/meta3d-scenegraph-converter-three/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/three/extensions/meta3d-three-api/package.json b/packages/three/extensions/meta3d-three-api/package.json index 2c60e65ff..8104c6bd9 100755 --- a/packages/three/extensions/meta3d-three-api/package.json +++ b/packages/three/extensions/meta3d-three-api/package.json @@ -9,7 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/three/extensions/meta3d-three/package.json b/packages/three/extensions/meta3d-three/package.json index 5a232ec4e..976fdfcc7 100755 --- a/packages/three/extensions/meta3d-three/package.json +++ b/packages/three/extensions/meta3d-three/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publish_production_env" }, diff --git a/packages/three/protocols/extension_protocols/meta3d-scenegraph-converter-three-protocol/package.json b/packages/three/protocols/extension_protocols/meta3d-scenegraph-converter-three-protocol/package.json index d8379572f..43e523612 100755 --- a/packages/three/protocols/extension_protocols/meta3d-scenegraph-converter-three-protocol/package.json +++ b/packages/three/protocols/extension_protocols/meta3d-scenegraph-converter-three-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/three/protocols/extension_protocols/meta3d-three-api-protocol/package.json b/packages/three/protocols/extension_protocols/meta3d-three-api-protocol/package.json index f6a35094d..42172e2fd 100755 --- a/packages/three/protocols/extension_protocols/meta3d-three-api-protocol/package.json +++ b/packages/three/protocols/extension_protocols/meta3d-three-api-protocol/package.json @@ -7,7 +7,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/packages/three/protocols/extension_protocols/meta3d-three-protocol/package.json b/packages/three/protocols/extension_protocols/meta3d-three-protocol/package.json index 9f9fbea16..26b6dc605 100755 --- a/packages/three/protocols/extension_protocols/meta3d-three-protocol/package.json +++ b/packages/three/protocols/extension_protocols/meta3d-three-protocol/package.json @@ -6,7 +6,7 @@ "license": "", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/element_visual/utils/ElementMRUtils.res b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/element_visual/utils/ElementMRUtils.res index 7d89fd509..b9439ea30 100755 --- a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/element_visual/utils/ElementMRUtils.res +++ b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/element_visual/utils/ElementMRUtils.res @@ -203,6 +203,7 @@ let _generateSpecific = (specific: FrontendUtils.ElementAssembleStoreType.specif value->Obj.magic->Meta3dCommonlib.NullableSt.isNullable ? {j`null,`} : j`"${value->Obj.magic}",` + | #menuItems => j`${value->Obj.magic->Js.Json.stringify->Obj.magic},` | _ => j`"${SpecificUtils.convertValueToString(value, type_)}",` } diff --git a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/ui_control_Inspector/components/UIControlInspector.res b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/ui_control_Inspector/components/UIControlInspector.res index 8e002eb6d..2d08cc751 100755 --- a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/ui_control_Inspector/components/UIControlInspector.res +++ b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/ui_control_Inspector/components/UIControlInspector.res @@ -394,8 +394,8 @@ function (onloadFunc, onprogressFunc, onerrorFunc, file, ){ specificDataValue: FrontendUtils.ElementAssembleStoreType.specificDataValue, ) => { switch specificDataValue { - | SpecicFieldDataValue(value) => value->Some - | _ => None + | SpecicFieldDataValue(value) => value + // | _ => None } } @@ -420,9 +420,7 @@ function (onloadFunc, onprogressFunc, onerrorFunc, file, ){ | #string => Meta3dCommonlib.OptionSt.map(SpecificUtils.convertValueToString(_, type_)) - ->Meta3dCommonlib.OptionSt.getWithDefault("")} + value={getSpecificDataValue(value)->SpecificUtils.convertValueToString(type_)} onChange={e => { _setSpecificData( dispatch, @@ -471,6 +469,32 @@ function (onloadFunc, onprogressFunc, onerrorFunc, file, ){ | None => React.null }} + | #menuItems => + TextareaUtils.isNotShowTextareaForTest() + ? React.null + : + SpecificUtils.convertValueToString( + _, + type_, + )} + onChange={e => { + FrontendUtils.ErrorUtils.swallowCatchedError(() => { + _setSpecificData( + dispatch, + specific, + id, + i, + e + ->EventUtils.getEventTargetValue + ->SpecificUtils.convertStringToValue(type_) + ->FrontendUtils.CommonType.SpecicFieldDataValue, + type_, + ) + }) + }} + /> + }} }) @@ -519,7 +543,7 @@ let make = ( | #imageBase64 => map->Meta3dCommonlib.ImmutableSparseMap.set( i, - value->Method.getSpecificDataValue->Meta3dCommonlib.OptionSt.getExn->Obj.magic, + value->Method.getSpecificDataValue->Obj.magic, ) | _ => map } diff --git a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/utils/SpecificUtils.res b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/utils/SpecificUtils.res index febbd35b6..0ac1e88dd 100755 --- a/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/utils/SpecificUtils.res +++ b/platform/assemble-space/src/external_layer/ui/assemble_space/components/element_assemble/utils/SpecificUtils.res @@ -1,7 +1,11 @@ -let _handleSpecificDataFieldType = ((handleStringTypeFunc, handleImageBase64TypeFunc), type_) => { +let _handleSpecificDataFieldType = ( + (handleStringTypeFunc, handleImageBase64TypeFunc, handleMenuItemsTypeFunc), + type_, +) => { switch type_ { | #string => handleStringTypeFunc() | #imageBase64 => handleImageBase64TypeFunc() + | #menuItems => handleMenuItemsTypeFunc() } } @@ -27,6 +31,9 @@ let convertValueToString = (value, type_): string => { ) // value->Obj.magic->Meta3dCommonlib.NullableSt.getWithDefault("")->Obj.magic }, + () => { + value->Obj.magic->Js.Json.stringify + }, ), type_, ) @@ -44,6 +51,9 @@ let convertStringToValue = ( () => { valueStr->Obj.magic }, + () => { + valueStr->Obj.magic->Js.Json.parseExn->Obj.magic + }, ), type_, ) diff --git a/platform/assemble-space/test/step-definitions/elementMR.steps.res b/platform/assemble-space/test/step-definitions/elementMR.steps.res index 1f7985c94..75ee0dba6 100755 --- a/platform/assemble-space/test/step-definitions/elementMR.steps.res +++ b/platform/assemble-space/test/step-definitions/elementMR.steps.res @@ -653,6 +653,12 @@ handle click event code... ~value=Js.Nullable.null->Obj.magic->FrontendUtils.CommonType.SpecicFieldDataValue, (), ), + UIControlInspectorTool.buildSpecific( + ~name="items", + ~type_=#menuItems, + ~value=[]->Obj.magic->FrontendUtils.CommonType.SpecicFieldDataValue, + (), + ), ], (), ), diff --git a/platform/frontend-utils/src/ErrorUtils.res b/platform/frontend-utils/src/ErrorUtils.res index efa32ef2b..39c47ab92 100755 --- a/platform/frontend-utils/src/ErrorUtils.res +++ b/platform/frontend-utils/src/ErrorUtils.res @@ -49,6 +49,14 @@ let showCatchedErrorMessageWithFunc = (func, handleErrorFunc, durationOpt) => { } } +let swallowCatchedError= func => { + try { + func() + } catch { + | Js.Exn.Error(obj) => () + } +} + // let handleFail = result => { // result->Meta3dCommonlib.Result.handleFail(Antd.Message.error) // } diff --git a/protocols/contribute_protocols/meta3d-action-publish-protocol/package.json b/protocols/contribute_protocols/meta3d-action-publish-protocol/package.json index 27a1be97b..a92c27646 100755 --- a/protocols/contribute_protocols/meta3d-action-publish-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-action-publish-protocol/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/protocols/contribute_protocols/meta3d-action-run-protocol/package.json b/protocols/contribute_protocols/meta3d-action-run-protocol/package.json index db3436082..4ad2c9be2 100755 --- a/protocols/contribute_protocols/meta3d-action-run-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-action-run-protocol/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/protocols/contribute_protocols/meta3d-action-stop-protocol/package.json b/protocols/contribute_protocols/meta3d-action-stop-protocol/package.json index 08dab9715..bb3dffd66 100755 --- a/protocols/contribute_protocols/meta3d-action-stop-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-action-stop-protocol/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/protocols/contribute_protocols/meta3d-input-switch-button-protocol/package.json b/protocols/contribute_protocols/meta3d-input-switch-button-protocol/package.json index 74d6a2864..42c2a86b2 100755 --- a/protocols/contribute_protocols/meta3d-input-switch-button-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-input-switch-button-protocol/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "watch": "tsc -w -noEmit", - "meta3d:publish_dev_auto": "yarn version --new-version patch && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "gulp publish_local_env", "meta3d:publish_pro": "gulp publish_production_env" }, diff --git a/protocols/contribute_protocols/meta3d-ui-control-button-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-button-protocol/package.json index 23285531b..b155aa0a4 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-button-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-button-protocol/package.json @@ -11,7 +11,8 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", +"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, "keywords": [], diff --git a/protocols/contribute_protocols/meta3d-ui-control-game-view-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-game-view-protocol/package.json index 3d62d940a..dcc640ff6 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-game-view-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-game-view-protocol/package.json @@ -11,7 +11,8 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", +"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, "keywords": [], diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/.gitignore b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/.gitignore new file mode 100755 index 000000000..27f6619fb --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/.gitignore @@ -0,0 +1,19 @@ +.DS_Store +.merlin +.idea/ +.vscode/ +jest_0/ +reference/ +node_modules/ +mine/ + +coverage + +dist/ + +npm-debug + +.bsb.lock + +yarn.lock + diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/gulpfile.js b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/gulpfile.js new file mode 100755 index 000000000..2fb5dff8d --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/gulpfile.js @@ -0,0 +1,45 @@ +var gulp = require("gulp"); +var path = require("path"); +var publish = require("meta3d-tool-publish-protocol") + +gulp.task("publish_local_env", function (done) { + publish.publishContributeProtocol( + "local", + path.join(__dirname, "package.json"), + path.join(__dirname, "icon.png") + ).then(() => { + done() + }) +}); + +gulp.task("publish_production_env", function (done) { + publish.publishContributeProtocol( + "production", + path.join(__dirname, "package.json"), + path.join(__dirname, "icon.png") + ).then(() => { + done() + }) +}); + +gulp.task("publishConfig_local_env", function (done) { + publish.publishContributeProtocolConfig( + "local", + path.join(__dirname, "package.json"), + path.join(__dirname, "dist/static/js", "main.js") + ).then(() => { + done() + }) +}); + +gulp.task("publishConfig_production_env", function (done) { + publish.publishContributeProtocolConfig( + "production", + path.join(__dirname, "package.json"), + path.join(__dirname, "dist/static/js", "main.js") + ).then(() => { + done() + }) +}); + + diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/icon.png b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..828c6d76a7f6cdd3f6e8c8fa455188982b05b555 GIT binary patch literal 3766 zcmV;n4oUHeP)w zdYhm+H(4FGLU8Ul4(CF&ah)~iD%g14Uo86w&SKxZPeZ>dZ#ieZoT={r&M&vJ^22n$ z*mEpHxbaU_SqnLtgjCe!@#LqAJj()vKT*=eTnlc9$>T#3{n&pT+k`=Kh=pTD_o8$} zd^iV|pU5iV&o1j;I~3iElIPjZ>PXrn^v>Pj*^!9P_EsKSghg%m;;F@0U08ZD8-!k% zv{v~ZjF)rhS$H}+VOo?I+jzf_qAch;2$e964#c%Z$;ht}m61lcIc5v;Js7j&=6i(4 zo2}JTC0-xDL|DZ91AKSJn6R*-3DeuM)AL>I7Jis8-7Wn7O%R+pv?yLB-e0Rn? zLK!+3!lL=q3-~VHU|vUaLNCcbKY$OhJTV_eW5OW&&Hz5dGvmXRDd92yB44lEbaON# z+%#Y2>(!XqI7WoQLMFDESZg#>4G6vJ+iWjY2FEIW!gRNW0epz<^i3RXLO=U9)|)cl zHenHen`tC%V_cIkYQIf1Q5)GLJbrVRhs5=EMlHe>tuaHfoh3qVrGP!6#;!3>xGBF4 zqEI<+-^>!Gtx}I77JmHh_j^R#Y|NYFE*r zW;P8a;qhMp>=2b(zltzg`#bm)R~c{$!eV{4D5O?lhQoyZ+D;QH#qePYBuv+I9%Kv( z%6TdScYcV_ThBhh*rhr8VR$;%iXacrM1=^e^(>?HpW|tJ1{Xh8nGpt`L{KU|z0WP! z$O1fYa>C8!lMpIp6SK2|miUX@LX{IXYnh`5$=d~aR9K@=c>F8|C?;PaD`=uhZ5tV3 z@a?;ar*h!cg62tm;5GE!eT9RRB`az zLLbSe2I_=xznXPaKzn$n8u$!rCYQt$LU5t_xD?j3dxnOAPkxp$VY;3ZMXk8AKY|OI8$Y4M>1V2CVX^aR%n@oTIYagecl}S|ior0oD%B+udS7I_8q2r7O zaYSf8l&j;&n<(`>Z;(3DCz^O^)Lc}QD#8H%7`v$m3)_JF(!8Gy#yVYFXlaWT_q-|} z8GGL`-U;n4Gd!QcdqU))7|^U;*fB2 zvxdjo-N_^jeIH4J#joI%gyJ>qRS!QnB(ye!jF*9FMw(ZY9PSaXVD29VLAhhRQ zy9Ssvf_;&V9{dVS^V8e|49}GVLQ5`g)<)QjLa!Q4Rk^!C}GdWSopG1&fPlL7J*9}k>FN5esn9zqXugFQufn*U8hotDA zcjH$(ZKI35%!L;r-3Oc(ivaf9Ya3@-RvYCvUdDuUo4eJH76hfb&@+9$m;L=DoUsz- z1^CoW6x#HGv8Vn0OXyJnTMK}8W2~9?MhJR#G?mk*sAWKho!{|0Gw^FYEB75?iZ^;8 zgOp}wjse|0-fXVZjxa<|b0|HIbOFL7hiQBalL$LPA3aGYVGj>&DM3}kRrK#CL!S(o z-x1;$8o(kA2>XN-&~>lq@2gyAi(Y7eLq$q4LWKP89=)Nla_ekw*r#dbLrB{Rfz=tE z`f=+Bv2z?aHtlIn&sZJ^g}(V~w+MzTz1R~Ts~oI9A9!Kt_pCztz372B zJLn(BEKxvT@?^pkJ=L5W@b6mXNIFgT*q<(QuqTUHN@&A5U(3GO!yZ>^2l+`R zJvmvq~jjUA*t#H4{iB){ZSLiQq}&F9=fJ`+o1gjSMKq*0e!Y^;bt6G~S+ zJBg>#OcLyN!5!qU&ZM`#IssYpk}js$U=ci_)VQ)kc#wTH)*M8?HvplHyLcug#5-HC zkMVy(!dF`+#J-18fBq`p!xgTjQbPP%iro*T$$<;*hgb&}p77tXX^^(^KVz4+|IFC} z>t~Mt2hNAsdm{eXGd|j_n_2eLSjfAX<|_9h_-X$8eQm4rmtLjcOYoPXozxfUll+hg z<;|Y3mru+m+*`=wFqXNua0&Mow(p*3*N0HKC(7N^7Crv*7iLcj_g&!r(E1(lY=Wms zzzU7eS?ceAZQtWllHh={Nwj->!lkWrnvxPjgkjmFS@p3P1owa}gq;M)rAIPyJPm$U zNe*&8sY45tfl7>tqQte07d~3%3zR%XD9v?`Ya_%aj?bzzKmjFBozT%VkJv;?e8_tp zW?D!hU_o@pd%XAO5noD)5xxw6_K*e$2K@*4TDZS4!jw4g^6yQg^~#wc|}5GhlCxc|DqNkcsj5BW+sOe6yD^%|NnnEr0$LKMUaM>FEe?-fQYqXA0_Q<{#TPj8MZY>RSxrzDsGEFjHjJ2(ZRRVqngqDl#_36FzG7{8cxNkKT$aOJB z0un=v9}dVHqDxQtDESi8mB~Q5Y0QHGp+k>psk%wcJkVn8gUe{{4n=EQJFC5NBqtgK?gBI$?KPD zq+kOczjVCZWCdm%y#Sr=I~GubcCL;vlLjmG8rQ&JyeUk_aU1O9+bcp)9pSlJ(DIfu**-IHuJY5fBhz|1dQL5WgMLq-Nz?r-_Wi9mvBP}7Cxx35 zUiMeh(o?5r7km>1Pt(;*QoX)w@O_9pJl`c+Y9m)WZ@;6rjWs zSe14UOZaZNm3U!1J1Kc|ne-ured_IG6gR8sczKZ@NKN|z^O2+Jw3cPmuph80oR1I6 zK`v5;8z{ zXtz0dS@tsD5la|Y0QDfFF(~Pj&8NYo;k?ZY(ctSU@5&nr5 zAIG;YK`#0YiM&4lBoni>x{anw#CB)(i6`PA9?6-ewp^}<> ze1~k?jwI|Du_eTDfH!nodNg78I@X_h9l5rdZI`gy9B-e9qY<^~7HE&q-5j%p-$%x? zBdz5(jj(T}dRUN=@vAzS{R4y@V^J<-kTX#hR6ZMoos|x3Nn~~O9$J8~)5b5VvKD#~Dcv85x~xtdk literal 0 HcmV?d00001 diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/package.json index 87ac1bbcd..48bc00c90 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev_auto": "yarn version --new-version patch && npm run meta3d:publish_dev", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Config.ts new file mode 100755 index 000000000..65a990d66 --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Config.ts @@ -0,0 +1,50 @@ +import { + generateUIControlCommonDataStr as generateUIControlCommonDataStrMeta3D, + getUIControlSpecificDataFields as getUIControlSpecificDataFieldsMeta3D, + hasChildren as hasChildrenMeta3D, + getUIControlSupportedEventNames as getUIControlSupportedEventNamesMeta3D, generateHandleUIControlEventStr as generateHandleUIControlEventStrMeta3D +} from "meta3d-type/src/contribute/UIControlProtocolConfigType" + +export let generateUIControlCommonDataStr: generateUIControlCommonDataStrMeta3D = (rect) => { + return "\n {\n rect: " + rect + "}\n " +} + +let _generateUniqueId = () => { + return Math.floor(Math.random() * 1000000.0).toString() +} + +export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D = () => [ + { + name: "label", + type_: "string", + value: "Menu##" + _generateUniqueId() + }, + { + name: "items", + type_: "menuItems", + value: [ + [ + "levelLabel1", + { + "levelLabel1_1": "actionName1", + "levelLabel1_2": "actionName2" + } + ], + [ + "levelLabel2", + { + "levelLabel2_1": "actionName3", + "levelLabel2_2": "actionName4" + } + ] + ] + } +] + +export let hasChildren: hasChildrenMeta3D = () => false + +export let getUIControlSupportedEventNames: getUIControlSupportedEventNamesMeta3D = () => [] + +export let generateHandleUIControlEventStr: generateHandleUIControlEventStrMeta3D = ([]) => { + return "" +} \ No newline at end of file diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Index.ts new file mode 100755 index 000000000..63f752b7d --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/src/Index.ts @@ -0,0 +1,22 @@ +import { rect } from "meta3d-type/src/contribute/UIControlProtocolConfigType" +import { menuLabel as menuLabel_ } from "meta3d-imgui-renderer-protocol/src/service/ServiceType" + +export const uiControlName = "Menu" + +export type state = null + +export type inputFunc = null + +export type actionName = string + +export type menuLabel = menuLabel_ + +export type menuItems = Array<[menuLabel, Record]> + +export type specificData = { + rect: rect, + label: string, + items: menuItems, +} + +export type outputData = null \ No newline at end of file diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/tsconfig.json b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/tsconfig.json new file mode 100755 index 000000000..518e066d1 --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/tsconfig.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "target": "ES6", + "module": "ES6", + "moduleResolution": "node", + "sourceMap": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "jsx": "react", + // "noEmit": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "lib": [ + "DOM", + "ESNext", + ], + "types": [], + "strict": true + }, + "include": [ + "./src" + ] +} \ No newline at end of file diff --git a/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/webpack.config.js b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/webpack.config.js new file mode 100755 index 000000000..0bd03b441 --- /dev/null +++ b/protocols/contribute_protocols/meta3d-ui-control-menu-protocol/webpack.config.js @@ -0,0 +1,64 @@ +const path = require('path'); +const { CleanWebpackPlugin } = require('clean-webpack-plugin'); + +module.exports = { + entry: "./src/Config.ts", + mode: process.env.NODE_ENV.trim() == 'production' ? 'production' : 'development', + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'static/js/[name].js', + library: { + name: 'UIControlProtocolConfig', + type: 'window', + }, + }, + + // Enable sourcemaps for debugging webpack's output. + // devtool: "source-map", + + resolve: { + extensions: ['.ts', '.tsx', '.js', '.jsx', '.scss'], + modules: ['node_modules'] + }, + + module: { + rules: [ + // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'. + { + test: /\.tsx?$/, + exclude: /node_modules/, + use: "ts-loader" + }, + // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'. + { + enforce: 'pre', + test: /\.js$/, + loader: "source-map-loader" + }, + ] + }, + plugins: [ + /** + * All files inside webpack's output.path directory will be removed once, but the + * directory itself will not be. If using webpack 4+'s default configuration, + * everything under /dist/ will be removed. + * Use cleanOnceBeforeBuildPatterns to override this behavior. + * + * During rebuilds, all webpack assets that are not used anymore + * will be removed automatically. + * + * See `Options and Defaults` for information + */ + new CleanWebpackPlugin(), + // new HtmlWebpackPlugin({ + // template: './user.html', + // filename: 'user.html', + // }), + ], + // When importing a module whose path matches one of the following, just + // assume a corresponding global variable exists and use that instead. + // This is important because it allows us to avoid bundling all of our + // dependencies, which allows browsers to cache those libraries between builds. + externals: { + } +}; \ No newline at end of file diff --git a/protocols/contribute_protocols/meta3d-ui-control-scene-view-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-scene-view-protocol/package.json index 7214a011a..ab518cc1d 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-scene-view-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-scene-view-protocol/package.json @@ -9,6 +9,7 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, @@ -25,4 +26,4 @@ "webpack": "^5.62.1", "webpack-cli": "^4.9.1" } -} +} \ No newline at end of file diff --git a/protocols/contribute_protocols/meta3d-ui-control-switch-button-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-switch-button-protocol/package.json index 28727608a..0d42fd7d5 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-switch-button-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-switch-button-protocol/package.json @@ -8,7 +8,8 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", +"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, "keywords": [], diff --git a/protocols/contribute_protocols/meta3d-ui-control-window-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-window-protocol/package.json index 1d07deb95..261d870f0 100755 --- a/protocols/contribute_protocols/meta3d-ui-control-window-protocol/package.json +++ b/protocols/contribute_protocols/meta3d-ui-control-window-protocol/package.json @@ -11,7 +11,8 @@ "scripts": { "watch": "tsc -w -noEmit", "webpack": "webpack --config webpack.config.js", - "meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publishConfig_local_env && gulp publish_local_env", + "meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev", +"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env", "meta3d:publish_pro": "cross-env NODE_ENV=production npm run webpack && gulp publishConfig_production_env &&gulp publish_production_env" }, "keywords": [],