Skip to content

Commit

Permalink
fix: reversed the reorg from two days ago
Browse files Browse the repository at this point in the history
  • Loading branch information
calebjclark committed Jul 15, 2021
1 parent e4d009c commit aa5fddd
Show file tree
Hide file tree
Showing 4,261 changed files with 3,853 additions and 3,867 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .eslintrc.js
Expand Up @@ -56,7 +56,7 @@ module.exports = {
},
overrides: [
{
files: ['*hero/client/**/*.ts', '*hero/interfaces/**/*.ts', 'commons/**/*.ts', 'hero/mitm*/**/*.ts'],
files: ['*client/**/*.ts', '*interfaces/**/*.ts', 'commons/**/*.ts', 'mitm*/**/*.ts'],
rules: {
'@typescript-eslint/explicit-function-return-type': [
'error',
Expand All @@ -65,13 +65,13 @@ module.exports = {
},
},
{
files: 'hero/plugin*/**/test/*.ts',
files: 'plugin*/**/test/*.ts',
rules: {
'no-console': 'off',
},
},
{
files: 'hero/plugin*/**/*.d.ts',
files: 'plugin*/**/*.d.ts',
rules: {
'import/no-extraneous-dependencies': 'off',
},
Expand Down Expand Up @@ -131,7 +131,7 @@ module.exports = {
'**/test/assets/**',
'build',
'build-dist',
'hero/examples/*.js',
'examples/*.js',
'**/build/**',
'**/dist/**',
'**/*.md',
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-and-test.yml
Expand Up @@ -113,7 +113,7 @@ jobs:
${{ runner.os }}-yarn-
- name: Copy mitm source
run: cp -r hero/mitm-socket/go build/hero/mitm-socket/go
run: cp -r mitm-socket/go build/mitm-socket/go

- name: Build modules
run: yarn --network-timeout 1000000
Expand All @@ -134,11 +134,11 @@ jobs:
env:
SA_SHOW_REPLAY: false
NODE_ENV: test
SA_SESSIONS_DIR: hero/.sessions
SA_SESSIONS_DIR: .sessions

- name: 'Tar files'
if: ${{ failure() }}
run: tar -cvf test-dbs.tar ./build/hero/.sessions
run: tar -cvf test-dbs.tar ./build/.sessions

- name: Upload Databases
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-version.yml
Expand Up @@ -70,6 +70,6 @@ jobs:
with:
version: v0.160.0
args: release --rm-dist --debug
workdir: ${{ github.workspace }}/hero/mitm-socket
workdir: ${{ github.workspace }}/mitm-socket
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions copyfiles.js
Expand Up @@ -9,14 +9,14 @@ const workspaces = pkg.workspaces.packages.map(x => x.replace('/*', ''));

const copyArgs = [
'-e "node_modules"',
'hero/plugins/default-browser-emulator/data/**',
'hero/examples/*.js',
'hero/examples/*.mjs',
'hero/mitm-socket/go/*.*',
'plugins/default-browser-emulator/data/**',
'examples/*.js',
'examples/*.mjs',
'mitm-socket/go/*.*',
'.*ignore',
];
if (isBuild) {
copyArgs.push('testing/*/**', 'hero/core/test/html/**', 'hero/puppet/test/*/**', 'yarn.lock');
copyArgs.push('testing/*/**', 'core/test/html/**', 'puppet/test/*/**', 'yarn.lock');
}

for (const workspace of workspaces) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
const { join } = require('path');

module.exports = {
extends: '../../../.eslintrc.js',
extends: '../../.eslintrc.js',
parserOptions: {
project: join(__dirname, '/tsconfig.json'),
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -4,6 +4,6 @@
"sourceMap": false,
"inlineSourceMap": false,
"removeComments": true,
"outDir": "../../../build-dist/hero/core/injected-scripts"
"outDir": "../../build-dist/core/injected-scripts"
}
}
Expand Up @@ -9,7 +9,7 @@
"sourceMap": false,
"declaration": true,
"allowJs": true,
"outDir": "../../../build/hero/core/injected-scripts"
"outDir": "../../build/core/injected-scripts"
},
"include": ["*.ts", ".eslintrc.js"],
"exclude": ["**/tsconfig*.json", "**/node_modules", "**/dist", "**/replay", "**/website"]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion hero/examples/tsconfig.json → examples/tsconfig.json
Expand Up @@ -4,7 +4,7 @@
"lib": ["ES2019", "DOM", "DOM.Iterable"],
"composite": true,
"allowJs": true,
"outDir": "../../build/examples",
"outDir": "../build/examples",
"module": "ES2020",
"moduleResolution": "node",
"esModuleInterop": false,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit aa5fddd

Please sign in to comment.