@qse/edu-scripts 1.12.4 → 1.12.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/docs/refactor.md +9 -0
  3. package/lib/config/webpackConfig.js +23 -8
  4. package/package.json +1 -1
  5. package/src/config/webpackConfig.js +29 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # 更新日志
2
2
 
3
+ ## 1.12.5 (2022-11-03)
4
+
5
+ - feat: 优化 cdn external 规则
6
+
3
7
  ## 1.12.4 (2022-11-03)
4
8
 
5
9
  - feat: 优化 cdn external 规则
package/docs/refactor.md CHANGED
@@ -24,10 +24,19 @@
24
24
  <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/react-dev-preset.js"></script>
25
25
  <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/moment2.29.1.js"></script>
26
26
  <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/antd3.26.20.js"></script>
27
+
28
+ <!-- 如果用到 @qse/antd -->
29
+ <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-antd.min.js"></script>
30
+ <!-- 如果用到 @qse/scheme-render -->
31
+ <script src="//www.zhidianbao.cn:8088/qsxxwapdev/edu-scripts/qsb-scheme-render.min.js"></script>
27
32
  <% } else { %>
28
33
  <script src="//static.qsepay.net/lib/react16.14_fastclick1.0.6_natty-storage2.0.2-fetch2.4.2_axios0.21.1_common31.js"></script>
29
34
  <script src="//static.qsepay.net/lib/moment2.29.1.js"></script>
30
35
  <script src="//static.qsepay.net/lib/antd3.26.20.js"></script>
36
+
37
+ <!-- 如果你是主工程，需要下面这两个文件 -->
38
+ <script src="static/lib/qsb-antd.min.js"></script>
39
+ <script src="static/lib/qsb-scheme-render.min.js"></script>
31
40
  <% } %>
32
41
  ```
33
42
 
package/lib/config/webpackConfig.js CHANGED
@@ -34,7 +34,7 @@ const lessRegex = /\.less$/;
34
34
  const lessModuleRegex = /\.module\.less$/;
35
35
  const imageInlineSizeLimit = 10 * 1024;
36
36
 
37
- const qsbCDN = (() => {
37
+ const qseCDN = (() => {
38
38
  const contents = paths.indexHTML.map(url => fs.readFileSync(url, 'utf-8'));
39
39
 
40
40
  function include(pattern) {
@@ -129,26 +129,41 @@ module.exports = function getWebpackConfig(args, override) {
129
129
  uniqueName: appPkg.name,
130
130
  publicPath: ''
131
131
  },
132
- externals: Object.assign({}, qsbCDN.isUseCommon && {
132
+ externals: Object.assign({}, qseCDN.isUseCommon && {
133
133
  react: 'React',
134
134
  'react-dom': 'ReactDOM',
135
135
  'natty-fetch': 'nattyFetch',
136
136
  'natty-storage': 'nattyStorage',
137
137
  'common-utils': 'CommonUtils',
138
138
  '@qse/common-utils': 'CommonUtils'
139
- }, qsbCDN.isUseAxios && {
139
+ }, qseCDN.isUseAxios && {
140
140
  axios: 'axios'
141
- }, qsbCDN.isUseMoment && {
141
+ }, qseCDN.isUseMoment && {
142
142
  moment: 'moment'
143
- }, qsbCDN.isUseAntd && Object.assign({
143
+ }, qseCDN.isUseAntd && Object.assign({
144
144
  react: 'React',
145
145
  'react-dom': 'ReactDOM',
146
146
  moment: 'moment',
147
147
  antd: 'antd'
148
- }, qsbCDN.isUseQsbAntd && {
148
+ }, qseCDN.isUseQsbAntd && {
149
149
  '@qse/antd': 'qsbAntd',
150
150
  '@qsb/antd': 'qsbAntd'
151
- }, qsbCDN.isUseQsbSchemeRender && {
151
+ }, qseCDN.isUseQsbSchemeRender && {
152
+ '@qse/scheme-render': 'qsbSchemeRender',
153
+ '@qsb/scheme-render': 'qsbSchemeRender'
154
+ }), // 教育工程这些一定都需要 external
155
+ !appConfig.single && Object.assign({
156
+ react: 'React',
157
+ 'react-dom': 'ReactDOM',
158
+ 'natty-fetch': 'nattyFetch',
159
+ 'natty-storage': 'nattyStorage',
160
+ 'common-utils': 'CommonUtils',
161
+ '@qse/common-utils': 'CommonUtils',
162
+ moment: 'moment',
163
+ antd: 'antd'
164
+ }, isProd && {
165
+ '@qse/antd': 'qsbAntd',
166
+ '@qsb/antd': 'qsbAntd',
152
167
  '@qse/scheme-render': 'qsbSchemeRender',
153
168
  '@qsb/scheme-render': 'qsbSchemeRender'
154
169
  }), override.externals),
@@ -290,7 +305,7 @@ module.exports = function getWebpackConfig(args, override) {
290
305
  }].filter(Boolean)
291
306
  }]
292
307
  },
293
- plugins: [qsbCDN.isUseCommon && new webpack.DllReferencePlugin({
308
+ plugins: [qseCDN.isUseCommon && new webpack.DllReferencePlugin({
294
309
  manifest: require('../asset/dll/libcommon3-manifest.json')
295
310
  }), new webpack.IgnorePlugin({
296
311
  resourceRegExp: /^\.\/locale$/,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qse/edu-scripts",
3
- "version": "1.12.4",
3
+ "version": "1.12.5",
4
4
  "author": "Kinoko",
5
5
  "license": "MIT",
6
6
  "description": "教育工程化基础框架",
package/src/config/webpackConfig.js CHANGED
@@ -24,7 +24,7 @@ const lessModuleRegex = /\.module\.less$/
24
24
 
25
25
  const imageInlineSizeLimit = 10 * 1024
26
26
 
27
- const qsbCDN = (() => {
27
+ const qseCDN = (() => {
28
28
  const contents = paths.indexHTML.map((url) => fs.readFileSync(url, 'utf-8'))
29
29
 
30
30
  function include(pattern) {
@@ -127,7 +127,7 @@ module.exports = function getWebpackConfig(args, override) {
127
127
  },
128
128
  externals: Object.assign(
129
129
  {},
130
- qsbCDN.isUseCommon && {
130
+ qseCDN.isUseCommon && {
131
131
  react: 'React',
132
132
  'react-dom': 'ReactDOM',
133
133
  'natty-fetch': 'nattyFetch',
@@ -135,9 +135,9 @@ module.exports = function getWebpackConfig(args, override) {
135
135
  'common-utils': 'CommonUtils',
136
136
  '@qse/common-utils': 'CommonUtils',
137
137
  },
138
- qsbCDN.isUseAxios && { axios: 'axios' },
139
- qsbCDN.isUseMoment && { moment: 'moment' },
140
- qsbCDN.isUseAntd &&
138
+ qseCDN.isUseAxios && { axios: 'axios' },
139
+ qseCDN.isUseMoment && { moment: 'moment' },
140
+ qseCDN.isUseAntd &&
141
141
  Object.assign(
142
142
  {
143
143
  react: 'React',
@@ -145,11 +145,32 @@ module.exports = function getWebpackConfig(args, override) {
145
145
  moment: 'moment',
146
146
  antd: 'antd',
147
147
  },
148
- qsbCDN.isUseQsbAntd && {
148
+ qseCDN.isUseQsbAntd && {
149
149
  '@qse/antd': 'qsbAntd',
150
150
  '@qsb/antd': 'qsbAntd',
151
151
  },
152
- qsbCDN.isUseQsbSchemeRender && {
152
+ qseCDN.isUseQsbSchemeRender && {
153
+ '@qse/scheme-render': 'qsbSchemeRender',
154
+ '@qsb/scheme-render': 'qsbSchemeRender',
155
+ }
156
+ ),
157
+
158
+ // 教育工程这些一定都需要 external
159
+ !appConfig.single &&
160
+ Object.assign(
161
+ {
162
+ react: 'React',
163
+ 'react-dom': 'ReactDOM',
164
+ 'natty-fetch': 'nattyFetch',
165
+ 'natty-storage': 'nattyStorage',
166
+ 'common-utils': 'CommonUtils',
167
+ '@qse/common-utils': 'CommonUtils',
168
+ moment: 'moment',
169
+ antd: 'antd',
170
+ },
171
+ isProd && {
172
+ '@qse/antd': 'qsbAntd',
173
+ '@qsb/antd': 'qsbAntd',
153
174
  '@qse/scheme-render': 'qsbSchemeRender',
154
175
  '@qsb/scheme-render': 'qsbSchemeRender',
155
176
  }
@@ -306,7 +327,7 @@ module.exports = function getWebpackConfig(args, override) {
306
327
  ],
307
328
  },
308
329
  plugins: [
309
- qsbCDN.isUseCommon &&
330
+ qseCDN.isUseCommon &&
310
331
  new webpack.DllReferencePlugin({
311
332
  manifest: require('../asset/dll/libcommon3-manifest.json'),
312
333
  }),