Skip to content

Commit

Permalink
pending v8 changes (#410)
Browse files Browse the repository at this point in the history
* Remove deprecated webpacker spelling (#429)
* feat!: drop support for Ruby 2.6 (#415)
* feat!: remove `https` option (#414)
* feat!: remove `relative_url_root` option (#413)
* feat!: drop support for Node v12 (#431)
* feat!: remove `yarn_install` task (#412)
* ci: cancel in-progress jobs when new changes are pushed (#432)
* ci: merge ruby and node based jobs into single workflows (#434)
* ci: merge node related checks into a single workflow
* ci: merge ruby related checks into a single workflow
* ci: rename jobs
* ci: test against Ruby 3.1 and 3.2, and Node 20 (#433)
* ci: test against Ruby 3.1 and 3.2
* ci: test against Node 20
* ci: only run Rubocop with latest Ruby (#438)
* chore: update pull request template (#437)
* ci: test against Rails 7.1 (#436)
* feat!: remove `globalMutableWebpackConfig` (#439)
* ci: don't run on pushes to `next` (#444)
* feat!: remove `verify_file_existance` method (#446)
* feat!: remove `check_yarn` task (#443)
* ci: use latest bundler in generator jobs (#445)
* feat!: enable `ensure_consistent_versioning` by default (#447)
* Remove dependency on glob (#435)
* Remove dependency on glob
* Pass in shakapacker config consistently (#448)
* Reference config from config rather than instance in compiler
* Strip additional_paths from the asset paths generated in the file.js rule (#403)
* Add config.includePaths and strip includePaths from file.js output paths
* Refactor code to fix lint issue
* Make sure to replace only once
* Change variable name
* Revert includePath change and make stripping additional_paths opt-in
* refactor: use snake_case for method name (#450)
* fix: only strip paths that start with source path (#451)
* feat!: always use `package_json` for managing node packages (#430)
* feat!: minor cleanup of js utilities (#454)
* test: require `ostruct` explicitly (#460)
* ci: only run ESLint on latest Node (#462)
* docs: create upgrade guide for v8 (#458)
* V8 upgrade guide
* docs: write v8 upgrade doc
* docs: format with Prettier
* feat!: move tests and helpers into  (#459)
* test: move into `test` directory
* test: update import paths
* test: update jest config
* refactor: move test helpers
* test: move jest config into dedicated file
* docs: add changelog entry
* chore: remove unneeded eslint ignore
* refactor: update js linting (#461)
* refactor: setup and apply Prettier (#463)
* refactor: use `eslint-plugin-jest` (#464)
  • Loading branch information
justin808 authored May 8, 2024
1 parent f902e18 commit 9e6dc55
Show file tree
Hide file tree
Showing 217 changed files with 3,339 additions and 5,621 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib/*
node_modules/*
vendor/*
**/__tests__/**/*
spec/*
37 changes: 29 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,36 @@
module.exports = {
extends: ['airbnb', 'prettier'],
extends: ["airbnb", "plugin:prettier/recommended"],
rules: {
'comma-dangle': ['error', 'never'],
'import/no-unresolved': 'off',
'import/no-extraneous-dependencies': 'off',
'import/extensions': 'off',
"indent": ["error", 2],
semi: ['error', 'never']
"import/no-unresolved": "off",
"import/no-extraneous-dependencies": "off",
"import/extensions": "off",
indent: ["error", 2]
},
env: {
browser: true,
node: true
}
},
overrides: [
{
files: ["test/**"],
extends: ["plugin:jest/recommended", "plugin:jest/style"],
rules: {
"global-require": "off",
"jest/prefer-called-with": "error",
"jest/no-conditional-in-test": "error",
"jest/no-test-return-statement": "error",
"jest/prefer-expect-resolves": "error",
"jest/require-to-throw-message": "error",
"jest/require-top-level-describe": "error",
"jest/prefer-hooks-on-top": "error",
"jest/prefer-lowercase-title": [
"error",
{ ignoreTopLevelDescribe: true }
],
"jest/prefer-spy-on": "error",
"jest/prefer-strict-equal": "error",
"jest/prefer-todo": "error"
}
}
]
}
13 changes: 10 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
### Summary

_Remove this paragraph and describe the code changes in your pull request... were there any bugs you had fixed? If so, mention them. If these bugs have open GitHub issues, tag them here as well to keep the conversation linked._
<!--
Describe the code changes in your pull request here - were there any bugs you had fixed, features you added, tradeoffs you made?
If so, mention them. If these changes have open GitHub issues, tag them here as well to keep the conversation linked.
-->

### Pull Request checklist
_Remove this line after checking all the items here. If the item does not apply to the PR, both check it out and wrap it by `~`._

<!-- If any of the items on this checklist do not apply to the PR, both check it out and wrap it by `~`. -->

- [ ] Add/update test to cover these changes
- [ ] Update documentation
- [ ] Update CHANGELOG file

### Other Information

_Remove this paragraph and mention other important and relevant information, such as benchmarks._
<!--
Mention any other important information that might relate to this PR but that don't belong in the summary,
like detailed benchmarks or possible follow-up changes.
-->
6 changes: 5 additions & 1 deletion .github/workflows/dummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- 'main'
- 'next'
pull_request:

concurrency:
# Pushing new changes to a branch will cancel any in-progress CI runs
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
Expand Down
31 changes: 13 additions & 18 deletions .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,35 @@ on:
push:
branches:
- 'main'
- 'next'
pull_request:

concurrency:
# Pushing new changes to a branch will cancel any in-progress CI runs
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Generator specs
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
ruby: ['2.6', '2.7', '3.0']
use_package_json_gem: ['true', 'false']
ruby: ['2.7', '3.0', '3.1', '3.2']
gemfile:
- gemfiles/Gemfile-rails.6.0.x
- gemfiles/Gemfile-rails.6.1.x
- gemfiles/Gemfile-rails.7.0.x
- gemfiles/Gemfile-rails.7.1.x
# Uncomment the following line only to ensure compatibility with the
# upcomming Rails versions, maybe before a release.
#- gemfiles/Gemfile-rails-edge
exclude:
- ruby: 2.6
os: ubuntu-latest
gemfile: gemfiles/Gemfile-rails.7.0.x
- ruby: 2.6
os: ubuntu-latest
gemfile: gemfiles/Gemfile-rails-edge
- ruby: '3.1'
gemfile: gemfiles/Gemfile-rails.6.0.x
- ruby: '3.2'
gemfile: gemfiles/Gemfile-rails.6.0.x

env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

Expand All @@ -40,13 +43,5 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
# Bundler 2.5.0 dropped support for Ruby 2.6 and 2.7
- name: Use Bundler 2.4.22
run: |
gem install bundler -v '2.4.22'
bundle config --local path vendor/bundle
- name: Install dependencies
run: bundle install
bundler-cache: true
- run: bundle exec rake run_spec:generator
env:
SHAKAPACKER_USE_PACKAGE_JSON_GEM: ${{ matrix.use_package_json_gem }}
34 changes: 0 additions & 34 deletions .github/workflows/jest.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/js-lint.yml

This file was deleted.

56 changes: 56 additions & 0 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Node based checks

on:
push:
branches:
- 'main'
pull_request:

concurrency:
# Pushing new changes to a branch will cancel any in-progress CI runs
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint:
name: Linting
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: yarn

- name: Install dependencies
run: yarn --frozen-lockfile --non-interactive --prefer-offline

- name: Node eslint
run: yarn lint
test:
name: Testing
strategy:
matrix:
os: [ubuntu-latest]
node: [14.x, 16.x, 18.x, 20.x]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: yarn

- name: Install dependencies
run: yarn --frozen-lockfile --non-interactive --prefer-offline

- name: Jest Specs
run: yarn test
29 changes: 0 additions & 29 deletions .github/workflows/rubocop.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/ruby-backward-compatibility.yml

This file was deleted.

Loading

0 comments on commit 9e6dc55

Please sign in to comment.