chore: acr 升级同步

Author: 轻游

packages/acr/CHANGELOG.md

@@ -2,6 +2,68 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.13.2](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.13.1...v1.13.2) (2021-10-25)
+
+
+### Bug Fixes
+
+* css-loader getLocalIdent return value ([d1413b9](https://code.alipay.com/cloud-ide/acr-ide/commit/d1413b93af2026a8e03534cf92e15c3428c9050d))
+
+### [1.13.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.13.0...v1.13.1) (2021-10-08)
+
+
+### Bug Fixes
+
+* getLocalIdent level in webpack config for umi3 ([bfe2f62](https://code.alipay.com/cloud-ide/acr-ide/commit/bfe2f62e9e1dfa6899f6addd6ded9fc190a2c49e))
+
+## [1.13.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.12.1...v1.13.0) (2021-06-30)
+
+
+### Features
+
+* 增加非代码的 diff 组件视图 ([a6d2a8b](https://code.alipay.com/cloud-ide/acr-ide/commit/a6d2a8bb3eac1cb4eac52ff145af154917a6f35c))
+
+
+### Bug Fixes
+
+* 修复 tree 无法滚动到底部的问题 ([1091907](https://code.alipay.com/cloud-ide/acr-ide/commit/109190726085e9ab098b3909b4036f3739203b88))
+
+### [1.12.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.11.1...v1.12.1) (2021-06-24)
+
+
+### Bug Fixes
+
+* handle acc error ([422642b](https://code.alipay.com/cloud-ide/acr-ide/commit/422642b0edcca59c9f9a2b571112e8c93fac4d42))
+
+### [1.11.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.11.0...v1.11.1) (2021-05-26)
+
+## [1.11.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.4...v1.11.0) (2021-05-26)
+
+
+### Features
+
+* add hash name file ([7767930](https://code.alipay.com/cloud-ide/acr-ide/commit/7767930227745bc1d99de7724737e9655a4af3a0))
+* support umi3 chain webpack config ([5d575bb](https://code.alipay.com/cloud-ide/acr-ide/commit/5d575bb882701281fb6973b1ea900dd4260cbe90))
+
+
+### Bug Fixes
+
+* set loose option for @babel/plugin-proposal-private-methods ([22a2b0c](https://code.alipay.com/cloud-ide/acr-ide/commit/22a2b0c7a15d85278e0002d5e269aa47d6b1ee3e))
+
+### [1.10.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.10.0...v1.10.1) (2021-05-10)
+
+
+### Bug Fixes
+
+* set loose option for @babel/plugin-proposal-private-methods ([22a2b0c](https://code.alipay.com/cloud-ide/acr-ide/commit/22a2b0c7a15d85278e0002d5e269aa47d6b1ee3e))
+
+## [1.10.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.4...v1.10.0) (2021-05-10)
+
+
+### Features
+
+* support umi3 chain webpack config ([5d575bb](https://code.alipay.com/cloud-ide/acr-ide/commit/5d575bb882701281fb6973b1ea900dd4260cbe90))
+
 ### [1.9.4](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.3...v1.9.4) (2021-02-19)
 
 

packages/acr/src/normalize.less

@@ -14,10 +14,13 @@ html {
   background-color: var(--editor-background);
 
    // 全局设置滚动条样式
+   // scrollbar 重置为应用的值，react-custom-scrollbars 用的 body 滚动条宽度，mac 上为 15px，windows 上为 17px
+   // 这里如果设置为 kaitian 的 10px，会导致无法滚到到顶部，有 5~7px 的偏差
+   // issue 见 https://baiyan.alipay.com/task/122717?bqlKey=fc2b39b
    ::-webkit-scrollbar {
     background: transparent;
-    height: var(--kt-scrollbar-width);
-    width: var(--kt-scrollbar-width);
+    height: inherit;
+    width: inherit;
   }
 
   ::-webkit-scrollbar:hover {

packages/acr/src/styles.module.less

@@ -12,7 +12,9 @@
 @import '~@alipay/geek-theme/palette/dark.less';
 @import '~@alipay/geek-theme/palette/light.less';
 
-@import './normalize.less';
+:global {
+  @import './normalize.less';
+}
 
 @import '~@ali/ide-components/lib/style/mixins.less';
 

packages/acr/webpack/chain-webpack-config.umi3.js

@@ -18,16 +18,20 @@ module.exports = (config) => {
   console.log('Modifying umi3 css-loader config for css-module in ide-framework');
 
   rule.use('css-loader').tap((options) => {
+    // https://github.com/webpack-contrib/css-loader#getlocalident
     return deepmerge(options, {
-      getLocalIdent: (loaderContext, localIdentName, localName, options) => {
-        const resourcePath = String(loaderContext.resourcePath);
-        if (
-          (resourcePath.includes(pkg.name) || resourcePath.includes('@ali/ide')) &&
-          resourcePath.endsWith('.module.less')
-        ) {
-          return getLocalIdent(loaderContext, localIdentName, localName, options);
-        }
-        return localName;
+      modules: {
+        ...(options.modules || {}),
+        getLocalIdent: (loaderContext, localIdentName, localName, options) => {
+          const resourcePath = String(loaderContext.resourcePath);
+          if (
+            (resourcePath.includes(pkg.name) || resourcePath.includes('@ali/ide')) &&
+            resourcePath.endsWith('.module.less')
+          ) {
+            return getLocalIdent(loaderContext, localIdentName, localName, options);
+          }
+          return null;
+        },
       },
     });
   });