diff --git a/.editorconfig b/.editorconfig index 80fb64e..ed272d4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,11 +1,11 @@ root = true [*] -indent_style = space -indent_size = 2 -end_of_line = lf -max_line_length = 100 charset = utf-8 -trim_trailing_whitespace = true +end_of_line = lf +indent_size = 2 +indent_style = space insert_final_newline = true +max_line_length = 100 quote_type = single +trim_trailing_whitespace = true diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index dcddf74..0000000 --- a/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -build -coverage -dist -es -fixtures -lib -template -templates -node_modules -package-lock.json -pnpm-lock.yaml -yarn.lock -*.min.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 801b1a7..f4ca53a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-node@v4 - uses: pnpm/action-setup@v3 with: - version: 8 + version: latest - run: pnpm install - run: pnpm run lint test: @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-node@v4 - uses: pnpm/action-setup@v3 with: - version: 8 + version: latest - run: pnpm install - run: pnpm run test build: @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-node@v4 - uses: pnpm/action-setup@v3 with: - version: 8 + version: latest - run: pnpm install - run: pnpm run build - run: cd packages/f2elint && pnpm run build diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 84c60ac..849cf34 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -4,35 +4,29 @@ on: push: branches: - main - pull_request: jobs: - deploy: - name: Deploy + build: runs-on: ubuntu-latest - permissions: - contents: write - concurrency: - group: ${{ github.workflow }}-${{ github.ref }} steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Node - uses: actions/setup-node@v4 - - - name: Setup pnpm - uses: pnpm/action-setup@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + - uses: pnpm/action-setup@v3 with: - version: 8 - - - name: Install - run: pnpm install - - name: Build - run: pnpm run build - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - if: github.ref == 'refs/heads/main' + version: latest + - run: pnpm install + - run: pnpm run build + - uses: actions/upload-pages-artifact@v3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./build + path: build/ + deploy: + needs: build + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - uses: actions/deploy-pages@v4 diff --git a/.gitignore b/.gitignore index b110080..da01e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ -.rive -.DS_Store -build +/.rive +/build +/coverage +/dist node_modules package-lock.json pnpm-lock.yaml yarn.lock +*.min.css +*.min.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 93b8956..bb7452c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,16 @@ { - "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"], + "eslint.validate": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact" + ], "stylelint.validate": ["css", "less", "scss"], "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit", "source.fixAll.stylelint": "explicit", - "source.organizeImports": "explicit" + "source.organizeImports": "explicit", + "source.fixAll": "explicit" }, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, @@ -41,5 +47,8 @@ }, "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "files.associations": { + "*.ejs": "plaintext" } } diff --git a/tsconfig.json b/tsconfig.json index 197a284..f5fe8f2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,12 @@ { "compilerOptions": { - "target": "es2015", + "target": "es2017", "module": "esnext", "esModuleInterop": true, "resolveJsonModule": true, "types": ["node", "rive/globals"], "lib": ["esnext"], - "allowJs": false, + "allowJs": true, "checkJs": false, "skipLibCheck": true, "moduleResolution": "node",