Browse Source

Pull request #2139: 无JIRA任务 新增不带normalize的css

Merge in VISUAL/fineui from ~TELLER/fineui:master to master

* commit '9ed5884dd6244ad7d4b5614dba6357a8617a0677':
  chore: 上传npm
  chore: 新增不带normalize的css
es6
Teller 3 years ago
parent
commit
0f7a727942
  1. 1
      .npmignore
  2. 2
      dist/fineui_without_normalize.min.css
  3. 2
      lib/postbuild/postbuild.js
  4. 9
      webpack/attachments.js
  5. 1
      webpack/webpack.prod.js

1
.npmignore

@ -9,6 +9,7 @@
!dist/fineui.js !dist/fineui.js
!dist/fineui.js.map !dist/fineui.js.map
!dist/fineui.min.css !dist/fineui.min.css
!dist/fineui_without_normalize.min.css
!dist/fineui.min.js !dist/fineui.min.js
!dist/fineui.min.js.map !dist/fineui.min.js.map
!dist/fineui.ie.min.js !dist/fineui.ie.min.js

2
dist/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
lib/postbuild/postbuild.js

@ -25,6 +25,8 @@ const deleteList = [
"2.0/fineui_without_normalize.js.map", "2.0/fineui_without_normalize.js.map",
"2.0/fineui_without_normalize.min.js", "2.0/fineui_without_normalize.min.js",
"2.0/fineui_without_normalize.min.js.map", "2.0/fineui_without_normalize.min.js.map",
"fineui_without_normalize.min.js",
"fineui_without_normalize.min.js.map",
].concat(grunt.file.expand({}, [ ].concat(grunt.file.expand({}, [
"dist/*.css.map", "dist/*.css.map",
"dist/**/*.css.map", "dist/**/*.css.map",

9
webpack/attachments.js

@ -142,6 +142,14 @@ const bundleWithoutNormalize = [].concat(
]), ]),
); );
const fineuiWithoutNormalize = [].concat(
basicAttachmentMap.core_without_normalize,
sync([
"src/less/base/**/*.less",
"src/less/widget/**/*.less",
]),
);
const fineui = [].concat( const fineui = [].concat(
basicAttachmentMap.polyfill, basicAttachmentMap.polyfill,
basicAttachmentMap.core, basicAttachmentMap.core,
@ -222,6 +230,7 @@ module.exports = {
font: basicAttachmentMap.font, font: basicAttachmentMap.font,
bundle: uniq(bundle), bundle: uniq(bundle),
bundleIE: uniq(bundleIE), bundleIE: uniq(bundleIE),
fineuiWithoutNormalize: uniq(fineuiWithoutNormalize),
bundleWithoutNormalize: uniq(bundleWithoutNormalize), bundleWithoutNormalize: uniq(bundleWithoutNormalize),
fineui: uniq(fineui), fineui: uniq(fineui),
fineuiProxy: uniq(fineuiProxy), fineuiProxy: uniq(fineuiProxy),

1
webpack/webpack.prod.js

@ -16,6 +16,7 @@ module.exports = merge.smart(common, {
entry: { entry: {
font: attachments.font, font: attachments.font,
"fineui.min": attachments.fineui, "fineui.min": attachments.fineui,
'fineui_without_normalize.min': attachments.fineuiWithoutNormalize,
"fineui.proxy.min": attachments.fineuiProxy, "fineui.proxy.min": attachments.fineuiProxy,
"fineui.ie.min": attachments.fineuiIE, "fineui.ie.min": attachments.fineuiIE,
utils: attachments.utils, utils: attachments.utils,

Loading…
Cancel
Save