feat(build): uplift Lerna + replace insecure shortid with nanoid + up…

…lift Yeoman-related packages + ESM-ize generator-superset (apache#29419) Signed-off-by: hainenber <[email protected]>
preset-io · Jul 16, 2024 · c30ca53 · c30ca53
1 parent 028e9c9
commit c30ca53
Show file tree

Hide file tree

Showing 35 changed files with 29,612 additions and 33,859 deletions.
diff --git a/.github/workflows/superset-frontend.yml b/.github/workflows/superset-frontend.yml
@@ -76,7 +76,7 @@ jobs:
       - name: generator-superset unit tests
         if: steps.check.outputs.frontend
         working-directory: ./superset-frontend/packages/generator-superset
-        run: npx jest
+        run: npm run test
       - name: Upload code coverage
         uses: codecov/codecov-action@v4
         with:

diff --git a/superset-frontend/.prettierignore b/superset-frontend/.prettierignore
@@ -25,3 +25,5 @@ CHANGELOG/
 *.geojson
 *-topo.json
 storybook-static/
+
+/.nx/workspace-data
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts b/superset-frontend/cypress-base/cypress/e2e/explore/link.test.ts
@@ -21,7 +21,7 @@
 // ***********************************************
 
 import rison from 'rison';
-import shortid from 'shortid';
+import { nanoid } from 'nanoid';
 import { interceptChart } from 'cypress/utils';
 import { HEALTH_POP_FORM_DATA_DEFAULTS } from './visualizations/shared.helper';
 
@@ -71,7 +71,7 @@ describe('Test explore links', () => {
       metrics: ['sum__SP_POP_TOTL'],
       groupby: ['country_name'],
     };
-    const newChartName = `Test chart [${shortid.generate()}]`;
+    const newChartName = `Test chart [${nanoid()}]`;
 
     cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@tableChartData' });
@@ -109,8 +109,8 @@ describe('Test explore links', () => {
 
   it('Test chart save as and add to new dashboard', () => {
     const chartName = 'Growth Rate';
-    const newChartName = `${chartName} [${shortid.generate()}]`;
-    const dashboardTitle = `Test dashboard [${shortid.generate()}]`;
+    const newChartName = `${chartName} [${nanoid()}]`;
+    const dashboardTitle = `Test dashboard [${nanoid()}]`;
 
     cy.visitChartByName(chartName);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });

diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts b/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as shortid from 'shortid';
+import { nanoid } from 'nanoid';
 import { selectResultsTab, assertSQLLabResultsAreEqual } from './sqllab.helper';
 
 function parseClockStr(node: JQuery) {
@@ -86,7 +86,7 @@ describe('SqlLab query panel', () => {
 
     const query =
       'SELECT ds, gender, name, num FROM main.birth_names ORDER BY name LIMIT 3';
-    const savedQueryTitle = `CYPRESS TEST QUERY ${shortid.generate()}`;
+    const savedQueryTitle = `CYPRESS TEST QUERY ${nanoid()}`;
 
     // we will assert that the results of the query we save, and the saved query are the same
     let initialResultsTable: HTMLElement | null = null;

diff --git a/superset-frontend/cypress-base/package-lock.json b/superset-frontend/cypress-base/package-lock.json
diff --git a/superset-frontend/cypress-base/package.json b/superset-frontend/cypress-base/package.json
@@ -25,7 +25,7 @@
     "querystringify": "^2.2.0",
     "react-dom": "^16.13.0",
     "rison": "^0.1.1",
-    "shortid": "^2.2.15"
+    "nanoid": "^5.0.7"
   },
   "devDependencies": {
     "@types/querystringify": "^2.0.0",

diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js
@@ -56,7 +56,7 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
   snapshotSerializers: ['@emotion/jest/enzyme-serializer'],
   transformIgnorePatterns: [
-    'node_modules/(?!d3-(interpolate|color)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp)',
+    'node_modules/(?!d3-(interpolate|color)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid)',
   ],
   globals: {
     __DEV__: true,

diff --git a/superset-frontend/lerna.json b/superset-frontend/lerna.json
@@ -1,8 +1,6 @@
 {
-  "lerna": "3.2.1",
   "npmClient": "npm",
   "packages": ["packages/*", "plugins/*", "src/setup/*"],
-  "useWorkspaces": true,
   "version": "0.18.25",
   "ignoreChanges": [
     "**/*.md",
@@ -19,5 +17,6 @@
       "message": "chore(superset-ui): publish %s",
       "exact": true
     }
-  }
+  },
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }