diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74eb567..8f41d08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,10 +21,10 @@ jobs: node-version: '18' - name: Install dependencies run: npm ci - - name: Run Jest - run: npm run jest - - name: Run Playwright - run: xvfb-run npm run playwright + - name: Run test + run: npm run test + - name: Run e2e + run: xvfb-run npm run e2e - name: Upload Jest Coverage uses: codecov/codecov-action@v3 with: diff --git a/examples/svelte/.npmrc b/examples/svelte/.npmrc deleted file mode 100644 index b6f27f1..0000000 --- a/examples/svelte/.npmrc +++ /dev/null @@ -1 +0,0 @@ -engine-strict=true diff --git a/package.json b/package.json index 0dec657..6ac62bf 100644 --- a/package.json +++ b/package.json @@ -58,14 +58,17 @@ "webpack": "^5.74.0" }, "scripts": { - "test": "npm run test --workspace=overlayscrollbars", - "test-wrapper": "run-p test:*", + "test": "run-p test:*", + "test:os": "npm run test --workspace=overlayscrollbars", "test:react": "npm run test --workspace=overlayscrollbars-react", "test:vue": "npm run test --workspace=overlayscrollbars-vue", "test:ngx": "npm run test --workspace=overlayscrollbars-ngx", "test:svelte": "npm run test --workspace=overlayscrollbars-svelte", - "build": "npm run build --workspace=overlayscrollbars", - "build-wrapper": "run-p build:*", + "e2e": "run-p e2e:*", + "e2e:os": "npm run e2e --workspace=overlayscrollbars", + "e2e:os:dev": "npm run e2e:dev --workspace=overlayscrollbars", + "build": "run-p build:*", + "build:os": "npm run build --workspace=overlayscrollbars", "build:react": "npm run build --workspace=overlayscrollbars-react", "build:vue": "npm run build --workspace=overlayscrollbars-vue", "build:ngx": "npm run build --workspace=overlayscrollbars-ngx", @@ -74,9 +77,6 @@ "example:vue": "npm run build:vue && cd examples/vue && npm i --install-links && npm run dev", "example:ngx": "npm run build:ngx && cd examples/angular && npm i --install-links && npm run start", "example:svelte": "npm run build:svelte && cd examples/svelte && npm i --install-links && npm run dev", - "jest": "npm run jest --workspace=overlayscrollbars", - "playwright": "npm run playwright --workspace=overlayscrollbars", - "playwright:dev": "npm run test:playwright:dev --workspace=overlayscrollbars", "lint": "eslint ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}", "lint:fix": "eslint --fix ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}", "prettier": "prettier --check ./packages/**/{src,test}/**/*.{js,jsx,ts,tsx}", diff --git a/packages/overlayscrollbars/package.json b/packages/overlayscrollbars/package.json index 871668a..d25f359 100644 --- a/packages/overlayscrollbars/package.json +++ b/packages/overlayscrollbars/package.json @@ -42,14 +42,14 @@ "sideEffects": ["*.css", "*.scss", "*.sass"], "scripts": { "build": "rollup -c", - "test": "jest --coverage && playwright test --grep-invert @special", + "test": "jest --coverage", + "e2e": "playwright test --grep-invert @special", + "e2e:dev": "playwright test --workers 1 --timeout 0 --global-timeout 0", "jest": "jest --coverage --testPathPattern", "jest:node": "jest --selectProjects node --testPathPattern", "jest:jsdom": "jest --selectProjects jsdom --testPathPattern", - "playwright": "playwright test --grep-invert @special", - "playwright:dev": "playwright test --workers 1 --timeout 0 --global-timeout 0", "posttest": "playwright-merge-coverage && full-coverage", "postjest": "full-coverage", - "postplaywright": "playwright-merge-coverage && full-coverage" + "poste2e": "playwright-merge-coverage && full-coverage" } }