8000 Merge branch 'degrunt' · jasmine/jasmine@7cc7da4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7cc7da4

Browse files
sgravrocksgravrock
committed
Merge branch 'degrunt'
2 parents 5b1c932 + 8be98e7 commit 7cc7da4

22 files changed

+294
-327
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
at: .
6262
- run:
6363
name: Run tests in parallel
64-
command: npx grunt execSpecsInParallel
64+
command: npm run test:parallel
6565

6666
test_browsers: &test_browsers
6767
executor: node18

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ charset = utf-8
33
end_of_line = lf
44
insert_final_newline = true
55

6-
[*.{js, mjs, json, sh, yml}]
6+
[*.{js,mjs,json,sh,yml}]
77
indent_style = space
88
indent_size = 2

‎.eslintrc

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

‎Gruntfile.js

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

‎RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ When ready to release - specs are all green and the stories are done:
4141

4242
### Build standalone distribution
4343

44-
1. Build the standalone distribution with `grunt buildStandaloneDist`
44+
1. Build the standalone distribution with `npm run buildStandaloneDist`
4545
1. This will generate `dist/jasmine-standalone-<version>.zip`, which you will upload later (see "Finally" below).
4646

4747
### Release the core NPM module

‎grunt/config/compress.js

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

‎grunt/config/concat.js

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

‎grunt/config/cssUrlEmbed.js

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

‎grunt/config/sass.js

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

‎grunt/tasks/build_standalone.js

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

0 commit comments

Comments
 (0)
0