Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Webpacker 6 #514

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions .browserslistrc

This file was deleted.

810 changes: 405 additions & 405 deletions .eslintignore

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ yarn-debug.log*
storage

# the locales directory in javascript is generated at run time.
app/javascript/i18n/locales
app/packs/i18n/locales

# No package-lock.json file from npm
package-lock.json
4 changes: 2 additions & 2 deletions .storybook/html/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// License: LGPL-3.0-or-later
module.exports = {
"stories": [
"../../app/javascript/**/*--html.stories.mdx",
"../../app/javascript/**/*--html.stories.@(js|jsx|ts|tsx)"
"../../app/packs/**/*--html.stories.mdx",
"../../app/packs/**/*--html.stories.@(js|jsx|ts|tsx)"
],
"addons": [
"@storybook/addon-links",
Expand Down
4 changes: 2 additions & 2 deletions .storybook/react/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const railsWebpackEnv = require("../../config/webpack/environment");

module.exports = {
stories: [
"../../app/javascript/**/*!(--html).stories.mdx",
"../../app/javascript/**/*!(--html).stories.[tj]s?(x)"
"../../app/packs/**/*!(--html).stories.mdx",
"../../app/packs/**/*!(--html).stories.[tj]s?(x)"
],
addons: [
"@storybook/addon-links",
Expand Down
2 changes: 1 addition & 1 deletion .storybook/react/preview.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: LGPL-3.0-or-later
import intlDecorate from '../../app/javascript/components/tests/intl';
import intlDecorate from '../../app/packs/components/tests/intl';
const jest = require('jest-mock');
window.jest = jest;

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem 'rake', '~> 12.3.2'
gem 'sassc-rails', '~> 2.1', '>= 2.1.2'
gem 'sassc', '~> 2.0', '>= 2.0.1'
gem 'stripe', '~> 1.58' # January 19, 2017 version of the Stripe API https://stripe.com/docs/api
gem 'webpacker', '~> 5.2.1'
gem 'webpacker', git: 'https://github.com/rails/webpacker.git', tag: 'v6.0.0.beta.6'
gem 'react-rails'
gem 'good_job'

Expand Down
18 changes: 12 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ GIT
i18n-js (3.8.0)
i18n (>= 0.6.6)

GIT
remote: https://github.com/rails/webpacker.git
revision: 781f03f8a8864f99777b9883694bdca2889ba4fe
tag: v6.0.0.beta.6
specs:
webpacker (6.0.0.beta.6)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)

PATH
remote: gems/bess
specs:
Expand Down Expand Up @@ -406,11 +417,6 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.2.1)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -483,7 +489,7 @@ DEPENDENCIES
timecop (~> 0.9.1)
traceroute (~> 0.8.0)
webmock (~> 3.6, >= 3.6.2)
webpacker (~> 5.2.1)
webpacker!
wisper-rspec (~> 1.1.0)

RUBY VERSION
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// License: LGPL-3.0-or-later
import { createIntl, FormatMoneyOptions } from "./";
import { createIntl, FormatMoneyOptions } from ".";
import { Money } from "../../common/money";
const NBSP = '\xa0';

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading