From a2df72b0f8d5ed41878f0b0877f8dead8ce27a0e Mon Sep 17 00:00:00 2001 From: eggplantzzz Date: Fri, 12 Aug 2022 16:36:00 -0400 Subject: [PATCH] use named exports for Parser and Profiler --- .../compile-solidity/src/compileWithPragmaAnalysis.ts | 2 +- packages/compile-solidity/src/index.ts | 2 +- packages/compile-solidity/src/parser.ts | 2 +- packages/compile-solidity/src/profiler/index.ts | 10 +++++----- packages/compile-solidity/src/profiler/loadParser.ts | 2 +- packages/compile-solidity/test/profiler/index.js | 2 +- packages/compile-solidity/test/test_parser.js | 2 +- packages/core/lib/testing/Test.js | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/compile-solidity/src/compileWithPragmaAnalysis.ts b/packages/compile-solidity/src/compileWithPragmaAnalysis.ts index 23c4f911af6..1378e3e4a51 100644 --- a/packages/compile-solidity/src/compileWithPragmaAnalysis.ts +++ b/packages/compile-solidity/src/compileWithPragmaAnalysis.ts @@ -1,7 +1,7 @@ import { CompilerSupplier } from "./compilerSupplier"; import Config from "@truffle/config"; import semver from "semver"; -import Profiler from "./profiler"; +import { Profiler } from "./profiler"; import { run } from "./run"; import { reportSources } from "./reportSources"; import OS from "os"; diff --git a/packages/compile-solidity/src/index.ts b/packages/compile-solidity/src/index.ts index 0a3c367c530..5ecc872dbe0 100644 --- a/packages/compile-solidity/src/index.ts +++ b/packages/compile-solidity/src/index.ts @@ -2,7 +2,7 @@ import debugModule from "debug"; const debug = debugModule("compile"); import findContracts from "@truffle/contract-sources"; import Config from "@truffle/config"; -import Profiler from "./profiler"; +import { Profiler } from "./profiler"; import { CompilerSupplier } from "./compilerSupplier"; import { run } from "./run"; import { normalizeOptions } from "./normalizeOptions"; diff --git a/packages/compile-solidity/src/parser.ts b/packages/compile-solidity/src/parser.ts index 7ee187e2e6c..8dfc53c80e3 100644 --- a/packages/compile-solidity/src/parser.ts +++ b/packages/compile-solidity/src/parser.ts @@ -5,7 +5,7 @@ const debug = debugModule("compile:parser"); const preReleaseCompilerWarning = "This is a pre-release compiler version, please do not use it in production."; -export default { +export const Parser = { // This needs to be fast! It is fast (as of this writing). Keep it fast! parseImports(body, solc) { // WARNING: Kind of a hack (an expedient one). diff --git a/packages/compile-solidity/src/profiler/index.ts b/packages/compile-solidity/src/profiler/index.ts index 9d60d51a2f8..01b34c4605f 100644 --- a/packages/compile-solidity/src/profiler/index.ts +++ b/packages/compile-solidity/src/profiler/index.ts @@ -1,13 +1,13 @@ // Compares .sol files to their .sol.js counterparts, // determines which .sol files have been updated. -import { Profiler } from "@truffle/profiler"; +import { Profiler as TruffleProfiler } from "@truffle/profiler"; import { loadParser } from "./loadParser"; import { shouldIncludePath } from "./shouldIncludePath"; import type Config from "@truffle/config"; -export default { +export const Profiler = { updated: async (options: Config) => { - const profiler = new Profiler({}); + const profiler = new TruffleProfiler({}); return await profiler.updated(options); }, @@ -18,7 +18,7 @@ export default { const parseImports = await loadParser(options); // generate profiler - const profiler = new Profiler({ + const profiler = new TruffleProfiler({ parseImports, shouldIncludePath }); @@ -30,7 +30,7 @@ export default { requiredSourcesForSingleFile: async (options: Config) => { const parseImports = await loadParser(options); - const profiler = new Profiler({ + const profiler = new TruffleProfiler({ parseImports, shouldIncludePath }); diff --git a/packages/compile-solidity/src/profiler/loadParser.ts b/packages/compile-solidity/src/profiler/loadParser.ts index 88180cc82c0..51f41e38b4d 100644 --- a/packages/compile-solidity/src/profiler/loadParser.ts +++ b/packages/compile-solidity/src/profiler/loadParser.ts @@ -1,5 +1,5 @@ import { CompilerSupplier } from "../compilerSupplier"; -import Parser from "../parser"; +import { Parser } from "../parser"; import semver, { SemVer } from "semver"; import type Config from "@truffle/config"; diff --git a/packages/compile-solidity/test/profiler/index.js b/packages/compile-solidity/test/profiler/index.js index 69b680a4056..6ac817646b5 100644 --- a/packages/compile-solidity/test/profiler/index.js +++ b/packages/compile-solidity/test/profiler/index.js @@ -2,7 +2,7 @@ const { assert } = require("chai"); const fs = require("fs-extra"); const path = require("path"); const tmp = require("tmp"); -const Profiler = require("../../dist/profiler").default; +const { Profiler } = require("../../dist/profiler"); const { Resolver } = require("@truffle/resolver"); const Artifactor = require("@truffle/artifactor"); const TruffleConfig = require("@truffle/config"); diff --git a/packages/compile-solidity/test/test_parser.js b/packages/compile-solidity/test/test_parser.js index 4342eee34e4..80877db1abb 100644 --- a/packages/compile-solidity/test/test_parser.js +++ b/packages/compile-solidity/test/test_parser.js @@ -1,6 +1,6 @@ const fs = require("fs"); const path = require("path"); -const Parser = require("../dist/parser").default; +const { Parser } = require("../dist/parser"); const { CompilerSupplier } = require("../dist/compilerSupplier"); const { assert } = require("chai"); diff --git a/packages/core/lib/testing/Test.js b/packages/core/lib/testing/Test.js index 31b6df94d60..5d00722a2a4 100644 --- a/packages/core/lib/testing/Test.js +++ b/packages/core/lib/testing/Test.js @@ -13,7 +13,7 @@ const SolidityTest = require("./SolidityTest"); const RangeUtils = require("@truffle/compile-solidity/dist/compilerSupplier/rangeUtils"); const expect = require("@truffle/expect"); const Migrate = require("@truffle/migrate"); -const Profiler = require("@truffle/compile-solidity/dist/profiler"); +const { Profiler } = require("@truffle/compile-solidity/dist/profiler"); const originalrequire = require("original-require"); const Codec = require("@truffle/codec"); const debug = require("debug")("lib:test");