diff --git a/CHANGES.md b/CHANGES.md index 50df8c8b..d5710182 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,8 @@ setup browser-bug folder and ui issues folder - Testing: Create test utilities for selecting English and visiting and approving storage +- npm: Add rimraf toward supporting Windows development (needed for + building docs and instrumenting) - npm: Update scripts to reflect removal of `all_tests.html`; remove `browser-test` script - npm: Update devDeps, peerDeps diff --git a/badges/coverage-badge.svg b/badges/coverage-badge.svg index f2f4c84a..2d3ca5dc 100644 --- a/badges/coverage-badge.svg +++ b/badges/coverage-badge.svg @@ -20,8 +20,8 @@ Coverage Coverage - 22.02% - 22.02% + 40.74% + 40.74% diff --git a/package-lock.json b/package-lock.json index 6e6e3759..91b33d75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4960,6 +4960,17 @@ "dev": true, "requires": { "rimraf": "^2.6.3" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "untildify": { @@ -6695,6 +6706,17 @@ "flatted": "^2.0.0", "rimraf": "2.6.3", "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "flatted": { @@ -10646,6 +10668,15 @@ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", "dev": true }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -11391,9 +11422,9 @@ "dev": true }, "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", "dev": true, "requires": { "glob": "^7.1.3" diff --git a/package.json b/package.json index 30cdbe28..7cb6e392 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "prepublishOnly": "npm run test-prep", "build-by-config": "rollup -c rollup-config.config.js", "open-es-allext": "open-cli http://localhost:8000/editor/svg-editor-es.html?extensions=ext-arrows.js,ext-closepath.js,ext-foreignobject.js,ext-helloworld.js,ext-mathjax.js,ext-php_savefile.js,ext-server_moinsave.js,ext-server_opensave.js,ext-webappfind.js,ext-xdomain-messaging.js", - "build-docs": "rm -rf docs/jsdoc/*;jsdoc --pedantic -c docs/jsdoc-config.js editor", + "build-docs": "rimraf docs/jsdoc/*;jsdoc --pedantic -c docs/jsdoc-config.js editor", "open-docs": "open-cli http://localhost:8000/docs/jsdoc/ && npm start", "build-html": "npx babel-node --plugins @babel/plugin-transform-modules-commonjs build-html.js", "compress-images": "imageoptim 'chrome-app/*.png' && imageoptim 'editor/extensions/*.png' && imageoptim 'editor/spinbtn/*.png' && imageoptim 'editor/jgraduate/images/*.{png,gif}' && imageoptim 'editor/images/*.png'", @@ -35,7 +35,7 @@ "instrument:replace-js": "frs-replace \"editor/svg-editor.js\" \"svg-editor.js\" -i svgedit-config-es.js -o instrumented/svgedit-config-es.js", "instrument:copy-excluded": "node cypress/support/copy.js", "copy-instrumented": "copyfiles -e \"**/*.js\" -u 1 \"editor/**/*\" instrumented && npm run instrument:replace-html && npm run instrument:replace-js && npm run instrument:copy-excluded", - "instrument": "rm -Rf instrumented && npx nyc instrument editor instrumented && npm run copy-instrumented && npm run coverage-badge", + "instrument": "rimraf instrumented && npx nyc instrument editor instrumented && npm run copy-instrumented && npm run coverage-badge", "coverage-badge": "coveradge badges/coverage-badge", "open-cov": "npm-run-all instrument --parallel --race start cypress:open", "open": "run-p start cypress:open", @@ -159,6 +159,7 @@ "regenerator-runtime": "^0.13.3", "remark-cli": "^7.0.1", "remark-lint-ordered-list-marker-value": "^1.0.4", + "rimraf": "^3.0.0", "rollup": "1.27.14", "rollup-plugin-babel": "^4.3.3", "rollup-plugin-re": "^1.0.7",