Skip to content

Commit abf3965

Browse files
author
轻游
committed
PullRequest: 66 chore: 更新acr
1 parent fd26d19 commit abf3965

19 files changed

Lines changed: 124 additions & 61 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [1.7.2](https://code.alipay.com/cloud-ide/crew-dragon/compare/v1.7.1...v1.7.2) (2021-10-25)
2+
### Features
3+
* acr依赖同步更新([0ab8e5f](https://code.alipay.com/cloud-ide/crew-dragon/commits/0ab8e5f423e3227cbb8c26f1c208b453900fec13))
4+
### Bug Fixes
5+
* 修复引入 umi3 版本的配置时，按 v2 版本写会导致项目其他的 css 不生成带 hash 的 classname([5b12bb](https://code.alipay.com/cloud-ide/crew-dragon/commits/5b12bbb4f12e80c877c33ae9d7341564b7c003da))
6+
17
## [1.7.1](https://code.alipay.com/cloud-ide/crew-dragon/compare/v1.7.0...v1.7.1) (2021-09-15)
28

39

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "alex",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"workspaces": [
55
"packages/*"
66
],

‎packages/acr/CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,54 @@
22

33
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.
44

5+
## [1.13.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.12.1...v1.13.0) (2021-06-30)
6+
7+
8+
### Features
9+
10+
* 增加非代码的 diff 组件视图 ([a6d2a8b](https://code.alipay.com/cloud-ide/acr-ide/commit/a6d2a8bb3eac1cb4eac52ff145af154917a6f35c))
11+
12+
13+
### Bug Fixes
14+
15+
* 修复 tree 无法滚动到底部的问题 ([1091907](https://code.alipay.com/cloud-ide/acr-ide/commit/109190726085e9ab098b3909b4036f3739203b88))
16+
17+
### [1.12.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.11.1...v1.12.1) (2021-06-24)
18+
19+
20+
### Bug Fixes
21+
22+
* handle acc error ([422642b](https://code.alipay.com/cloud-ide/acr-ide/commit/422642b0edcca59c9f9a2b571112e8c93fac4d42))
23+
24+
### [1.11.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.11.0...v1.11.1) (2021-05-26)
25+
26+
## [1.11.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.4...v1.11.0) (2021-05-26)
27+
28+
29+
### Features
30+
31+
* add hash name file ([7767930](https://code.alipay.com/cloud-ide/acr-ide/commit/7767930227745bc1d99de7724737e9655a4af3a0))
32+
* support umi3 chain webpack config ([5d575bb](https://code.alipay.com/cloud-ide/acr-ide/commit/5d575bb882701281fb6973b1ea900dd4260cbe90))
33+
34+
35+
### Bug Fixes
36+
37+
* set loose option for @babel/plugin-proposal-private-methods ([22a2b0c](https://code.alipay.com/cloud-ide/acr-ide/commit/22a2b0c7a15d85278e0002d5e269aa47d6b1ee3e))
38+
39+
### [1.10.1](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.10.0...v1.10.1) (2021-05-10)
40+
41+
42+
### Bug Fixes
43+
44+
* set loose option for @babel/plugin-proposal-private-methods ([22a2b0c](https://code.alipay.com/cloud-ide/acr-ide/commit/22a2b0c7a15d85278e0002d5e269aa47d6b1ee3e))
45+
46+
## [1.10.0](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.4...v1.10.0) (2021-05-10)
47+
48+
49+
### Features
50+
51+
* support umi3 chain webpack config ([5d575bb](https://code.alipay.com/cloud-ide/acr-ide/commit/5d575bb882701281fb6973b1ea900dd4260cbe90))
52+
553
### [1.9.4](https://code.alipay.com/cloud-ide/acr-ide/compare/v1.9.3...v1.9.4) (2021-02-19)
654

755

‎packages/acr/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alipay/alex-acr",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "@alipay/alex-acr",
55
"main": "lib/index.js",
66
"typings": "lib/index.d.ts",
@@ -19,9 +19,9 @@
1919
"@alipay/yuyan-monitor-web": "^2.0.28"
2020
},
2121
"dependencies": {
22-
"@alipay/alex": "1.7.1",
23-
"@alipay/alex-core": "1.7.1",
24-
"@alipay/alex-shared": "1.7.1",
22+
"@alipay/alex": "1.7.2",
23+
"@alipay/alex-core": "1.7.2",
24+
"@alipay/alex-shared": "1.7.2",
2525
"@alipay/geek-theme": "^1.6.0",
2626
"@alipay/lsif-client": "^2.0.0",
2727
"@isomorphic-git/lightning-fs": "^4.3.0",

‎packages/acr/src/normalize.less‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ html {
1414
background-color: var(--editor-background);
1515

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

2326
::-webkit-scrollbar:hover {

‎packages/acr/src/styles.module.less‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
@import '~@alipay/geek-theme/palette/dark.less';
1313
@import '~@alipay/geek-theme/palette/light.less';
1414

15-
@import './normalize.less';
15+
:global {
16+
@import './normalize.less';
17+
}
1618

1719
@import '~@ali/ide-components/lib/style/mixins.less';
1820

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ module.exports = (config) => {
1818
console.log('Modifying umi3 css-loader config for css-module in ide-framework');
1919

2020
rule.use('css-loader').tap((options) => {
21+
// https://github.com/webpack-contrib/css-loader#getlocalident
2122
return deepmerge(options, {
22-
getLocalIdent: (loaderContext, localIdentName, localName, options) => {
23-
const resourcePath = String(loaderContext.resourcePath);
24-
if (
25-
(resourcePath.includes(pkg.name) || resourcePath.includes('@ali/ide')) &&
26-
resourcePath.endsWith('.module.less')
27-
) {
28-
return getLocalIdent(loaderContext, localIdentName, localName, options);
29-
}
30-
return localName;
23+
modules: {
24+
...(options.modules || {}),
25+
getLocalIdent: (loaderContext, localIdentName, localName, options) => {
26+
const resourcePath = String(loaderContext.resourcePath);
27+
if (
28+
(resourcePath.includes(pkg.name) || resourcePath.includes('@ali/ide')) &&
29+
resourcePath.endsWith('.module.less')
30+
) {
31+
return getLocalIdent(loaderContext, localIdentName, localName, options);
32+
}
33+
return null;
34+
},
3135
},
3236
});
3337
});

‎packages/alex/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alipay/alex",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "@alipay/alex",
55
"main": "lib/index.js",
66
"typings": "lib/index.d.ts",
@@ -69,15 +69,15 @@
6969
"@ali/ide-workspace": "2.5.5",
7070
"@ali/ide-workspace-edit": "2.5.5",
7171
"@ali/kaitian-textmate-languages": "^2.4.0",
72-
"@alipay/alex-cli": "1.7.1",
73-
"@alipay/alex-code-api": "1.7.1",
74-
"@alipay/alex-core": "1.7.1",
75-
"@alipay/alex-registry": "1.7.1",
76-
"@alipay/alex-shared": "1.7.1",
77-
"@alipay/alex-code-service": "1.7.1",
78-
"@alipay/alex-i18n": "1.7.1",
79-
"@alipay/alex-lsif-service": "1.7.1",
80-
"@alipay/alex-plugin": "1.7.1",
72+
"@alipay/alex-cli": "1.7.2",
73+
"@alipay/alex-code-api": "1.7.2",
74+
"@alipay/alex-core": "1.7.2",
75+
"@alipay/alex-registry": "1.7.2",
76+
"@alipay/alex-shared": "1.7.2",
77+
"@alipay/alex-code-service": "1.7.2",
78+
"@alipay/alex-i18n": "1.7.2",
79+
"@alipay/alex-lsif-service": "1.7.2",
80+
"@alipay/alex-plugin": "1.7.2",
8181
"antd": "^3.20.3",
8282
"@ant-design/icons": "~2.1.1",
8383
"tslib": "^2.2.0"

‎packages/cli/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alipay/alex-cli",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "@alipay/alex-cli",
55
"main": "lib/commander.js",
66
"files": [
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@ali/ide-extension-installer": "^2.0.0",
2222
"@ali/ide-kaitian-extension": "2.5.5",
23-
"@alipay/alex-shared": "1.7.1",
23+
"@alipay/alex-shared": "1.7.2",
2424
"commander": "^7.2.0",
2525
"fs-extra": "^9.0.1",
2626
"lodash.pick": "^4.4.0",

‎packages/code-api/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alipay/alex-code-api",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "@alipay/alex-code-api",
55
"main": "lib/index.js",
66
"typings": "lib/index.d.ts",
@@ -19,9 +19,9 @@
1919
"lockfile": "enable"
2020
},
2121
"dependencies": {
22-
"@alipay/alex-core": "1.7.1",
23-
"@alipay/alex-code-service": "1.7.1",
24-
"@alipay/alex-shared": "1.7.1",
22+
"@alipay/alex-core": "1.7.2",
23+
"@alipay/alex-code-service": "1.7.2",
24+
"@alipay/alex-shared": "1.7.2",
2525
"tslib": "^2.2.0"
2626
}
2727
}

0 commit comments

Comments
 (0)