Skip to content

Commit 661eefc

Browse files
author
levy
committed
Merge branch 'dev'
2 parents 4fa07be + 192ba28 commit 661eefc

File tree

7 files changed

+1342
-109
lines changed

7 files changed

+1342
-109
lines changed

template/_package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"@femessage/theme-deepexi": "^2.4.11",
4444
"@femessage/el-data-table": "^1.6.2",
4545
<%_ } _%>
46+
"@femessage/upload-to-ali": "^1.8.2",
4647
"@nuxtjs/axios": "^5.0.1",
4748
"@nuxtjs/dotenv": "^1.3.0",
4849
"@nuxtjs/pwa": "^3.0.0-beta.16",

template/frameworks/mobile/yarn.lock

Lines changed: 442 additions & 36 deletions
Large diffs are not rendered by default.

template/frameworks/multiple/yarn.lock

Lines changed: 442 additions & 36 deletions
Large diffs are not rendered by default.

template/frameworks/single/yarn.lock

Lines changed: 442 additions & 36 deletions
Large diffs are not rendered by default.

template/nuxt/nuxt.config.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module.exports = {
6868
mode: 'spa',
6969
env: {
7070
NO_LOGIN: env.NO_LOGIN,
71-
COOKIE_PATH: env.COOKIE_PATH || '/'
71+
COOKIE_PATH: env.COOKIE_PATH || '/',
7272
},
7373
proxy: config.env[env.MODE],
7474
router: {
@@ -106,12 +106,23 @@ module.exports = {
106106
if (isDev) {
107107
config.devtool = '#source-map'
108108
}
109+
/**
110+
* upload-to-ali组件依赖ali-oss脚本,体积较大。
111+
* 这里将该依赖放在script处用引入,可利用cdn加速,并减少项目最终打包体积
112+
* FYI: 如果不需要upload-to-ali组件,记得在移除组件后也要移除在script引用的ali-oss脚本
113+
*/
114+
config.externals = {
115+
'ali-oss': 'OSS'
116+
}
109117
},
110118
},
111119
/*
112120
** Headers of the page
113121
*/
114122
head: {
123+
script: [
124+
{src: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/aliyun-oss-sdk.min.js'}
125+
],
115126
title: '',
116127
meta: [
117128
{charset: 'utf-8'},

test/snapshots/index.test.js.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Generated by [AVA](https://ava.li).
7878
],
7979
dependencies: {
8080
'@femessage/data-list': '^1.1.6',
81+
'@femessage/upload-to-ali': '^1.8.2',
8182
'@nuxtjs/axios': '^5.0.1',
8283
'@nuxtjs/dotenv': '^1.3.0',
8384
'@nuxtjs/pwa': '^3.0.0-beta.16',
@@ -246,6 +247,7 @@ Generated by [AVA](https://ava.li).
246247
'@femessage/el-data-table': '^1.6.2',
247248
'@femessage/el-form-renderer': '^1.6.0',
248249
'@femessage/theme-deepexi': '^2.4.11',
250+
'@femessage/upload-to-ali': '^1.8.2',
249251
'@nuxtjs/axios': '^5.0.1',
250252
'@nuxtjs/dotenv': '^1.3.0',
251253
'@nuxtjs/pwa': '^3.0.0-beta.16',
@@ -403,6 +405,7 @@ Generated by [AVA](https://ava.li).
403405
'@femessage/el-data-table': '^1.6.2',
404406
'@femessage/el-form-renderer': '^1.6.0',
405407
'@femessage/theme-deepexi': '^2.4.11',
408+
'@femessage/upload-to-ali': '^1.8.2',
406409
'@nuxtjs/axios': '^5.0.1',
407410
'@nuxtjs/dotenv': '^1.3.0',
408411
'@nuxtjs/pwa': '^3.0.0-beta.16',

test/snapshots/index.test.js.snap

17 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)