From 8b9c96b8827814411526154165b62f9a448be6b6 Mon Sep 17 00:00:00 2001 From: Titani Labaj <39532947+tlabaj@users.noreply.github.com> Date: Fri, 14 Jul 2023 10:03:15 -0400 Subject: [PATCH] Revert "Add transformation fallback (#9353)" This reverts commit 201743b39960e4231797785f3b189ff5cc98898a. --- packages/react-tokens/package.json | 1 - .../react-tokens/single-packages.config.json | 5 ----- packages/transformer-dynamic-imports/index.ts | 19 ++----------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 packages/react-tokens/single-packages.config.json diff --git a/packages/react-tokens/package.json b/packages/react-tokens/package.json index 8313bb1e32d..42da9dd490b 100644 --- a/packages/react-tokens/package.json +++ b/packages/react-tokens/package.json @@ -25,7 +25,6 @@ }, "homepage": "https://github.com/patternfly/patternfly-react#readme", "scripts": { - "build:single:packages": "node ../../scripts/build-single-packages.js --config single-packages.config.json", "generate": "yarn clean && node scripts/writeTokens.js", "clean": "rimraf dist" }, diff --git a/packages/react-tokens/single-packages.config.json b/packages/react-tokens/single-packages.config.json deleted file mode 100644 index e680848bb21..00000000000 --- a/packages/react-tokens/single-packages.config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "packageName": "@patternfly/react-tokens", - "moduleGlob": "/dist/esm/*.js", - "exclude": [] -} diff --git a/packages/transformer-dynamic-imports/index.ts b/packages/transformer-dynamic-imports/index.ts index 89bdc3a2133..27719880e3d 100644 --- a/packages/transformer-dynamic-imports/index.ts +++ b/packages/transformer-dynamic-imports/index.ts @@ -86,7 +86,7 @@ const transformer:ts.TransformerFactory = context => sourceFile = const { factory } = context // handles relative imports import {foo} from '@patternfly/react-icons' // the regex has extra '$ condition - if(ts.isImportDeclaration(node) && /@patternfly\/react-(core|icons|tokens)'$/.test(node.moduleSpecifier.getText())) { + if(ts.isImportDeclaration(node) && /@patternfly\/react-(core|icons)'$/.test(node.moduleSpecifier.getText())) { if(node.moduleSpecifier.getText().includes('react-icons')) { const importNames: string[] = [] // get all named imports @@ -105,7 +105,7 @@ const transformer:ts.TransformerFactory = context => sourceFile = } // handle absolute icons import paths - if(ts.isImportDeclaration(node) && /@patternfly\/react-(icons|tokens)/.test(node.moduleSpecifier.getText())) { + if(ts.isImportDeclaration(node) && /@patternfly\/react-icons/.test(node.moduleSpecifier.getText())) { if (ts.isImportDeclaration(node) && /@patternfly\/.*\/dist\/esm/.test(node.moduleSpecifier.getText())) { return factory.updateImportDeclaration( node, @@ -121,21 +121,6 @@ const transformer:ts.TransformerFactory = context => sourceFile = } } - - // handle any uncaught esm imports - if (ts.isImportDeclaration(node) && /@patternfly\/.*\/dist\/esm/.test(node.moduleSpecifier.getText()) && context.getCompilerOptions().module === 1) { - return factory.updateImportDeclaration( - node, - node.decorators, - node.modifiers, - node.importClause, - factory.createStringLiteral( - node.moduleSpecifier.getFullText().replace(/"/g, '').replace(/'/g, '').replace(/dist\/esm/, 'dist/js').trim(), - true - ), - undefined - ) - } return ts.visitEachChild(node, visitor, context); }