@yarn-tool/static-file 1.0.98 → 1.0.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +87 -0
- package/file/github/workflows/build.yml +9 -3
- package/file/github/workflows/coverage.yml +15 -4
- package/file/gitignore +2 -0
- package/file/jest.config.js +2 -1
- package/file/npmignore +3 -0
- package/file/test/tsconfig.json.tpl +1 -1
- package/lib/const.d.ts +2 -2
- package/lib/const.js +2 -2
- package/lib/const.js.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,93 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.0.103](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.100...@yarn-tool/static-file@1.0.103) (2022-06-28)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### 🐛 Bug Fixes
|
|
10
|
+
|
|
11
|
+
* coverage.yml ([dc21ac9](https://github.com/bluelovers/ws-yarn-workspaces/commit/dc21ac92c237a00246ef0afcc795626764c748c6))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### ✨ Features
|
|
15
|
+
|
|
16
|
+
* update config ([c9add90](https://github.com/bluelovers/ws-yarn-workspaces/commit/c9add90cb2a68d9f7345e4362d5187a2f82a9dc3))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### 🔖 Miscellaneous
|
|
20
|
+
|
|
21
|
+
* . ([80be3f2](https://github.com/bluelovers/ws-yarn-workspaces/commit/80be3f28b36c30cad697d291a26b4c4fa523efc5))
|
|
22
|
+
* . ([a28d30b](https://github.com/bluelovers/ws-yarn-workspaces/commit/a28d30bbb9879efbf0483c362b56eb6fd1f1108b))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
## [1.0.102](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.100...@yarn-tool/static-file@1.0.102) (2022-06-28)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### 🐛 Bug Fixes
|
|
32
|
+
|
|
33
|
+
* coverage.yml ([dc21ac9](https://github.com/bluelovers/ws-yarn-workspaces/commit/dc21ac92c237a00246ef0afcc795626764c748c6))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
### ✨ Features
|
|
37
|
+
|
|
38
|
+
* update config ([c9add90](https://github.com/bluelovers/ws-yarn-workspaces/commit/c9add90cb2a68d9f7345e4362d5187a2f82a9dc3))
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
### 🔖 Miscellaneous
|
|
42
|
+
|
|
43
|
+
* . ([a28d30b](https://github.com/bluelovers/ws-yarn-workspaces/commit/a28d30bbb9879efbf0483c362b56eb6fd1f1108b))
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
## [1.0.101](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.100...@yarn-tool/static-file@1.0.101) (2022-06-28)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
### 🐛 Bug Fixes
|
|
53
|
+
|
|
54
|
+
* coverage.yml ([dc21ac9](https://github.com/bluelovers/ws-yarn-workspaces/commit/dc21ac92c237a00246ef0afcc795626764c748c6))
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
### ✨ Features
|
|
58
|
+
|
|
59
|
+
* update config ([c9add90](https://github.com/bluelovers/ws-yarn-workspaces/commit/c9add90cb2a68d9f7345e4362d5187a2f82a9dc3))
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
## [1.0.100](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.99...@yarn-tool/static-file@1.0.100) (2022-05-11)
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
### ✨ Features
|
|
69
|
+
|
|
70
|
+
* set jest maxWorkers = 1 ([0600624](https://github.com/bluelovers/ws-yarn-workspaces/commit/0600624f9e606215d7cb178e3c9fc95d39eb398f))
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
### ♻️ Chores
|
|
74
|
+
|
|
75
|
+
* update deps ([6f226ac](https://github.com/bluelovers/ws-yarn-workspaces/commit/6f226acfd22f0b213eaa8a84886f8391284b1fcf))
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
## [1.0.99](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.98...@yarn-tool/static-file@1.0.99) (2022-03-14)
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
### 🔖 Miscellaneous
|
|
85
|
+
|
|
86
|
+
* . ([7e31733](https://github.com/bluelovers/ws-yarn-workspaces/commit/7e31733febde1a879ded2feba01ff679874c4b4b))
|
|
87
|
+
* . ([ceb7f75](https://github.com/bluelovers/ws-yarn-workspaces/commit/ceb7f7519ffca1c219539e8056f1d14f77e96e51))
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
|
|
6
93
|
## [1.0.98](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/static-file@1.0.96...@yarn-tool/static-file@1.0.98) (2022-02-27)
|
|
7
94
|
|
|
8
95
|
|
|
@@ -30,13 +30,19 @@ jobs:
|
|
|
30
30
|
build:
|
|
31
31
|
runs-on: ubuntu-latest
|
|
32
32
|
if: "!contains(github.event.head_commit.message, '[skip ci]')"
|
|
33
|
+
|
|
34
|
+
strategy:
|
|
35
|
+
matrix:
|
|
36
|
+
node-version: [ 17 ]
|
|
37
|
+
|
|
33
38
|
steps:
|
|
34
|
-
- uses: actions/checkout@
|
|
39
|
+
- uses: actions/checkout@main
|
|
35
40
|
with:
|
|
36
41
|
fetch-depth: 2
|
|
37
|
-
-
|
|
42
|
+
- name: Set up Node.js ${{ matrix.node-version }}
|
|
43
|
+
uses: actions/setup-node@main
|
|
38
44
|
with:
|
|
39
|
-
node-version:
|
|
45
|
+
node-version: ${{ matrix.node-version }}
|
|
40
46
|
- name: get yarn cache dir
|
|
41
47
|
id: yarn-cache
|
|
42
48
|
run: echo "::set-output name=dir::$(yarn cache dir)"
|
|
@@ -15,19 +15,30 @@ jobs:
|
|
|
15
15
|
if: "!contains(github.event.head_commit.message, '[skip ci]')"
|
|
16
16
|
env:
|
|
17
17
|
CI_JOB_NUMBER: 1
|
|
18
|
+
|
|
19
|
+
strategy:
|
|
20
|
+
matrix:
|
|
21
|
+
node-version: [ 17 ]
|
|
22
|
+
|
|
18
23
|
steps:
|
|
19
|
-
- uses: actions/checkout@
|
|
20
|
-
-
|
|
24
|
+
- uses: actions/checkout@main
|
|
25
|
+
- name: Set up Node.js ${{ matrix.node-version }}
|
|
26
|
+
uses: actions/setup-node@main
|
|
21
27
|
with:
|
|
22
|
-
node-version:
|
|
28
|
+
node-version: ${{ matrix.node-version }}
|
|
23
29
|
- name: install
|
|
24
30
|
run: |
|
|
25
31
|
yarn install --frozen-lockfile
|
|
26
32
|
yarn run ci:install
|
|
27
33
|
# yarn add -W typescript@next jest ts-jest ts-node ynpx lerna
|
|
28
|
-
- uses: artiomtr/jest-coverage-report-action@
|
|
34
|
+
- uses: artiomtr/jest-coverage-report-action@main
|
|
29
35
|
with:
|
|
30
36
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
|
31
37
|
package-manager: yarn
|
|
32
38
|
# threshold: 80 # optional parameter
|
|
33
39
|
test-script: npx jest --silent --ci --coverage=false --coverageReporters="text" --coverageReporters="text-summary"
|
|
40
|
+
- name: Upload coverage to Codecov
|
|
41
|
+
uses: codecov/codecov-action@master
|
|
42
|
+
with:
|
|
43
|
+
token: ${{ secrets.CODECOV_TOKEN }}
|
|
44
|
+
verbose: true
|
package/file/gitignore
CHANGED
package/file/jest.config.js
CHANGED
package/file/npmignore
CHANGED
package/lib/const.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { IStaticFilesMapArray } from './types';
|
|
2
|
-
export declare const defaultCopyStaticFiles: IStaticFilesMapArray<"tsconfig.json.tpl" | "test/tsconfig.json.tpl" | "tsconfig.esm.json.tpl" | "tsconfig.tsdx.json.tpl" | ".eslintrc.json.tpl" | "now.json.tpl" | ".npmrc.tpl" | "tsdx.config.js.tpl" | "tsc-multi.json.tpl"
|
|
3
|
-
export declare const defaultCopyStaticFilesRootOnly: IStaticFilesMapArray<"tsconfig.json" | ".eslintrc.json" | "
|
|
2
|
+
export declare const defaultCopyStaticFiles: IStaticFilesMapArray<"tsconfig.json.tpl" | "test/tsconfig.json.tpl" | "tsconfig.esm.json.tpl" | "tsconfig.tsdx.json.tpl" | ".eslintrc.json.tpl" | "now.json.tpl" | ".npmrc.tpl" | "tsdx.config.js.tpl" | "tsc-multi.json.tpl">;
|
|
3
|
+
export declare const defaultCopyStaticFilesRootOnly: IStaticFilesMapArray<"tsconfig.json" | ".eslintrc.json" | "lerna.json.tpl" | "pnpm-workspace.yaml.tpl">;
|
|
4
4
|
export declare const defaultCopyStaticFilesWsRootOnly: IStaticFilesMapArray<"tsc-multi.json.tpl">;
|
package/lib/const.js
CHANGED
|
@@ -23,7 +23,7 @@ const _defaultCopyStaticFiles = [
|
|
|
23
23
|
['tsc-multi.json.tpl', 'file/tsc-multi.json.tpl', 'tsc-multi.json'],
|
|
24
24
|
['test/__root.ts', 'file/test/__root.ts'],
|
|
25
25
|
['.editorconfig.tpl', 'file/tpl.editorconfig'],
|
|
26
|
-
['changelog-option.js.tpl', 'file/changelog-option.js', 'changelog-option.js'],
|
|
26
|
+
//['changelog-option.js.tpl', 'file/changelog-option.js', 'changelog-option.js'],
|
|
27
27
|
];
|
|
28
28
|
const _defaultCopyStaticFilesRootOnly = [
|
|
29
29
|
['lerna.json.tpl', 'file/lerna.json.tpl', 'lerna.json'],
|
|
@@ -33,7 +33,7 @@ const _defaultCopyStaticFilesRootOnly = [
|
|
|
33
33
|
['.github/workflows/build.yml', 'file/github/workflows/build.yml'],
|
|
34
34
|
['tsconfig.json', 'file/tsconfig.json.tpl', 'tsconfig.json'],
|
|
35
35
|
['.eslintrc.json', 'file/eslintrc.json.tpl', '.eslintrc.json'],
|
|
36
|
-
['changelog-option.js', 'file/changelog-option.js', 'changelog-option.js.tpl'],
|
|
36
|
+
//['changelog-option.js', 'file/changelog-option.js', 'changelog-option.js.tpl'],
|
|
37
37
|
];
|
|
38
38
|
const _defaultCopyStaticFilesWsRootOnly = [
|
|
39
39
|
['lerna.json.tpl', 'file/lerna.json.tpl'],
|
package/lib/const.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["const.ts"],"names":[],"mappings":";;;AAEA,MAAM,uBAAuB,GAAG;IAE/B,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAChC,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEhC,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAEtC,CAAC,QAAQ,EAAE,YAAY,CAAC;IACxB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAE1C,CAAC,mBAAmB,EAAE,wBAAwB,EAAE,eAAe,CAAC;IAEhE,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,oBAAoB,CAAC;IAE/E,CAAC,uBAAuB,EAAE,4BAA4B,EAAE,mBAAmB,CAAC;IAE5E,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,oBAAoB,CAAC;IAE/E,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,gBAAgB,CAAC;IAElE,CAAC,WAAW,EAAE,gBAAgB,CAAC;IAE/B,CAAC,QAAQ,EAAE,YAAY,CAAC;IAExB,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACpC,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAEzC,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEhC,CAAC,cAAc,EAAE,mBAAmB,EAAE,UAAU,CAAC;IAEjD,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,CAAC;IAEtC,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,gBAAgB,CAAC;IAE/D,CAAC,oBAAoB,EAAE,yBAAyB,EAAE,gBAAgB,CAAC;IAEnE,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAEzC,CAAC,mBAAmB,EAAE,uBAAuB,CAAC;IAE9C,
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["const.ts"],"names":[],"mappings":";;;AAEA,MAAM,uBAAuB,GAAG;IAE/B,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAChC,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEhC,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAEtC,CAAC,QAAQ,EAAE,YAAY,CAAC;IACxB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAE1C,CAAC,mBAAmB,EAAE,wBAAwB,EAAE,eAAe,CAAC;IAEhE,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,oBAAoB,CAAC;IAE/E,CAAC,uBAAuB,EAAE,4BAA4B,EAAE,mBAAmB,CAAC;IAE5E,CAAC,wBAAwB,EAAE,6BAA6B,EAAE,oBAAoB,CAAC;IAE/E,CAAC,oBAAoB,EAAE,wBAAwB,EAAE,gBAAgB,CAAC;IAElE,CAAC,WAAW,EAAE,gBAAgB,CAAC;IAE/B,CAAC,QAAQ,EAAE,YAAY,CAAC;IAExB,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACpC,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAEzC,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEhC,CAAC,cAAc,EAAE,mBAAmB,EAAE,UAAU,CAAC;IAEjD,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,CAAC;IAEtC,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,gBAAgB,CAAC;IAE/D,CAAC,oBAAoB,EAAE,yBAAyB,EAAE,gBAAgB,CAAC;IAEnE,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAEzC,CAAC,mBAAmB,EAAE,uBAAuB,CAAC;IAE9C,iFAAiF;CAExE,CAAC;AAEX,MAAM,+BAA+B,GAAG;IAEvC,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,YAAY,CAAC;IAEvD,CAAC,yBAAyB,EAAE,0BAA0B,EAAE,qBAAqB,CAAC;IAE9E,CAAC,gCAAgC,EAAE,oCAAoC,CAAC;IAExE,CAAC,8CAA8C,EAAE,kDAAkD,CAAC;IAEpG,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;IAElE,CAAC,eAAe,EAAE,wBAAwB,EAAE,eAAe,CAAC;IAE5D,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,gBAAgB,CAAC;IAE9D,iFAAiF;CAExE,CAAC;AAEX,MAAM,iCAAiC,GAAG;IAEzC,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAEzC,CAAC,qBAAqB,EAAE,0BAA0B,CAAC;IAEnD,CAAC,eAAe,EAAE,wBAAwB,CAAC;IAE3C,CAAC,oBAAoB,EAAE,yBAAyB,EAAE,gBAAgB,CAAC;IAEnE,CAAC,cAAc,EAAE,2BAA2B,CAAC;CAEpC,CAAC;AAEE,QAAA,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAsE,CAAC;AAErI,QAAA,8BAA8B,GAAG,MAAM,CAAC,MAAM,CAAC,+BAA+B,CAA8E,CAAC;AAE7J,QAAA,gCAAgC,GAAG,MAAM,CAAC,MAAM,CAAC,iCAAiC,CAAgF,CAAC","sourcesContent":["import { _Key, IStaticFilesKey, IStaticFilesMapArray } from './types';\n\nconst _defaultCopyStaticFiles = [\n\n\t['.npmignore', 'file/npmignore'],\n\t['.gitignore', 'file/gitignore'],\n\n\t['.eslintignore', 'file/eslintignore'],\n\n\t['.nvmrc', 'file/nvmrc'],\n\t['.browserslistrc', 'file/browserslistrc'],\n\n\t['tsconfig.json.tpl', 'file/tsconfig.json.tpl', 'tsconfig.json'],\n\n\t['test/tsconfig.json.tpl', 'file/test/tsconfig.json.tpl', 'test/tsconfig.json'],\n\n\t['tsconfig.esm.json.tpl', 'file/tsconfig.esm.json.tpl', 'tsconfig.esm.json'],\n\n\t['tsconfig.tsdx.json.tpl', 'file/tsconfig.tsdx.json.tpl', 'tsconfig.tsdx.json'],\n\n\t['.eslintrc.json.tpl', 'file/eslintrc.json.tpl', '.eslintrc.json'],\n\n\t['README.md', 'file/README.md'],\n\n\t['.nycrc', 'file/nycrc'],\n\n\t['.mocharc.yml', 'file/mocharc.yml'],\n\t['jest.config.js', 'file/jest.config.js'],\n\n\t['.nowignore', 'file/nowignore'],\n\n\t['now.json.tpl', 'file/now.json.tpl', 'now.json'],\n\n\t['.npmrc.tpl', 'file/npmrc', '.npmrc'],\n\n\t['tsdx.config.js.tpl', 'file/tsdx.config.js', 'tsdx.config.js'],\n\n\t['tsc-multi.json.tpl', 'file/tsc-multi.json.tpl', 'tsc-multi.json'],\n\n\t['test/__root.ts', 'file/test/__root.ts'],\n\n\t['.editorconfig.tpl', 'file/tpl.editorconfig'],\n\n\t//['changelog-option.js.tpl', 'file/changelog-option.js', 'changelog-option.js'],\n\n] as const;\n\nconst _defaultCopyStaticFilesRootOnly = [\n\n\t['lerna.json.tpl', 'file/lerna.json.tpl', 'lerna.json'],\n\n\t['pnpm-workspace.yaml.tpl', 'file/pnpm-workspace.yaml', 'pnpm-workspace.yaml'],\n\n\t['.github/workflows/coverage.yml', 'file/github/workflows/coverage.yml'],\n\n\t['.github/workflows/action-yarnlock-dedupe.yml', 'file/github/workflows/action-yarnlock-dedupe.yml'],\n\n\t['.github/workflows/build.yml', 'file/github/workflows/build.yml'],\n\n\t['tsconfig.json', 'file/tsconfig.json.tpl', 'tsconfig.json'],\n\n\t['.eslintrc.json', 'file/eslintrc.json.tpl', '.eslintrc.json'],\n\n\t//['changelog-option.js', 'file/changelog-option.js', 'changelog-option.js.tpl'],\n\n] as const;\n\nconst _defaultCopyStaticFilesWsRootOnly = [\n\n\t['lerna.json.tpl', 'file/lerna.json.tpl'],\n\n\t['pnpm-workspace.yaml', 'file/pnpm-workspace.yaml'],\n\n\t['tsconfig.json', 'file/tsconfig.json.tpl'],\n\n\t['tsc-multi.json.tpl', 'file/tsc-multi.json.tpl', 'tsc-multi.json'],\n\n\t['__root_ws.ts', 'file/ws-root/__root_ws.ts'],\n\n] as const;\n\nexport const defaultCopyStaticFiles = Object.freeze(_defaultCopyStaticFiles) as any as IStaticFilesMapArray<_Key<typeof _defaultCopyStaticFiles>>;\n\nexport const defaultCopyStaticFilesRootOnly = Object.freeze(_defaultCopyStaticFilesRootOnly) as any as IStaticFilesMapArray<_Key<typeof _defaultCopyStaticFilesRootOnly>>;\n\nexport const defaultCopyStaticFilesWsRootOnly = Object.freeze(_defaultCopyStaticFilesWsRootOnly) as any as IStaticFilesMapArray<_Key<typeof _defaultCopyStaticFilesWsRootOnly>>;\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yarn-tool/static-file",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.103",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/bluelovers/ws-yarn-workspaces/tree/master/packages/@yarn-tool/static-file#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -25,11 +25,11 @@
|
|
|
25
25
|
"sort-package-json": "npx yarn-tool sort"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"fs-extra": "^10.0
|
|
29
|
-
"tslib": "^2
|
|
28
|
+
"fs-extra": "^10.1.0",
|
|
29
|
+
"tslib": "^2"
|
|
30
30
|
},
|
|
31
31
|
"publishConfig": {
|
|
32
32
|
"access": "public"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "a260a5883751a75c98c5adfa1ba237f8b6d24e67"
|
|
35
35
|
}
|