@itwin/build-tools 3.0.0-dev.76 → 3.0.0-dev.80

package/.nycrc

@@ -5,11 +5,11 @@
   ],
   "include": [
     "src/**/*",
-    "lib/**/*"
+    "lib/cjs/**/*"
   ],
   "exclude": [
     "src/test/**/*",
-    "lib/test/**/*",
+    "lib/cjs/test/**/*",
     "lib/module/**/*",
     "**/*.d.ts",
     "**/*.d.tsx"
@@ -18,8 +18,8 @@
     ".ts",
     ".tsx"
   ],
-  "temp-dir": "./lib/test/coverage/.nyc_output",
-  "report-dir": "./lib/test/coverage",
+  "temp-dir": "./lib/cjs/test/coverage/.nyc_output",
+  "report-dir": "./lib/cjs/test/coverage",
   "reporter": [
     "text-summary",
     "lcov",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/build-tools",
-  "version": "3.0.0-dev.76",
+  "version": "3.0.0-dev.80",
   "description": "Bentley build tools",
   "license": "MIT",
   "repository": {
@@ -39,7 +39,7 @@
     "yargs": "^16.0.0"
   },
   "devDependencies": {
-    "@itwin/eslint-plugin": "3.0.0-dev.76",
+    "@itwin/eslint-plugin": "3.0.0-dev.80",
     "@types/node": "14.14.31",
     "eslint": "^7.11.0"
   },

package/scripts/config/paths.js

@@ -15,13 +15,13 @@ module.exports = {
   appSrc: resolveApp('src'),
   appTest: resolveApp('src/test'),
   appLib: resolveApp('lib'),
-  appLibPublic: resolveApp('lib/public'),
-  appLibTests: resolveApp('lib/test'),
+  appLibPublic: resolveApp('lib/cjs/public'),
+  appLibTests: resolveApp('lib/cjs/test'),
   appPublic: resolveApp('public'),
-  appDocs: resolveApp('lib/docs'),
-  appJsonDocs: resolveApp('lib/docs/json/file.json'),
+  appDocs: resolveApp('lib/cjs/docs'),
+  appJsonDocs: resolveApp('lib/cjs/docs/json/file.json'),
   appJUnitTestResults: resolveApp('lib/test/junit_results.xml'),
-  libExtract: resolveApp('lib/extract'),
+  libExtract: resolveApp('lib/cjs/extract'),
   appLocalesEnglish: resolveApp('public/locales/en'),
   appLocalesPseudolocalize: resolveApp('public/locales/en-pseudo'),
 };

package/scripts/extract-api.js

@@ -35,7 +35,7 @@ const rushCommon = resolveRoot("common");
 
 const config = {
   $schema: "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  projectFolder: "../",
+  projectFolder: "../../",
   compiler: {
     tsconfigFilePath: "<projectFolder>/tsconfig.json"
   },
@@ -98,7 +98,7 @@ if (!fs.existsSync("lib")) {
   process.exit(1);
 }
 
-const configFileName = `lib/${entryPointFileName}.json`;
+const configFileName = `lib/cjs/${entryPointFileName}.json`;
 fs.writeFileSync(configFileName, JSON.stringify(config, null, 2));
 
 const args = [

package/scripts/pseudolocalize.js

@@ -6,7 +6,6 @@
 
 /** Generates pseudo localization files from the en localization JSON files.
 */
-
 function pseudoLocalizeObject(objIn) {
   let objOut = {};
   for (let prop in objIn) {

package/scripts/rush/audit.js

@@ -37,12 +37,13 @@ const rushCommonDir = path.join(__dirname, "../../../../common/");
   // for development dependencies only.
   // All security issues should be addressed asap.
   const excludedAdvisories = [
-    1700, // https://npmjs.com/advisories/1700
-    1754, // https://npmjs.com/advisories/1754. Waiting for fix, https://github.com/svg/svgo/pull/1485.
-    1755, // https://npmjs.com/advisories/1755. Waiting for fix, https://github.com/sindresorhus/normalize-url/issues/135
-    1779, // https://npmjs.com/advisories/1779. Waiting for fix in @bentley/react-scripts
-    1780, // https://npmjs.com/advisories/1780. Waiting for fix in @bentley/react-scripts
-    1781, // https://npmjs.com/advisories/1781. Waiting for fix in @bentley/react-scripts
+    "GHSA-8p5q-j9m2-g8wr", // https://github.com/advisories/GHSA-8p5q-j9m2-g8wr.
+    "GHSA-ww39-953v-wcq6", // https://github.com/advisories/GHSA-ww39-953v-wcq6.
+    "GHSA-8v27-2fg9-7h62", // https://github.com/advisories/GHSA-8v27-2fg9-7h62.
+    "GHSA-33f9-j839-rf8h", // https://github.com/advisories/GHSA-33f9-j839-rf8h.
+    "GHSA-c36v-fmgq-m8hx", // https://github.com/advisories/GHSA-c36v-fmgq-m8hx.
+    "GHSA-4jqc-8m5r-9rpr", // https://github.com/advisories/GHSA-4jqc-8m5r-9rpr.
+    "GHSA-whgm-jr23-g3j9", // https://github.com/advisories/GHSA-whgm-jr23-g3j9.
   ];
 
   let shouldFailBuild = false;
@@ -57,10 +58,10 @@ const rushCommonDir = path.join(__dirname, "../../../../common/");
       const message = `${severity} Security Vulnerability: ${advisory.title} in ${advisory.module_name} (from ${mpath}).  See ${advisory.url} for more info.`;
 
       // For now, we'll only treat CRITICAL and HIGH vulnerabilities as errors in CI builds.
-      if (!excludedAdvisories.includes(advisory.id) && (severity === "HIGH" || severity === "CRITICAL")) {
+      if (!excludedAdvisories.includes(advisory.github_advisory_id) && (severity === "HIGH" || severity === "CRITICAL")) {
         logBuildError(message);
         shouldFailBuild = true;
-      } else if (excludedAdvisories.includes(advisory.id) || severity === "MODERATE") // Only warn on MODERATE severity items
+      } else if (excludedAdvisories.includes(advisory.github_advisory_id) || severity === "MODERATE") // Only warn on MODERATE severity items
         logBuildWarning(message);
     }
   }

package/tsconfig-base.json

@@ -1,35 +1,28 @@
 {
   "compilerOptions": {
-    "target": "es2017",
-    "lib": [
-      // Required for async iterators/generators:
-      "esnext.asynciterable",
-      // These are the defaults for "target": "es2017", but they have to be explicitly specified if we want to add anything to "lib":
-      "es2017",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ],
-    "module": "commonjs",
-    "stripInternal": false,
+    "alwaysStrict": true,
     "declaration": true,
-    "strict": true,
+    "declarationMap": true,
+    "esModuleInterop": false,
+    "experimentalDecorators": true,
+    "forceConsistentCasingInFileNames": true,
+    "incremental": true,
+    "inlineSources": true,
+    "jsx": "react",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noFallthroughCasesInSwitch": false,
     "noImplicitAny": true,
-    "strictNullChecks": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
     "noImplicitThis": true,
-    "alwaysStrict": true,
     "noUnusedLocals": false,
     "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noImplicitOverride": true,
-    "noFallthroughCasesInSwitch": false,
-    "experimentalDecorators": true,
     "skipLibCheck": true,
     "sourceMap": true,
-    "inlineSources": true,
-    "declarationMap": true,
-    "jsx": "react",
-    "forceConsistentCasingInFileNames": true,
-    "incremental": true
+    "strict": true,
+    "strictNullChecks": true,
+    "stripInternal": false,
+    "target": "ES2019"
   }
 }