Skip to content

Commit b654eb3

Browse files
committed
ci: update checkout settings
1 parent 17dd511 commit b654eb3

File tree

11 files changed

+35
-54
lines changed

11 files changed

+35
-54
lines changed

.github/workflows/pull-request-workflow.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88

99
strategy:
1010
matrix:
11-
node-version: [10.x]
11+
node-version: [12.x]
1212

1313
steps:
1414
- uses: actions/checkout@v2
1515
with:
16-
ref: master
16+
ref: ${{ github.event.pull_request.head.sha }}
1717
- name: Use Node.js ${{ matrix.node-version }}
1818
uses: actions/setup-node@v1
1919
with:
@@ -23,6 +23,6 @@ jobs:
2323
run: |
2424
yarn install --frozen-lockfile
2525
yarn build
26-
yarn test
26+
yarn test:ci
2727
env:
2828
CI: true

.github/workflows/push-master-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [10.x]
14+
node-version: [12.x]
1515

1616
steps:
1717
- uses: actions/checkout@v2

.github/workflows/release-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
ref: master
1414
- uses: actions/setup-node@v1
1515
with:
16-
node-version: 10
16+
node-version: 12
1717
- run: |
1818
yarn install --frozen-lockfile
19-
yarn test
19+
yarn test:ci
2020
yarn build
2121
2222
# release-github-npm-registry:

jest.config.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

lerna.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@
1111
"publish": {
1212
"access": "public",
1313
"allowBranch": "master",
14-
"ignoreChanges": [
15-
"CHANGELOG.md"
16-
]
14+
"ignoreChanges": ["CHANGELOG.md"]
1715
}
1816
},
19-
"packages": [
20-
"packages/*"
21-
],
17+
"packages": ["packages/*"],
2218
"version": "0.3.7",
2319
"npmClient": "yarn",
2420
"registry": "https://registry.npmjs.org/",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"lint": "eslint -c ./.eslintrc.js 'packages/**/*.{ts,tsx}'",
2323
"lint:fix": "yarn lint --fix",
2424
"test": "lerna run test",
25+
"test:ci": "lerna run test:ci",
2526
"version_up": "lerna version --yes"
2627
},
2728
"husky": {

packages/cli/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"server": "nodemon ./bin/code-dependency.js --source ./src --exclude node_modules",
3939
"start": "run-p develop server",
4040
"test": "jest -c jest.config.json && yarn export:static",
41+
"test:ci": "jest -c jest.config.json --no-cache --ci && yarn export:static",
4142
"test:depcruise": "depcruise --validate .dependency-cruiser.json src",
4243
"ts": "ts-node -P tsconfig.json"
4344
},

packages/view/jest.config.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
}
1111
},
1212
"moduleNameMapper": {
13-
"^@this/domain(.*)": "<rootDir>/src/domain$1",
14-
"^@this/container-component(.*)": "<rootDir>/src/container-component$1",
15-
"^@this/view-component(.*)": "<rootDir>/src/view-component$1",
16-
"^@this/infra(.*)": "<rootDir>/src/infra$1"
13+
"@app/(.+)": "<rootDir>/src/$1"
1714
},
1815
"moduleDirectories": ["node_modules"],
19-
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "node"],
16+
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
2017
"testMatch": ["**/__tests__/*.test.+(ts|tsx)"],
2118
"collectCoverage": true,
2219
"transform": {

packages/view/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"develop": "cross-env-shell NODE_ENV=development yarn ts ./scripts/develop.ts",
2727
"serve": "serve dist",
2828
"start": "yarn develop",
29-
"test": "jest -c jest.config.json",
29+
"test": "jest -c jest.config.json --no-cache",
30+
"test:ci": "jest -c jest.config.json --no-cache --ci",
3031
"ts": "ts-node -P ./scripts/tsconfig.cli.json"
3132
},
3233
"dependencies": {

packages/view/scripts/webpack.config.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,7 @@ export const generateConfig = ({ isProduction, isLibrary, ...option }: Option):
195195
resolve: {
196196
extensions: [".js", ".ts", ".tsx", ".scss", ".json"],
197197
alias: {
198-
"@app/component": appPath("./src/component/index.ts"),
199-
"@app/container": appPath("./src/container/index.ts"),
200-
"@app/domain": appPath("./src/domain/index.ts"),
201-
"@app/infra": appPath("./src/infra/index.ts"),
202-
"@app/router": appPath("./src/router/index.tsx"),
203-
"@app/interface": appPath("./src/interface/index.ts"),
204-
"@app/style": appPath("./src/style/index.ts"),
205-
"@app/api": appPath("./src/api/index.ts"),
198+
"@app": appPath("./src"),
206199
React: appPath("../../node_modules/react"),
207200
ReactDOM: appPath("../../node_modules/react-dom"),
208201
},

0 commit comments

Comments
 (0)