Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix auto-watch when running npm run test:inject:debug #8124

Merged
merged 3 commits into from Feb 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Expand Up @@ -23,8 +23,11 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 14.x

node-version: 15.x
mattalxndr marked this conversation as resolved.
Show resolved Hide resolved

- name: Verify NPM version
run: npm --version

- name: Set up npm cache
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,6 +1,6 @@
# Build files
#-----------------------------------
build/
build*/
darkreader.js
debug.log

Expand Down
11 changes: 5 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -88,7 +88,7 @@
"karma-coverage": "2.1.0",
"karma-firefox-launcher": "2.1.2",
"karma-jasmine": "4.0.1",
"karma-rollup-preprocessor": "7.0.7",
"karma-rollup-preprocessor": "github:jlmakes/karma-rollup-preprocessor#master",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait what they say, maybe we can avoid using this and use the next update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

"karma-safari-launcher": "1.0.0",
"less": "4.1.2",
"malevic": "0.18.6",
Expand Down
5 changes: 4 additions & 1 deletion tasks/paths.js
Expand Up @@ -8,5 +8,8 @@ module.exports = {
getDestDir: function ({debug, platform}) {
const buildTypeDir = `build/${debug ? 'debug' : 'release'}`;
return `${buildTypeDir}/${platform}`;
}
},
getTestDestDir: function () {
return `build-tests`;
},
};
2 changes: 2 additions & 0 deletions tests/inject/karma.conf.js
Expand Up @@ -5,6 +5,7 @@ const rollupPluginNodeResolve = require('@rollup/plugin-node-resolve').default;
const rollupPluginReplace = require('@rollup/plugin-replace');
const rollupPluginTypescript = require('@rollup/plugin-typescript');
const typescript = require('typescript');
const {getTestDestDir} = require('../../tasks/paths');

module.exports = (config) => {
config.set({
Expand Down Expand Up @@ -41,6 +42,7 @@ module.exports = (config) => {
}),
],
output: {
dir: `${getTestDestDir()}`,
mattalxndr marked this conversation as resolved.
Show resolved Hide resolved
strict: true,
format: 'iife',
sourcemap: 'inline',
Expand Down