From be6bdb5bcd83215dde69c8229e7709adeb9ac1f5 Mon Sep 17 00:00:00 2001 From: Thomas Allmer Date: Sun, 4 Aug 2019 18:13:02 +0200 Subject: [PATCH] fix: cleanup package.json scripts --- .circleci/config.yml | 2 +- package.json | 18 ++++++------ packages/building-rollup/package.json | 10 +++---- packages/building-utils/package.json | 6 ++-- packages/building-webpack/package.json | 18 ++++++------ packages/create/package.json | 4 +-- packages/es-dev-server/package.json | 4 +-- packages/import-maps-generate/package.json | 4 +-- packages/import-maps-resolve/package.json | 4 +-- .../rollup-plugin-index-html/package.json | 6 ++-- packages/semantic-dom-diff/karma.bs.conf.js | 15 ---------- packages/semantic-dom-diff/karma.conf.js | 26 ----------------- packages/semantic-dom-diff/package.json | 13 +-------- packages/semantic-dom-diff/test/index.html | 22 --------------- packages/testing-helpers/karma.bs.conf.js | 15 ---------- packages/testing-helpers/karma.conf.js | 27 ------------------ packages/testing-helpers/package.json | 8 ------ packages/testing-helpers/test/index.html | 26 ----------------- packages/testing-karma/package.json | 12 ++++---- packages/testing/karma.bs.conf.js | 15 ---------- packages/testing/karma.conf.js | 28 ------------------- packages/testing/package.json | 13 --------- packages/testing/test/index.html | 22 --------------- packages/testing/test/index.js | 2 -- .../webpack-import-meta-loader/package.json | 4 +-- 25 files changed, 48 insertions(+), 276 deletions(-) delete mode 100644 packages/semantic-dom-diff/karma.bs.conf.js delete mode 100644 packages/semantic-dom-diff/karma.conf.js delete mode 100644 packages/semantic-dom-diff/test/index.html delete mode 100644 packages/testing-helpers/karma.bs.conf.js delete mode 100644 packages/testing-helpers/karma.conf.js delete mode 100644 packages/testing-helpers/test/index.html delete mode 100644 packages/testing/karma.bs.conf.js delete mode 100644 packages/testing/karma.conf.js delete mode 100644 packages/testing/test/index.html delete mode 100644 packages/testing/test/index.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 4eeb2922..cb147522 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: - run: npm run lint # run tests - - run: npm run test:ci + - run: npm run test:node - run: npm run test:bs - persist_to_workspace: diff --git a/package.json b/package.json index d04e57c3..ac5fefa5 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "license": "MIT", "scripts": { + "build": "lerna run build", "lint": "run-p lint:*", "lint:eslint": "eslint --ext .js,.html .", "lint:prettier": "prettier \"**/*.js\" --list-different || (echo '↑↑ these files are not prettier formatted ↑↑' && exit 1)", @@ -10,18 +11,19 @@ "format": "npm run format:eslint && npm run format:prettier", "format:eslint": "eslint --ext .js,.html . --fix", "format:prettier": "prettier \"**/*.js\" --write", + "postinstall": "npm run build", "publish": "lerna publish --message 'chore: release new versions'", "site:build": "npm run vuepress:build", "site:start": "npm run vuepress:start", - "build": "lerna run build", - "test": "karma start --coverage", - "test:watch": "karma start --auto-watch=true --single-run=false", - "test:update-snapshots": "karma start --update-snapshots", - "test:prune-snapshots": "karma start --prune-snapshots", - "test:ci": "lerna run test:ci", - "test:compatibility": "karma start --compatibility all --coverage", - "test:compatibility:watch": "karma start --auto-watch=true --single-run=false --compatibility all --coverage", + "test": "yarn test:browser && yarn test:node", + "test:browser": "karma start --coverage", + "test:browser:watch": "karma start --auto-watch=true --single-run=false", + "test:browser:update-snapshots": "karma start --update-snapshots", + "test:browser:prune-snapshots": "karma start --prune-snapshots", + "test:browser:compatibility": "karma start --compatibility all --coverage", + "test:browser:compatibility:watch": "karma start --auto-watch=true --single-run=false --compatibility all --coverage", "test:bs": "karma start karma.bs.conf.js --compatibility all --coverage", + "test:node": "lerna run test:node", "vuepress:build": "vuepress build docs", "vuepress:start": "vuepress dev docs" }, diff --git a/packages/building-rollup/package.json b/packages/building-rollup/package.json index 4149be28..32525082 100644 --- a/packages/building-rollup/package.json +++ b/packages/building-rollup/package.json @@ -14,11 +14,11 @@ "directory": "packages/building-rollup" }, "scripts": { - "start:build": "es-dev-server --app-index dist/index.html --open", - "build": "rimraf dist && rollup -c demo/js/rollup.config.js", - "build:modern": "rimraf dist && rollup -c demo/js/rollup.modern.config.js", - "build:ts": "rimraf dist && rollup -c demo/ts/rollup.config.js", - "build:ts-babel": "rimraf dist && rollup -c demo/ts-babel/rollup.config.js", + "demo:start:build": "es-dev-server --app-index dist/index.html --open", + "demo:build": "rimraf dist && rollup -c demo/js/rollup.config.js", + "demo:build:modern": "rimraf dist && rollup -c demo/js/rollup.modern.config.js", + "demo:build:ts": "rimraf dist && rollup -c demo/ts/rollup.config.js", + "demo:build:ts-babel": "rimraf dist && rollup -c demo/ts-babel/rollup.config.js", "prepublishOnly": "../../scripts/insert-header.js" }, "main": "index.js", diff --git a/packages/building-utils/package.json b/packages/building-utils/package.json index f3e05905..dd7d135c 100644 --- a/packages/building-utils/package.json +++ b/packages/building-utils/package.json @@ -9,9 +9,9 @@ "access": "public" }, "scripts": { - "test": "mocha test/**/*.test.js test/*.test.js", - "test:update-snapshots": "mocha test/**/*.test.js test/*.test.js --update-snapshots", - "test:ci": "npm run test" + "test": "npm run test:node", + "test:node": "mocha test/**/*.test.js test/*.test.js", + "test:update-snapshots": "mocha test/**/*.test.js test/*.test.js --update-snapshots" }, "repository": { "type": "git", diff --git a/packages/building-webpack/package.json b/packages/building-webpack/package.json index 0b2f5d57..6cbdb550 100644 --- a/packages/building-webpack/package.json +++ b/packages/building-webpack/package.json @@ -14,15 +14,15 @@ "directory": "packages/building-webpack" }, "scripts": { - "start:build": "http-server dist -o", - "build": "webpack --mode production --config demo/js/webpack.config.js", - "start:webpack-dev": "webpack-dev-server --mode development --config demo/js/webpack.config.js --open", - "start:webpack-dev:legacy": "webpack-dev-server --mode development --config demo/js/webpack.config.js --open --legacy", - "build:modern": "webpack --mode production --config demo/js/webpack.modern.config.js", - "start:webpack-dev:modern": "webpack-dev-server --mode development --config demo/js/webpack.modern.config.js --open", - "build:ts-babel": "webpack --mode production --config demo/ts-babel/webpack.config.js", - "build:ts": "webpack --mode production --config demo/ts/webpack.config.js", - "build:stats": "webpack --mode production --config demo/js/webpack.modern.config.js --profile --json > build-stats.json", + "demo:start": "http-server dist -o", + "demo:build": "webpack --mode production --config demo/js/webpack.config.js", + "demo:webpack-dev": "webpack-dev-server --mode development --config demo/js/webpack.config.js --open", + "demo:webpack-dev:legacy": "webpack-dev-server --mode development --config demo/js/webpack.config.js --open --legacy", + "demo:build:modern": "webpack --mode production --config demo/js/webpack.modern.config.js", + "demo:webpack-dev:modern": "webpack-dev-server --mode development --config demo/js/webpack.modern.config.js --open", + "demo:build:ts-babel": "webpack --mode production --config demo/ts-babel/webpack.config.js", + "demo:build:ts": "webpack --mode production --config demo/ts/webpack.config.js", + "demo:build:stats": "webpack --mode production --config demo/js/webpack.modern.config.js --profile --json > build-stats.json", "prepublishOnly": "../../scripts/insert-header.js" }, "main": "index.js", diff --git a/packages/create/package.json b/packages/create/package.json index 5e1df34d..c15e0c30 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -22,8 +22,8 @@ "scripts": { "build": "rimraf dist && babel src --out-dir dist --copy-files --include-dotfiles", "start": "npm run build && node ./dist/create.js", - "test": "mocha --require @babel/register", - "test:ci": "npm run test", + "test": "npm run test:node", + "test:node": "mocha --require @babel/register", "test:watch": "onchange 'src/**/*.js' 'test/**/*.js' -- npm run test --silent", "prepublishOnly": "npm run build && ../../scripts/insert-header.js" }, diff --git a/packages/es-dev-server/package.json b/packages/es-dev-server/package.json index 3f9be2c6..7e01f3e1 100644 --- a/packages/es-dev-server/package.json +++ b/packages/es-dev-server/package.json @@ -19,9 +19,9 @@ ], "scripts": { "build": "babel src --out-dir dist --copy-files --include-dotfiles", - "test": "mocha test/**/*.test.js test/*.test.js --require @babel/register", + "test": "npm run test:node", + "test:node": "mocha test/**/*.test.js test/*.test.js --require @babel/register", "test:update-snapshots": "mocha test/**/*.test.js test/*.test.js --require @babel/register --update-snapshots", - "test:ci": "npm run test", "start": "yarn build && node dist/cli.js --app-index demo/import-map/index.html --open --watch --http2", "start:compat-esm": "yarn build && node dist/cli.js --app-index demo/import-map/index.html --open --watch --http2 --compatibility esm", "start:compat-modern": "yarn build && node dist/cli.js --app-index demo/import-map/index.html --open --watch --http2 --compatibility modern", diff --git a/packages/import-maps-generate/package.json b/packages/import-maps-generate/package.json index ce541426..0ac67376 100644 --- a/packages/import-maps-generate/package.json +++ b/packages/import-maps-generate/package.json @@ -20,8 +20,8 @@ "scripts": { "build": "babel src --out-dir dist --copy-files --include-dotfiles", "start": "npm run build && node ./dist/generate.js", - "test": "mocha --require @babel/register", - "test:ci": "npm run test", + "test": "npm run test:node", + "test:node": "mocha --require @babel/register", "test:watch": "onchange 'src/**/*.js' 'test/**/*.js' -- npm run test --silent", "prepublishOnly": "npm run build && ../../scripts/insert-header.js" }, diff --git a/packages/import-maps-resolve/package.json b/packages/import-maps-resolve/package.json index 43f52caf..9b991605 100644 --- a/packages/import-maps-resolve/package.json +++ b/packages/import-maps-resolve/package.json @@ -20,8 +20,8 @@ "scripts": { "build": "babel src --out-dir dist --copy-files --include-dotfiles", "start": "npm run build && node ./dist/index.js", - "test": "mocha --require @babel/register", - "test:ci": "npm run test", + "test": "npm run test:node", + "test:node": "mocha --require @babel/register", "test:watch": "onchange 'src/**/*.js' 'test/**/*.js' -- npm run test --silent", "prepublishOnly": "npm run build && ../../scripts/insert-header.js" }, diff --git a/packages/rollup-plugin-index-html/package.json b/packages/rollup-plugin-index-html/package.json index d24e321c..816f5436 100644 --- a/packages/rollup-plugin-index-html/package.json +++ b/packages/rollup-plugin-index-html/package.json @@ -10,9 +10,9 @@ "access": "public" }, "scripts": { - "test": "mocha test/**/*.test.js test/*.test.js", - "test:update-snapshots": "mocha test/**/*.test.js test/*.test.js --update-snapshots", - "test:ci": "npm run test" + "test": "npm run test:node", + "test:node": "mocha test/**/*.test.js test/*.test.js", + "test:update-snapshots": "mocha test/**/*.test.js test/*.test.js --update-snapshots" }, "repository": { "type": "git", diff --git a/packages/semantic-dom-diff/karma.bs.conf.js b/packages/semantic-dom-diff/karma.bs.conf.js deleted file mode 100644 index 1e54adec..00000000 --- a/packages/semantic-dom-diff/karma.bs.conf.js +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const merge = require('webpack-merge'); -const bsSettings = require('@open-wc/testing-karma-bs/bs-settings.js'); -const createBaseConfig = require('./karma.conf.js'); - -module.exports = config => { - config.set( - merge(bsSettings(config), createBaseConfig(config), { - browserStack: { - project: 'open-wc', - }, - }), - ); - return config; -}; diff --git a/packages/semantic-dom-diff/karma.conf.js b/packages/semantic-dom-diff/karma.conf.js deleted file mode 100644 index 9f1976e8..00000000 --- a/packages/semantic-dom-diff/karma.conf.js +++ /dev/null @@ -1,26 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const { createDefaultConfig } = require('@open-wc/testing-karma'); -const merge = require('webpack-merge'); - -module.exports = config => { - config.set( - merge(createDefaultConfig(config), { - files: [ - // allows running single tests with the --grep flag - { pattern: config.grep ? config.grep : 'test/**/*.test.js', type: 'module' }, - ], - - coverageIstanbulReporter: { - thresholds: { - global: { - statements: 80, - branches: 70, - functions: 70, - lines: 80, - }, - }, - }, - }), - ); - return config; -}; diff --git a/packages/semantic-dom-diff/package.json b/packages/semantic-dom-diff/package.json index 9a241428..04c908b9 100644 --- a/packages/semantic-dom-diff/package.json +++ b/packages/semantic-dom-diff/package.json @@ -21,22 +21,11 @@ "index.js" ], "scripts": { - "test": "karma start --coverage", - "test:watch": "karma start --auto-watch=true --single-run=false", - "test:compatibility": "karma start --compatibility all --coverage", - "test:compatibility:watch": "karma start --compatibility all --auto-watch=true --single-run=false", - "test:bs": "karma start karma.bs.conf.js --compatibility --coverage", - "test:update-snapshots": "karma start --update-snapshots", - "test:prune-snapshots": "karma start --prune-snapshots", "prepublishOnly": "../../scripts/insert-header.js" }, "devDependencies": { "@bundled-es-modules/chai": "^4.2.0", "@open-wc/testing-helpers": "^1.1.6", - "@open-wc/testing-karma": "^3.1.10", - "@open-wc/testing-karma-bs": "^1.1.35", - "@open-wc/testing-wallaby": "^0.1.12", - "mocha": "^5.0.0", - "webpack-merge": "^4.1.5" + "mocha": "^5.0.0" } } diff --git a/packages/semantic-dom-diff/test/index.html b/packages/semantic-dom-diff/test/index.html deleted file mode 100644 index e54b4061..00000000 --- a/packages/semantic-dom-diff/test/index.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -
- - - - - diff --git a/packages/testing-helpers/karma.bs.conf.js b/packages/testing-helpers/karma.bs.conf.js deleted file mode 100644 index 1e54adec..00000000 --- a/packages/testing-helpers/karma.bs.conf.js +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const merge = require('webpack-merge'); -const bsSettings = require('@open-wc/testing-karma-bs/bs-settings.js'); -const createBaseConfig = require('./karma.conf.js'); - -module.exports = config => { - config.set( - merge(bsSettings(config), createBaseConfig(config), { - browserStack: { - project: 'open-wc', - }, - }), - ); - return config; -}; diff --git a/packages/testing-helpers/karma.conf.js b/packages/testing-helpers/karma.conf.js deleted file mode 100644 index 0a83c139..00000000 --- a/packages/testing-helpers/karma.conf.js +++ /dev/null @@ -1,27 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const { createDefaultConfig } = require('@open-wc/testing-karma'); -const merge = require('webpack-merge'); - -module.exports = config => { - config.set( - merge(createDefaultConfig(config), { - files: [ - // allows running single tests with the --grep flag - { pattern: config.grep ? config.grep : 'test/**/*.test.js', type: 'module' }, - ], - - // TODO: not yet within the 90% default - coverageIstanbulReporter: { - thresholds: { - global: { - statements: 80, - branches: 70, - functions: 70, - lines: 80, - }, - }, - }, - }), - ); - return config; -}; diff --git a/packages/testing-helpers/package.json b/packages/testing-helpers/package.json index 5d31401c..88ef7c66 100644 --- a/packages/testing-helpers/package.json +++ b/packages/testing-helpers/package.json @@ -20,11 +20,6 @@ "index-no-side-effects.js" ], "scripts": { - "test": "karma start --coverage", - "test:watch": "karma start --auto-watch=true --single-run=false", - "test:compatibility": "karma start --compatibility all --coverage", - "test:compatibility:watch": "karma start --compatibility all --auto-watch=true --single-run=false", - "test:bs": "karma start karma.bs.conf.js --compatibility --coverage", "prepublishOnly": "../../scripts/insert-header.js" }, "peerDependencies": { @@ -32,9 +27,6 @@ }, "devDependencies": { "@bundled-es-modules/chai": "^4.2.0", - "@open-wc/testing-karma": "^3.1.10", - "@open-wc/testing-karma-bs": "^1.1.35", - "@open-wc/testing-wallaby": "^0.1.12", "lit-html": "^1.0.0", "mocha": "^5.0.0", "sinon": "^7.2.7", diff --git a/packages/testing-helpers/test/index.html b/packages/testing-helpers/test/index.html deleted file mode 100644 index 94c96c9d..00000000 --- a/packages/testing-helpers/test/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
- - - - - diff --git a/packages/testing-karma/package.json b/packages/testing-karma/package.json index df7c55bb..5e31e0fc 100644 --- a/packages/testing-karma/package.json +++ b/packages/testing-karma/package.json @@ -15,12 +15,12 @@ "directory": "packages/testing-karma" }, "scripts": { - "test": "karma start demo/karma.conf.js --coverage --legacy", - "test:watch": "karma start demo/karma.conf.js --auto-watch=true --single-run=false", - "test:update-snapshots": "karma start demo/karma.conf.js --update-snapshots", - "test:prune-snapshots": "karma start demo/karma.conf.js --prune-snapshots", - "test:legacy": "karma start demo/karma.conf.js --legacy --coverage", - "test:bs": "karma start demo/karma.bs.conf.js --legacy --coverage", + "demo:test": "karma start demo/karma.conf.js --coverage --legacy", + "demo:test:watch": "karma start demo/karma.conf.js --auto-watch=true --single-run=false", + "demo:test:update-snapshots": "karma start demo/karma.conf.js --update-snapshots", + "demo:test:prune-snapshots": "karma start demo/karma.conf.js --prune-snapshots", + "demo:test:legacy": "karma start demo/karma.conf.js --legacy --coverage", + "demo:test:bs": "karma start demo/karma.bs.conf.js --legacy --coverage", "prepublishOnly": "../../scripts/insert-header.js" }, "files": [ diff --git a/packages/testing/karma.bs.conf.js b/packages/testing/karma.bs.conf.js deleted file mode 100644 index 3ef706d3..00000000 --- a/packages/testing/karma.bs.conf.js +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const merge = require('webpack-merge'); -const bsSettings = require('@open-wc/testing-karma-bs/bs-settings.js'); -const createBaseConfig = require('./karma.conf.js'); - -module.exports = config => { - config.set( - merge(bsSettings(config), createBaseConfig(config), { - browserStack: { - project: 'your-name', - }, - }), - ); - return config; -}; diff --git a/packages/testing/karma.conf.js b/packages/testing/karma.conf.js deleted file mode 100644 index d398e707..00000000 --- a/packages/testing/karma.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -const { createDefaultConfig } = require('@open-wc/testing-karma'); -const merge = require('webpack-merge'); - -module.exports = config => { - config.set( - merge(createDefaultConfig(config), { - files: [ - // allows running single tests with the --grep flag - { pattern: config.grep ? config.grep : 'test/**/*.test.js', type: 'module' }, - require.resolve('axe-core/axe.min.js'), - ], - - // is a meta package with with just some smoke tests - coverageIstanbulReporter: { - thresholds: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0, - }, - }, - }, - }), - ); - return config; -}; diff --git a/packages/testing/package.json b/packages/testing/package.json index 98fdbede..32649b08 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -20,13 +20,6 @@ "register-chai-plugins.js" ], "scripts": { - "test": "karma start --coverage", - "test:watch": "karma start --auto-watch=true --single-run=false", - "test:compatibility": "karma start --compatibility all --coverage", - "test:compatibility:watch": "karma start --compatibility all --auto-watch=true --single-run=false", - "test:bs": "karma start karma.bs.conf.js --compatibility --coverage", - "test:update-snapshots": "karma start --update-snapshots", - "test:prune-snapshots": "karma start --prune-snapshots", "prepublishOnly": "../../scripts/insert-header.js" }, "dependencies": { @@ -38,11 +31,5 @@ "@types/mocha": "^5.0.0", "chai-a11y-axe": "^1.1.1", "mocha": "^5.0.0" - }, - "devDependencies": { - "@open-wc/testing-karma": "^3.1.10", - "@open-wc/testing-karma-bs": "^1.1.35", - "@open-wc/testing-wallaby": "^0.1.12", - "webpack-merge": "^4.1.5" } } diff --git a/packages/testing/test/index.html b/packages/testing/test/index.html deleted file mode 100644 index f57d8f3a..00000000 --- a/packages/testing/test/index.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - -
- - - - - diff --git a/packages/testing/test/index.js b/packages/testing/test/index.js deleted file mode 100644 index 17d40db7..00000000 --- a/packages/testing/test/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import './side-effects.test.js'; -import './chaiA11yAxe.test.js'; diff --git a/packages/webpack-import-meta-loader/package.json b/packages/webpack-import-meta-loader/package.json index 26aeb731..39081982 100644 --- a/packages/webpack-import-meta-loader/package.json +++ b/packages/webpack-import-meta-loader/package.json @@ -19,8 +19,8 @@ "*.js" ], "scripts": { - "test": "mocha --require @babel/register", - "test:ci": "npm run test", + "test": "npm run test:node", + "test:node": "mocha --require @babel/register", "prepublishOnly": "../../scripts/insert-header.js" }, "devDependencies": {