Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/yarn/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ runs:
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
registry-url: 'https://registry.npmjs.org'
scope: '@codecademy'
- name: Custom Cypress Cache Folder
shell: bash
run: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ permissions:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

jobs:
publish:
runs-on: ubuntu-22.04
Expand All @@ -36,14 +39,13 @@ jobs:
git config --global push.default current

- uses: ./.github/actions/yarn

- run: yarn turbo run build --concurrency=3

- name: Publish
env:
HUSKY_ENABLED: true
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
run: npx auto shipit

publish-check:
Expand All @@ -54,4 +56,4 @@ jobs:
- run: npx auto pr-check --url "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}?pr=${{github.event.pull_request.number}}"
env:
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN || github.token }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.17.0
v22.13.1
1 change: 1 addition & 0 deletions auto.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const npmOptions = {
exact: true,
setRcToken: false,
};

/** Auto configuration */
Expand Down
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"version": "independent",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": ["packages/*"],
"command": {
"publish": {
Expand All @@ -11,5 +10,6 @@
"version": {
"changelogPreset": "conventionalcommits"
}
}
},
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"author": "Codecademy Engineers <[email protected]>",
"engines": {
"node": "^16.17",
"node": "^22",
"yarn": "^1.22"
},
"scripts": {
Expand Down Expand Up @@ -45,14 +45,14 @@
"conventional-changelog-cli": "^2.0.34",
"conventional-changelog-conventionalcommits": "^4.3.0",
"gh-pages": "^5.0.0",
"lerna": "3.22.1"
"lerna": "8.1.9"
},
"devDependencies": {
"auto": "^11.1.6",
"@auto-it/all-contributors": "^11.0.4",
"@auto-it/first-time-contributor": "^11.0.4",
"@auto-it/npm": "^11.0.4",
"@auto-it/released": "^11.0.4",
"auto": "^11.3.0",
"@auto-it/all-contributors": "^11.3.0",
"@auto-it/first-time-contributor": "^11.3.0",
"@auto-it/npm": "^11.3.0",
"@auto-it/released": "^11.3.0",
"@babel/cli": "7.13.10",
"@babel/core": "7.19.6",
"@babel/preset-typescript": "^7.13.0",
Expand Down Expand Up @@ -108,7 +108,8 @@
"react-helmet": "6.1.0",
"react-test-renderer": "18.2.0",
"turbo": "^1.1.2",
"typescript": "4.4.2"
"typescript": "4.4.2",
"semver": "7.7.1"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/eslint-config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
overrides: [
// Stories generally have empty functions and other syntax shenanigans for code examples
{
files: ['*.stories.*'],
files: ['*.stories.*', '*.stories.ts.*'],
rules: {
'@typescript-eslint/no-empty-function': 'off',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-config/src/loaders/files.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const files = {
default: {
loader: 'file-loader',
test: /\.jpe?g$|\.gif$|\.png$|\.svg$|\.woff2?$|\.ttf$|\.eot|\.wav$|\.mp3$/,
test: /\.jpe?g$|\.gif$|\.png$|\.svg$|\.woff2?$|\.ttf$|\.eot|\.wav$|\.mp3$|\.ogg$/,
},
};

Expand Down
Loading
Loading