diff --git a/build/rollup.config.service.js b/build/rollup.config.service.js index e6787fa15e51e47bbb5a8fdfa0faf7f373d05138..f6ab512ad40bf9e9b82025e03ea6a6d4ab453f99 100644 --- a/build/rollup.config.service.js +++ b/build/rollup.config.service.js @@ -1,9 +1,9 @@ const path = require('path') const alias = require('rollup-plugin-alias') -const replace = require('rollup-plugin-replace') +const replace = require('rollup-plugin-replace') const requireContext = require('./rollup-plugin-require-context') -let input = 'src/platforms/app-plus-nvue/service/index.js' +let input = 'src/platforms/app-plus/service/uni/create-instance-context.js' const output = { file: 'packages/uni-app-plus-nvue/dist/index.js', @@ -14,7 +14,7 @@ if (process.env.UNI_SERVICE === 'legacy') { input = 'src/platforms/app-plus-nvue/service/index.legacy.js' output.file = 'packages/uni-app-plus-nvue/dist/index.legacy.js' } else if (process.env.UNI_SERVICE === 'uni') { - input = 'src/platforms/app-plus/service/uni.js' + input = 'src/platforms/app-plus/service/uni/index.js' output.file = 'packages/uni-app-plus-nvue/dist/uni.js' output.banner = 'export function createUniInstance(plus){\n' output.footer = '\n return uni$1 \n}' @@ -23,11 +23,11 @@ if (process.env.UNI_SERVICE === 'legacy') { module.exports = { input, output, - plugins: [ + plugins: [ requireContext(), alias({ - 'uni-core': path.resolve(__dirname, '../src/core'), - 'uni-platform': path.resolve(__dirname, '../src/platforms/app-plus'), + 'uni-core': path.resolve(__dirname, '../src/core'), + 'uni-platform': path.resolve(__dirname, '../src/platforms/' + process.env.UNI_PLATFORM), 'uni-platforms': path.resolve(__dirname, '../src/platforms'), 'uni-shared': path.resolve(__dirname, '../src/shared/util.js'), 'uni-helpers': path.resolve(__dirname, '../src/core/helpers') diff --git a/package.json b/package.json index a762f72b1e3c903d242a3b3fbc58ea475a48f86c..39f1e92050b920d605fbc42cbef489f0578ae880 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,10 @@ "dev:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js", "build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js", "build:app-plus": "cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js", - "build:service": "npm run lint && UNI_SERVICE=uni rollup -c build/rollup.config.service.js && rollup -c build/rollup.config.service.js && UNI_SERVICE=legacy rollup -c build/rollup.config.service.js", + "build:uni:all": "npm run lint && npm run build:uni && npm run build:uni:nvue && npm run build:uni:legacy", + "build:uni": "UNI_PLATFORM=app-plus-nvue UNI_SERVICE=uni rollup -c build/rollup.config.service.js", + "build:uni:nvue": "cross-env UNI_PLATFORM=app-plus-nvue rollup -c build/rollup.config.service.js", + "build:uni:legacy": "cross-env UNI_PLATFORM=app-plus-nvue UNI_SERVICE=legacy rollup -c build/rollup.config.service.js", "build:mp-qq": "cross-env UNI_PLATFORM=mp-qq rollup -c build/rollup.config.js", "build:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js", "build:mp-baidu": "cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js", @@ -105,4 +108,4 @@ "main": "index.js", "description": "", "author": "" -} +} diff --git a/packages/uni-app-plus-nvue/dist/uni.js b/packages/uni-app-plus-nvue/dist/uni.js index ff08caffb120d7372430b7ebd16e0438797f7b78..554551d9dacfee6193e361b615e455ceabf94483 100644 --- a/packages/uni-app-plus-nvue/dist/uni.js +++ b/packages/uni-app-plus-nvue/dist/uni.js @@ -1823,9 +1823,6 @@ var api = /*#__PURE__*/Object.freeze({ const uni$1 = Object.create(null); -/* eslint-disable no-undef */ -uni$1.version = __VERSION__; - Object.keys(api).forEach(name => { uni$1[name] = promisify(name, wrapper(name, api[name])); }); diff --git a/src/core/service/index.js b/src/core/service/index.js index 43af48aa28201e8cf6903b03ad3b6399819376f3..66b7dd913480f9564c4c14c83df1ebd7db585b15 100644 --- a/src/core/service/index.js +++ b/src/core/service/index.js @@ -9,7 +9,7 @@ import { import todoApis from 'uni-platform/helpers/todo-api' -import baseApi from './api' +import baseApi from './api/index' import platformApi from 'uni-platform/service/api' diff --git a/src/platforms/app-plus-nvue/helpers/get-real-path.js b/src/platforms/app-plus-nvue/helpers/get-real-path.js new file mode 100644 index 0000000000000000000000000000000000000000..9d24dffc063194da3bb962a0c493cbe74e805634 --- /dev/null +++ b/src/platforms/app-plus-nvue/helpers/get-real-path.js @@ -0,0 +1,2 @@ +import getRealPath from '../../app-plus/helpers/get-real-path' +export default getRealPath diff --git a/src/platforms/app-plus-nvue/service/constants.js b/src/platforms/app-plus-nvue/service/constants.js deleted file mode 100644 index 57e2fbc71079f3369e4340daab62ad2af71a80fe..0000000000000000000000000000000000000000 --- a/src/platforms/app-plus-nvue/service/constants.js +++ /dev/null @@ -1 +0,0 @@ -export const SHOW_ANISHOW = 'slide-in-right' diff --git a/src/platforms/app-plus/service/api.js b/src/platforms/app-plus/service/uni/api.js similarity index 100% rename from src/platforms/app-plus/service/api.js rename to src/platforms/app-plus/service/uni/api.js diff --git a/src/platforms/app-plus-nvue/service/index.js b/src/platforms/app-plus/service/uni/create-instance-context.js similarity index 85% rename from src/platforms/app-plus-nvue/service/index.js rename to src/platforms/app-plus/service/uni/create-instance-context.js index 99bea8a557480f02d5f6e95f91bdfd0c0606e769..ca2ab7641ec01b6abc3ffe239de83eaaa764250b 100644 --- a/src/platforms/app-plus-nvue/service/index.js +++ b/src/platforms/app-plus/service/uni/create-instance-context.js @@ -1,11 +1,11 @@ import { getApp, registerApp -} from './app' +} from 'uni-platform/service/app' import { getCurrentPages -} from './page' +} from 'uni-platform/service/page' import { createUniInstance diff --git a/src/platforms/app-plus/service/uni.js b/src/platforms/app-plus/service/uni/index.js similarity index 77% rename from src/platforms/app-plus/service/uni.js rename to src/platforms/app-plus/service/uni/index.js index 51142a2d1ceb69dbaaf66e4714a6a86c9ae3e811..9531ba11ad84d1a89c4f2e7635075a601750f99e 100644 --- a/src/platforms/app-plus/service/uni.js +++ b/src/platforms/app-plus/service/uni/index.js @@ -10,9 +10,6 @@ import * as api from './api' const uni = Object.create(null) -/* eslint-disable no-undef */ -uni.version = __VERSION__ - Object.keys(api).forEach(name => { uni[name] = promisify(name, wrapper(name, api[name])) })