Skip to content

Commit

Permalink
Revert "chore: sync alpha (#2568)" (#2586)
Browse files Browse the repository at this point in the history
This reverts commit ac50be8.
  • Loading branch information
adamstankiewicz authored and PKulkoRaccoonGang committed Aug 5, 2024
1 parent 62e6822 commit 9df531c
Show file tree
Hide file tree
Showing 2,368 changed files with 48,018 additions and 50,364 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
coverage/*
dist/
node_modules/
www/
#www/
icons/
build-scss.js
component-generator/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/analyze-dependents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,10 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: Setup Nodejs
uses: actions/setup-node@v3
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
with:
node-version: ${{ env.NODE_VER }}
- name: Download analysis output
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# 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

Expand All @@ -8,24 +7,4 @@ on:

jobs:
commitlint:
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
uses: openedx/.github/.github/workflows/commitlint.yml@master
97 changes: 0 additions & 97 deletions bin/paragon-scripts.js

This file was deleted.

4 changes: 2 additions & 2 deletions component-generator/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ exports.COMPONENT_FILES = [
templatePath: path.resolve(__dirname, './templates/README.md'),
},
{
targetPath: path.resolve(__dirname, '../src/componentName/index.scss'),
templatePath: path.resolve(__dirname, './templates/index.scss'),
targetPath: path.resolve(__dirname, '../src/componentName/componentName.scss'),
templatePath: path.resolve(__dirname, './templates/styles.scss'),
},
{
targetPath: path.resolve(__dirname, '../src/componentName/componentName.test.jsx'),
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion component-generator/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function addComponentToExports(componentName) {
);
fs.appendFileSync(
path.resolve(__dirname, '../src/index.scss'),
`@import "./${componentName}";\n`,
`@import './${componentName}/${componentName}.scss';\n`,
);
}

Expand Down
Loading

0 comments on commit 9df531c

Please sign in to comment.