Merge pull request #2587 from openedx/ags/sync-alpha-fix

[fix] Sync alpha with master

.github/workflows/analyze-dependents.yml

@@ -260,10 +260,10 @@ jobs:
       uses: actions/checkout@v3
       with:
           fetch-depth: 0
-    - name: Setup Nodejs
-      uses: actions/setup-node@v3
     - name: Setup Nodejs Env
       run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - name: Setup Nodejs
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ env.NODE_VER }}
     - name: Download analysis output

.github/workflows/commitlint.yml

@@ -1,4 +1,5 @@
 # Run commitlint on the commit messages in a pull request.
+# Currently overrides common openedx action as a workaround for fixing https://github.com/conventional-changelog/commitlint/issues/3256
 
 name: Lint Commit Messages
 
@@ -7,4 +8,24 @@ on:
 
 jobs:
   commitlint:
-    uses: openedx/.github/.github/workflows/commitlint.yml@master
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        with:
+          # Fetch 100 commits.  Should be enough?
+          fetch-depth: 100
+
+      # This step is needed to fix https://github.com/conventional-changelog/commitlint/issues/3256
+      - name: Remove tsconfig file
+        run: rm tsconfig.json
+
+      - name: Download a local configuration file if needed
+        run: |
+          if [[ ! -f commitlint.config.js ]]; then
+            echo "Downloading the default commitlint config from edx_lint"
+            wget --no-verbose -O commitlint.config.js https://raw.githubusercontent.com/openedx/edx-lint/HEAD/edx_lint/files/commitlint.config.js
+          fi
+
+      - name: Run commitlint
+        uses: wagoid/commitlint-github-action@v5

component-generator/constants.js

@@ -23,8 +23,8 @@ exports.COMPONENT_FILES = [
     templatePath: path.resolve(__dirname, './templates/README.md'),
   },
   {
-    targetPath: path.resolve(__dirname, '../src/componentName/componentName.scss'),
-    templatePath: path.resolve(__dirname, './templates/styles.scss'),
+    targetPath: path.resolve(__dirname, '../src/componentName/index.scss'),
+    templatePath: path.resolve(__dirname, './templates/index.scss'),
   },
   {
     targetPath: path.resolve(__dirname, '../src/componentName/componentName.test.jsx'),

component-generator/utils.js

@@ -81,7 +81,7 @@ function addComponentToExports(componentName) {
   );
   fs.appendFileSync(
     path.resolve(__dirname, '../src/index.scss'),
-    `@import './${componentName}/${componentName}.scss';\n`,
+    `@import "./${componentName}";\n`,
   );
 }