fix(cli): 修复多个 CSS 文件引用同一图片时报错的问题 (#408)

fix #407
remaxjs · Nov 29, 2019 · b4dbbef · b4dbbef
1 parent 56a96e5
commit b4dbbef
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 8 deletions.
diff --git a/packages/remax-cli/src/__tests__/fixtures/assets/expected/app.acss b/packages/remax-cli/src/__tests__/fixtures/assets/expected/app.acss
@@ -3,15 +3,39 @@
 }
 
 .b {
-  background-image: url('/assets/images/cat.png');
+  background-image: url('/assets/images/dog.png');
 }
 
 .c {
   background-image: url('/assets/images/cat.png');
 }
 
 .d {
-  background-image: url('/pages/assets/images/cat.png');
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.e {
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.f {
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.g {
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.h {
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.i {
+  background-image: url('/pages/assets/images/dog.png');
+}
+
+.j {
+  background-image: url('/pages/assets/images/dog.png');
 }
 
 @font-face {

diff --git a/packages/remax-cli/src/__tests__/fixtures/assets/src/assets/images/dog.png b/packages/remax-cli/src/__tests__/fixtures/assets/src/assets/images/dog.png
diff --git a/packages/remax-cli/src/__tests__/fixtures/assets/src/pages/index.css b/packages/remax-cli/src/__tests__/fixtures/assets/src/pages/index.css
@@ -3,15 +3,39 @@
 }
 
 .b {
-  background-image: url('/assets/images/cat.png');
+  background-image: url('/assets/images/dog.png');
 }
 
 .c {
   background-image: url('../assets/images/cat.png');
 }
 
 .d {
-  background-image: url('assets/images/cat.png');
+  background-image: url('assets/images/dog.png');
+}
+
+.e {
+  background-image: url('assets/images/dog.png');
+}
+
+.f {
+  background-image: url('assets/images/dog.png');
+}
+
+.g {
+  background-image: url('assets/images/dog.png');
+}
+
+.h {
+  background-image: url('assets/images/dog.png');
+}
+
+.i {
+  background-image: url('assets/images/dog.png');
+}
+
+.j {
+  background-image: url('assets/images/dog.png');
 }
 
 @font-face {

diff --git a/packages/remax-cli/src/build/plugins/postcssUrl.ts b/packages/remax-cli/src/build/plugins/postcssUrl.ts
@@ -17,11 +17,15 @@ export default function postcssUrl(options: RemaxOptions) {
       const destPath = path.join(options.cwd, options.output, asset.url);
 
       fs.exists(srcPath, exists => {
-        if (exists) {
-          mkdirp(path.dirname(destPath), () => {
-            fs.copyFileSync(srcPath, destPath);
-          });
+        if (!exists) {
+          return;
         }
+
+        mkdirp(path.dirname(destPath), () => {
+          if (!fs.existsSync(destPath)) {
+            fs.copyFileSync(srcPath, destPath);
+          }
+        });
       });
 
       if (/^\.{1,2}\/|^\w+\//.test(asset.url)) {