Skip to content

Commit dbeaa5c

Browse files
committed
refactor: minor cleanup
1 parent 22d3595 commit dbeaa5c

File tree

5 files changed

+6
-72
lines changed

5 files changed

+6
-72
lines changed

.editorconfig

-9
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,9 @@ root = true
66

77
[*]
88

9-
# Change these settings to your own preference
109
indent_style = space
1110
indent_size = 2
12-
13-
# We recommend you to keep these unchanged
1411
end_of_line = lf
1512
charset = utf-8
1613
trim_trailing_whitespace = true
1714
insert_final_newline = true
18-
19-
[*.md]
20-
trim_trailing_whitespace = false
21-
22-
[Makefile]
23-
indent_style = tabs

.gitignore

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
*.swp
22
.idea
33
.DS_STORE
4-
npm-debug.log
4+
npm-debug.log*
55
*~
6-
test/dialects/sqlite/test.sqlite
7-
test/sqlite/test.sqlite
86
test.sqlite
9-
docs/api/tmp.md
10-
ssce.js
11-
sscce.js
127
*.sublime*
138
yarn.lock
149

@@ -17,7 +12,6 @@ coverage-*
1712
coverage
1813
test/tmp/*
1914
test/binary/tmp/*
20-
site
2115
.vscode/
2216
esdoc
2317
node_modules

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@
160160
"test-docker-integration": "env-cmd $npm_package_options_env_cmd npm run test-integration",
161161
"docs": "rimraf esdoc && esdoc -c docs/esdoc-config.js && cp docs/favicon.ico esdoc/favicon.ico && cp docs/ROUTER.txt esdoc/ROUTER && node docs/run-docs-transforms.js && node docs/redirects/create-redirects.js && rimraf esdoc/file esdoc/source.html",
162162
"teaser": "node scripts/teaser",
163-
"test-unit": "mocha --require scripts/mocha-bootload --globals setImmediate,clearImmediate --exit --check-leaks --colors -t 30000 --reporter spec \"test/unit/**/*.js\"",
163+
"test-unit": "mocha --globals setImmediate,clearImmediate --exit --check-leaks --colors -t 30000 --reporter spec \"test/unit/**/*.js\"",
164164
"test-unit-mariadb": "cross-env DIALECT=mariadb npm run test-unit",
165165
"test-unit-mysql": "cross-env DIALECT=mysql npm run test-unit",
166166
"test-unit-postgres": "cross-env DIALECT=postgres npm run test-unit",
167167
"test-unit-postgres-native": "cross-env DIALECT=postgres-native npm run test-unit",
168168
"test-unit-sqlite": "cross-env DIALECT=sqlite npm run test-unit",
169169
"test-unit-mssql": "cross-env DIALECT=mssql npm run test-unit",
170170
"test-unit-all": "npm run test-unit-mariadb && npm run test-unit-mysql && npm run test-unit-postgres && npm run test-unit-postgres-native && npm run test-unit-mssql && npm run test-unit-sqlite",
171-
"test-integration": "mocha --require scripts/mocha-bootload --globals setImmediate,clearImmediate --exit --check-leaks --colors -t 30000 --reporter spec \"test/integration/**/*.test.js\"",
171+
"test-integration": "mocha --globals setImmediate,clearImmediate --exit --check-leaks --colors -t 30000 --reporter spec \"test/integration/**/*.test.js\"",
172172
"test-integration-mariadb": "cross-env DIALECT=mariadb npm run test-integration",
173173
"test-integration-mysql": "cross-env DIALECT=mysql npm run test-integration",
174174
"test-integration-postgres": "cross-env DIALECT=postgres npm run test-integration",
@@ -187,8 +187,8 @@
187187
"test-all": "npm run test-mariadb && npm run test-mysql && npm run test-sqlite && npm run test-postgres && npm run test-postgres-native && npm run test-mssql",
188188
"test-typings": "tsc -b types/tsconfig.json && dtslint --expectOnly types/test",
189189
"cover": "rimraf coverage && npm run teaser && npm run cover-integration && npm run cover-unit && npm run merge-coverage",
190-
"cover-integration": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha --require scripts/mocha-bootload -t 30000 --exit \"test/integration/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"",
191-
"cover-unit": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha --require scripts/mocha-bootload -t 30000 --exit \"test/unit/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"",
190+
"cover-integration": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha -t 30000 --exit \"test/integration/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"",
191+
"cover-unit": "cross-env COVERAGE=true nyc --reporter=lcovonly mocha -t 30000 --exit \"test/unit/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"",
192192
"merge-coverage": "lcov-result-merger \"coverage/*.info\" \"coverage/lcov.info\"",
193193
"sscce": "env-cmd $npm_package_options_env_cmd node sscce.js",
194194
"sscce-mariadb": "cross-env DIALECT=mariadb npm run sscce",
@@ -197,6 +197,6 @@
197197
"sscce-sqlite": "cross-env DIALECT=sqlite npm run sscce",
198198
"sscce-mssql": "cross-env DIALECT=mssql npm run sscce",
199199
"setup-mssql": "env-cmd $npm_package_options_env_cmd ./scripts/setup-mssql",
200-
"semantic-release": "semantic-release"
200+
"//semantic-release": "semantic-release"
201201
}
202202
}

scripts/appveyor-setup.ps1

-51
This file was deleted.

scripts/mocha-bootload

Whitespace-only changes.

0 commit comments

Comments
 (0)