@qse/edu-scripts 1.12.2 → 1.12.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 1.12.3 (2022-11-01)
+
+- fix: 修复 commit-dist 错误
+
 ## 1.12.2 (2022-09-29)
 
 - feat: 校验 version 字段

package/lib/build.js

@@ -59,10 +59,6 @@ module.exports = async function build(args) {
         errors: true,
         colors: true
       }));
-    } // Fail the build if running in a CI server
-
-
-    if (error || stats.compilation.errors.length) {
       process.exit(1);
     }
 

package/lib/commit-dist.js

@@ -14,8 +14,6 @@ const exec = (cmd, opts) => require('child_process').execSync(cmd, {
 
 const tmp = require('tmp');
 
-const glob = require('globby');
-
 function validateSVNRoot(root) {
   const ls = exec(`svn ls ${root}`);
   return ['trunk', 'branches'].every(s => ls.includes(s));
@@ -67,17 +65,15 @@ function copyDistToRepo(info) {
   }
 
   exec(`svn co ${info.distBranchDirURL} ${tmpdir}`);
-  let files = glob.sync('**/*', {
-    cwd: tmpdir
-  });
-  exec(`svn rm "${files.join('" "')}"`, {
-    cwd: tmpdir
-  });
+
+  try {
+    exec(`svn rm * --force -q`, {
+      cwd: tmpdir
+    });
+  } catch (error) {}
+
   fs.copySync(paths.dist, tmpdir);
-  files = glob.sync('**/*', {
-    cwd: tmpdir
-  });
-  exec(`svn add "${files.join('" "')}"`, {
+  exec(`svn add * --force --auto-props --parents --depth infinity -q`, {
     cwd: tmpdir
   });
   const msg = `[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`;

package/lib/config/webpackConfig.js

@@ -275,7 +275,6 @@ module.exports = function getWebpackConfig(args, override) {
           }, {
             loader: 'url-loader',
             options: {
-              name: `images/${assetPath}/[name].[hash:6].[ext]`,
               limit: imageInlineSizeLimit
             }
           }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qse/edu-scripts",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "author": "Kinoko",
   "license": "MIT",
   "description": "教育工程化基础框架",

package/src/build.js

@@ -44,10 +44,6 @@ module.exports = async function build(args) {
     if (stats.compilation.errors.length) {
       console.log(chalk.red('编译失败'))
       console.log(stats.toString({ all: false, errors: true, colors: true }))
-    }
-
-    // Fail the build if running in a CI server
-    if (error || stats.compilation.errors.length) {
       process.exit(1)
     }
 

package/src/commit-dist.js

@@ -4,7 +4,6 @@ const fs = require('fs-extra')
 const exec = (cmd, opts) =>
   require('child_process').execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', ...opts })
 const tmp = require('tmp')
-const glob = require('globby')
 
 function validateSVNRoot(root) {
   const ls = exec(`svn ls ${root}`)
@@ -49,13 +48,13 @@ function copyDistToRepo(info) {
   }
   exec(`svn co ${info.distBranchDirURL} ${tmpdir}`)
 
-  let files = glob.sync('**/*', { cwd: tmpdir })
-  exec(`svn rm "${files.join('" "')}"`, { cwd: tmpdir })
+  try {
+    exec(`svn rm * --force -q`, { cwd: tmpdir })
+  } catch (error) {}
 
   fs.copySync(paths.dist, tmpdir)
 
-  files = glob.sync('**/*', { cwd: tmpdir })
-  exec(`svn add "${files.join('" "')}"`, { cwd: tmpdir })
+  exec(`svn add * --force --auto-props --parents --depth infinity -q`, { cwd: tmpdir })
 
   const msg = `[edu-scripts] commit ${info.branch} dist #${info.revision} @${info.author}`
   exec(`svn ci -m "${msg}"`, { cwd: tmpdir })

package/src/config/webpackConfig.js

@@ -290,7 +290,6 @@ module.exports = function getWebpackConfig(args, override) {
                 {
                   loader: 'url-loader',
                   options: {
-                    name: `images/${assetPath}/[name].[hash:6].[ext]`,
                     limit: imageInlineSizeLimit,
                   },
                 },