[NO_TICKET] Fix flag typing (#968)

* Remove console.log * Generate typescript definition files for tsx files, and rely on manual type defs for jsx
CMSgov · Mar 10, 2021 · 1891293 · 1891293
1 parent 5088d75
commit 1891293
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 102 deletions.
diff --git a/packages/design-system-scripts/gulp/build.js b/packages/design-system-scripts/gulp/build.js
@@ -87,7 +87,15 @@ async function copyAll(dir, options) {
  */
 async function generateTypeDefinitions(dir, changedPath) {
   const src = path.join(dir, 'src', 'components');
-  const srcGlob = getSrcGlob(src, changedPath);
+  const srcGlob = changedPath
+    ? [changedPath`!${src}/**/*.{js,jsx}`]
+    : [
+        `${src}/**/*.{ts,tsx}`,
+        `!${src}/**/*.{js,jsx}`,
+        `!${src}/setupTests.{js,jsx,ts,tsx}`,
+        `!${src}/**/*{.test,.spec,.d}.{js,jsx,ts,tsx}`,
+        `!${src}/**/{__mocks__,__tests__,helpers}/**/*`,
+      ];
 
   const tsProject = ts.createProject('tsconfig.json', {
     declaration: true,
@@ -174,9 +182,8 @@ function compileJs(dir, options, changedPath) {
       return compileEsmJs(dir, changedPath);
     })
     .then(() => {
-      // If design system is using typescript, use tsc to generate definition files
-      // Core DS manually updates definition files
-      if (options.typescript && !options.core) {
+      // If design system is using typescript, use tsc to generate definition files for tsx files
+      if (options.typescript) {
         return generateTypeDefinitions(dir, changedPath);
       }
     });

diff --git a/packages/design-system-scripts/gulp/docs/webpack/createReactExampleWebpackConfig.js b/packages/design-system-scripts/gulp/docs/webpack/createReactExampleWebpackConfig.js
@@ -22,8 +22,6 @@ module.exports = async function createReactExampleWebpackConfig(
 
   const entry = [...(additionalEntry ? [exampleEntryFile] : []), path.resolve(reactExampleEntry)];
 
-  console.log(entry);
-
   const config = {
     mode: process.env.NODE_ENV,
     entry,

diff --git a/packages/design-system/src/types/FormControl/FormControl.d.ts b/packages/design-system/src/types/FormControl/FormControl.d.ts
diff --git a/packages/design-system/src/types/InlineError/InlineError.d.ts b/packages/design-system/src/types/InlineError/InlineError.d.ts
diff --git a/packages/design-system/src/types/index.d.ts b/packages/design-system/src/types/index.d.ts
@@ -30,4 +30,9 @@ export { default as TabPanel } from './Tabs/TabPanel';
 export { default as TextField } from './TextField/TextField';
 export { maskValue, unmaskValue } from './TextField/Mask';
 export { default as UsaBanner } from './UsaBanner/UsaBanner';
-export { default as VerticalNav } from './VerticalNav/VerticalNav';
+export { default as VerticalNav } from './VerticalNav/VerticalNav';
+
+// Type definitions generated by cmsds scripts
+export * from './InlineError/InlineError';
+export * from './FormControl/FormControl';
+export * from './flags';