Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions yarn-project/bb-prover/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,5 @@
"path": "../types"
}
],
"include": [
"src"
]
"include": ["src"]
}
8 changes: 2 additions & 6 deletions yarn-project/circuit-types/package.local.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
"generate": "./scripts/copy-test-artifacts.sh && run -T prettier -w ./src/test/artifacts --loglevel warn",
"clean": "rm -rf ./dest .tsbuildinfo ./src/test/artifacts"
},
"files": [
"dest",
"src",
"!*.test.*"
]
}
"files": ["dest", "src", "!*.test.*"]
}
2 changes: 1 addition & 1 deletion yarn-project/ivc-integration/package.local.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"scripts": {
"build": "yarn clean && yarn generate && rm -rf dest && webpack && tsc -b",
"clean": "rm -rf ./dest .tsbuildinfo src/types artifacts",
"test:non-browser":"NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testPathIgnorePatterns=browser --passWithNoTests ",
"test:non-browser": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testPathIgnorePatterns=browser --passWithNoTests ",
"test:browser": "./run_browser_tests.sh",
"test": "yarn test:non-browser"
},
Expand Down
6 changes: 1 addition & 5 deletions yarn-project/ivc-integration/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,5 @@
"path": "../world-state"
}
],
"include": [
"src",
"artifacts/*.d.json.ts",
"artifacts/**/*.d.json.ts"
]
"include": ["src", "artifacts/*.d.json.ts", "artifacts/**/*.d.json.ts"]
}
38 changes: 19 additions & 19 deletions yarn-project/ivc-integration/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
import { resolve, dirname } from "path";
import { fileURLToPath } from "url";
import ResolveTypeScriptPlugin from "resolve-typescript-plugin";
import CopyWebpackPlugin from "copy-webpack-plugin";
import HtmlWebpackPlugin from "html-webpack-plugin";
import webpack from "webpack";
import CopyWebpackPlugin from 'copy-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import { dirname, resolve } from 'path';
import ResolveTypeScriptPlugin from 'resolve-typescript-plugin';
import { fileURLToPath } from 'url';
import webpack from 'webpack';

export default {
target: "web",
mode: "production",
target: 'web',
mode: 'production',
entry: {
index: "./src/serve.ts",
index: './src/serve.ts',
},
module: {
rules: [
{
test: /\.tsx?$/,
use: [{ loader: "ts-loader" }],
}
use: [{ loader: 'ts-loader' }],
},
],
},
output: {
path: resolve(dirname(fileURLToPath(import.meta.url)), "./dest"),
filename: "[name].js",
chunkFilename: "[name].chunk.js", // This naming pattern is used for chunks produced from code-splitting.
path: resolve(dirname(fileURLToPath(import.meta.url)), './dest'),
filename: '[name].js',
chunkFilename: '[name].chunk.js', // This naming pattern is used for chunks produced from code-splitting.
},
plugins: [
new HtmlWebpackPlugin({ inject: false, template: "./src/index.html" }),
new webpack.DefinePlugin({ "process.env.NODE_DEBUG": false }),
new HtmlWebpackPlugin({ inject: false, template: './src/index.html' }),
new webpack.DefinePlugin({ 'process.env.NODE_DEBUG': false }),
],
resolve: {
plugins: [new ResolveTypeScriptPlugin()],
},
devServer: {
hot: false,
client: {
logging: "none",
logging: 'none',
overlay: false,
},
headers: {
"Cross-Origin-Opener-Policy": "same-origin",
"Cross-Origin-Embedder-Policy": "require-corp",
'Cross-Origin-Opener-Policy': 'same-origin',
'Cross-Origin-Embedder-Policy': 'require-corp',
},
},
};