Skip to content

Commit

Permalink
bugfixing the linters (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
laurensWe authored Aug 22, 2024
2 parents c1c2714 + 20ce847 commit 8961339
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 223 deletions.
96 changes: 47 additions & 49 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ jobs:

- name: "Continuous Integration: test"
run: pnpm run test

publish-website:
runs-on: ubuntu-latest
needs: build
Expand All @@ -119,51 +118,50 @@ jobs:
- name: Deploy to GitHub Pages
id: deploy-pages
uses: actions/deploy-pages@v4

publish-npm:
runs-on: ubuntu-latest
needs: [lint, test]
if: github.ref == 'refs/heads/main'

steps:
- name: Checkout release branch
uses: actions/checkout@v4
with:
token: ${{ secrets.GH_TOKEN }}

- name: Install pnpm package manager
uses: pnpm/action-setup@v4

- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: pnpm

- name: "Continuous Deployment: install"
run: |
pnpm install --frozen-lockfile
pnpm ls --recursive
- name: "Continuous Deployment: build"
run: pnpm run build

# lets exclude this for now...
# - name: "Continuous Deployment: publish to GitHub repository"
# env:
# GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
# GIT_AUTHOR_EMAIL: ""
# GIT_AUTHOR_NAME: "NL Design System"
# GIT_COMMITTER_EMAIL: ""
# GIT_COMMITTER_NAME: "NL Design System"
# run: |
# git push --set-upstream origin HEAD
# pnpm run release

- name: "Continuous Deployment: publish to npm"
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
pnpm config set "//registry.npmjs.org/:_authToken" "${NPM_TOKEN}"
pnpm run publish
pnpm config delete "//registry.npmjs.org/:_authToken"
# publish-npm:
# runs-on: ubuntu-latest
# needs: [lint, test]
# if: github.ref == 'refs/heads/main'
#
# steps:
# - name: Checkout release branch
# uses: actions/checkout@v4
# with:
# token: ${{ secrets.GH_TOKEN }}
#
# - name: Install pnpm package manager
# uses: pnpm/action-setup@v4
#
# - name: Set up Node.js version
# uses: actions/setup-node@v4
# with:
# node-version-file: .nvmrc
# cache: pnpm
#
# - name: "Continuous Deployment: install"
# run: |
# pnpm install --frozen-lockfile
# pnpm ls --recursive
#
# - name: "Continuous Deployment: build"
# run: pnpm run build

# lets exclude this for now...
# - name: "Continuous Deployment: publish to GitHub repository"
# env:
# GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
# GIT_AUTHOR_EMAIL: ""
# GIT_AUTHOR_NAME: "NL Design System"
# GIT_COMMITTER_EMAIL: ""
# GIT_COMMITTER_NAME: "NL Design System"
# run: |
# git push --set-upstream origin HEAD
# pnpm run release

# - name: "Continuous Deployment: publish to npm"
# env:
# NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
# run: |
# pnpm config set "//registry.npmjs.org/:_authToken" "${NPM_TOKEN}"
# pnpm run publish
# pnpm config delete "//registry.npmjs.org/:_authToken"
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//eslint.config.js
module.exports = {
ignores: ['**/node_modules/*', 'vendor/', 'package.json', 'build/', 'coverage/', 'dist/', 'tmp/'],
files: ['*.js', '*.cjs', '*.mjs', '*.jsx', '*.mdx', '*.ts', '*.tsx'],
};
1 change: 0 additions & 1 deletion npmpackagejsonlint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module.exports = {
'no-tilde-version-devDependencies': 'error',
'require-repository-directory': 'error',
'valid-values-license': ['error', ['EUPL-1.2']],
// 'valid-values-name-scope': ['error', ['@ministerievanbinnenlandsezakenenkoninkrijksrelaties','@ministerievanbinnenlandsezakenenkoninkrijksrelatie/design-system']],
},
overrides: [
{
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ministerievanbinnenlandsezakenenkoninkrijksrelatie/design-system",
"name": "@nl-minbzk/design-system",
"version": "1.0.0-alpha.0",
"author": "Community for NL Design System",
"description": "Design system based on the NL Design System architecture",
Expand Down Expand Up @@ -51,11 +51,11 @@
"scripts": {
"build": "lerna run build",
"clean": "lerna run clean",
"lint": "npm-run-all --continue-on-error lint:** lint-workspaces",
"lint": "npm-run-all lint:** lint-workspaces",
"lint:css": "stylelint --allow-empty-input '**/*.{css,scss}'",
"lint:js": "eslint --ext .js,.cjs,.mjs,.json,.jsx,.mdx,.ts,.tsx --report-unused-disable-directives .",
"lint:js": "eslint --report-unused-disable-directives .",
"lint:md": "markdownlint '**/*.md'",
"lint:package-json": "npmPkgJsonLint .",
"lint:package-json": "npmPkgJsonLint . -c",
"lint:package-lock": "pnpm ls --recursive",
"lint-fix": "npm-run-all --continue-on-error lint-fix:** prettier",
"lint-fix:css": "stylelint --fix '**/*.{css,scss}'",
Expand All @@ -78,8 +78,6 @@
"watch:storybook": "lerna run build:stencil && lerna run build:style-dictionary && pnpm --filter ./packages/storybook run storybook",
"watch:style-dictionary": "lerna run watch:style-dictionary"
},
"dependencies": {
"http-server": "14.1.1"
},
"dependencies": {},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"@babel/core": "7.25.2",
"@etchteam/storybook-addon-status": "5.0.0",
"@ministerievanbinnenlandsezakenenkoninkrijksrelaties/design-tokens": "workspace:*",
"@nl-minbzk/design-tokens": "workspace:*",
"@storybook/addon-a11y": "8.2.9",
"@storybook/addon-actions": "8.2.9",
"@storybook/addon-docs": "8.2.9",
Expand Down
Loading

0 comments on commit 8961339

Please sign in to comment.