shakapacker 7.2.3 → 8.0.0.pre.rc.1

data/package/rules/stylus.js

@@ -1,20 +1,20 @@
-const path = require('path')
-const { canProcess } = require('../utils/helpers')
-const getStyleRule = require('../utils/get_style_rule')
+const path = require("path")
+const { canProcess } = require("../utils/helpers")
+const getStyleRule = require("../utils/getStyleRule")
 
 const {
   additional_paths: paths,
   source_path: sourcePath
-} = require('../config')
+} = require("../config")
 
-module.exports = canProcess('stylus-loader', (resolvedPath) =>
+module.exports = canProcess("stylus-loader", (resolvedPath) =>
   getStyleRule(/\.(styl(us)?)(\.erb)?$/i, [
     {
       loader: resolvedPath,
       options: {
         stylusOptions: {
           include: [
-            path.resolve(__dirname, 'node_modules'),
+            path.resolve(__dirname, "node_modules"),
             sourcePath,
             ...paths
           ]

data/package/rules/swc.js

@@ -1,11 +1,9 @@
-const { loaderMatches } = require('../utils/helpers')
-const { getSwcLoaderConfig } = require('../swc')
-const {
-  webpack_loader: webpackLoader
-} = require('../config')
-const jscommon = require('./jscommon')
+const { loaderMatches } = require("../utils/helpers")
+const { getSwcLoaderConfig } = require("../swc")
+const { webpack_loader: webpackLoader } = require("../config")
+const jscommon = require("./jscommon")
 
-module.exports = loaderMatches(webpackLoader, 'swc', () => ({
+module.exports = loaderMatches(webpackLoader, "swc", () => ({
   test: /\.(ts|tsx|js|jsx|mjs|coffee)?(\.erb)?$/,
   ...jscommon,
   use: ({ resource }) => getSwcLoaderConfig(resource)

data/package/swc/index.js

@@ -1,16 +1,16 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
-const { resolve } = require('path')
-const { existsSync } = require('fs')
-const { merge } = require('webpack-merge')
+const { resolve } = require("path")
+const { existsSync } = require("fs")
+const { merge } = require("webpack-merge")
 
 const isJsxFile = (filename) => !!filename.match(/\.(jsx|tsx)?(\.erb)?$/)
 
 const isTypescriptFile = (filename) => !!filename.match(/\.(ts|tsx)?(\.erb)?$/)
 
 const getCustomConfig = () => {
-  const path = resolve('config', 'swc.config.js')
+  const path = resolve("config", "swc.config.js")
   if (existsSync(path)) {
     return require(path)
   }
@@ -20,15 +20,15 @@ const getCustomConfig = () => {
 const getSwcLoaderConfig = (filenameToProcess) => {
   const customConfig = getCustomConfig()
   const defaultConfig = {
-    loader: require.resolve('swc-loader'),
+    loader: require.resolve("swc-loader"),
     options: {
       jsc: {
         parser: {
           dynamicImport: true,
           syntax: isTypescriptFile(filenameToProcess)
-            ? 'typescript'
-            : 'ecmascript',
-          [isTypescriptFile(filenameToProcess) ? 'tsx' : 'jsx']:
+            ? "typescript"
+            : "ecmascript",
+          [isTypescriptFile(filenameToProcess) ? "tsx" : "jsx"]:
             isJsxFile(filenameToProcess)
         },
         loose: true
@@ -36,8 +36,8 @@ const getSwcLoaderConfig = (filenameToProcess) => {
       sourceMaps: true,
       env: {
         coreJs: 3,
-        exclude: ['transform-typeof-symbol'],
-        mode: 'entry'
+        exclude: ["transform-typeof-symbol"],
+        mode: "entry"
       }
     }
   }

data/package/utils/configPath.js

@@ -1,19 +1,4 @@
-const fs = require('fs')
-const { resolve } = require('path')
-const { setShakapackerEnvVariablesForBackwardCompatibility } = require('./helpers')
+const { resolve } = require("path")
 
-setShakapackerEnvVariablesForBackwardCompatibility()
-
-// For backward compatibility
-const resolveToPhysicalFilePath = () => {
-  const shakapackerConfigPath = resolve('config', 'shakapacker.yml')
-  const webpackerConfigPath = resolve('config', 'webpacker.yml')
-
-  if (fs.existsSync(shakapackerConfigPath)) return shakapackerConfigPath
-  if (fs.existsSync(webpackerConfigPath)) return webpackerConfigPath
-
-  // If neither of files exist, try to resolve to shakapacker.yml to get more relevant error
-  return shakapackerConfigPath
-}
-
-module.exports = process.env.SHAKAPACKER_CONFIG || resolveToPhysicalFilePath()
+module.exports =
+  process.env.SHAKAPACKER_CONFIG || resolve("config", "shakapacker.yml")

data/package/utils/defaultConfigPath.js

@@ -1,2 +1,2 @@
-const path = require.resolve('../../lib/install/config/shakapacker.yml')
+const path = require.resolve("../../lib/install/config/shakapacker.yml")
 module.exports = path

data/package/utils/{get_style_rule.js → getStyleRule.js}

@@ -1,11 +1,11 @@
 /* eslint global-require: 0 */
-const { canProcess, moduleExists } = require('./helpers')
-const inliningCss = require('./inliningCss')
+const { canProcess, moduleExists } = require("./helpers")
+const inliningCss = require("./inliningCss")
 
 const getStyleRule = (test, preprocessors = []) => {
-  if (moduleExists('css-loader')) {
+  if (moduleExists("css-loader")) {
     const tryPostcss = () =>
-      canProcess('postcss-loader', (loaderPath) => ({
+      canProcess("postcss-loader", (loaderPath) => ({
         loader: loaderPath,
         options: { sourceMap: true }
       }))
@@ -13,9 +13,9 @@ const getStyleRule = (test, preprocessors = []) => {
     // style-loader is required when using css modules with HMR on the webpack-dev-server
 
     const use = [
-      inliningCss ? 'style-loader' : require('mini-css-extract-plugin').loader,
+      inliningCss ? "style-loader" : require("mini-css-extract-plugin").loader,
       {
-        loader: require.resolve('css-loader'),
+        loader: require.resolve("css-loader"),
         options: {
           sourceMap: true,
           importLoaders: 2,

data/package/utils/helpers.js

@@ -1,35 +1,12 @@
-const isArray = (value) => Array.isArray(value)
 const isBoolean = (str) => /^true/.test(str) || /^false/.test(str)
-const chdirTestApp = () => {
-  try {
-    return process.chdir('spec/shakapacker/test_app')
-  } catch (e) {
-    return null
-  }
-}
 
-// For backward compatibility
-const chdirWebpackerTestApp = () => {
-  try {
-    return process.chdir('spec/backward_compatibility_specs/webpacker_test_app')
-  } catch (e) {
-    return null
-  }
-}
-
-const chdirCwd = () => process.chdir(process.cwd())
-
-const resetEnv = () => {
-  process.env = {}
-}
-
-const ensureTrailingSlash = (path) => (path.endsWith('/') ? path : `${path}/`)
+const ensureTrailingSlash = (path) => (path.endsWith("/") ? path : `${path}/`)
 
 const resolvedPath = (packageName) => {
   try {
     return require.resolve(packageName)
   } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
+    if (e.code !== "MODULE_NOT_FOUND") {
       throw e
     }
     return null
@@ -64,28 +41,10 @@ const loaderMatches = (configLoader, loaderToCheck, fn) => {
   return fn()
 }
 
-// For backward compatibility
-// Set SHAKAPACKER_XYZ only if SHAKAPACKER_XYZ is not defined but WEBPACKER_XYZ is.
-const setShakapackerEnvVariablesForBackwardCompatibility = () => {
-  const webpackerEnvVariables = Object.entries(process.env).filter((key) => /^WEBPACKER_/.test(key))
-  webpackerEnvVariables.forEach(([webpackerEnvKey, webpackerEnvValue]) => {
-    const shakapackerKey = webpackerEnvKey.replace(/^WEBPACKER/, 'SHAKAPACKER')
-    if (!process.env[shakapackerKey]) {
-      process.env[shakapackerKey] = webpackerEnvValue
-    }
-  })
-}
-
 module.exports = {
-  chdirTestApp,
-  chdirWebpackerTestApp,
-  setShakapackerEnvVariablesForBackwardCompatibility,
-  chdirCwd,
-  isArray,
   isBoolean,
   ensureTrailingSlash,
   canProcess,
   moduleExists,
-  resetEnv,
   loaderMatches
 }

data/package/utils/inliningCss.js

@@ -1,7 +1,8 @@
-const { runningWebpackDevServer } = require('../env')
-const devServer = require('../dev_server')
+const { runningWebpackDevServer } = require("../env")
+const devServer = require("../dev_server")
 
 // This logic is tied to lib/shakapacker/instance.rb
-const inliningCss = runningWebpackDevServer && devServer.hmr && devServer.inline_css !== false
+const inliningCss =
+  runningWebpackDevServer && devServer.hmr && devServer.inline_css !== false
 
 module.exports = inliningCss

data/package/utils/snakeToCamelCase.js

@@ -0,0 +1,5 @@
+function snakeToCamelCase(s) {
+  return s.replace(/(_\w)/g, (match) => match[1].toUpperCase())
+}
+
+module.exports = snakeToCamelCase

data/package/webpackDevServerConfig.js

@@ -1,35 +1,38 @@
-const shakapackerDevServerYamlConfig = require('./dev_server')
-const snakeToCamelCase = require('./utils/snakeToCamelCase')
-const { outputPath: contentBase, publicPath } = require('./config')
+const shakapackerDevServerYamlConfig = require("./dev_server")
+const snakeToCamelCase = require("./utils/snakeToCamelCase")
+const { outputPath: contentBase, publicPath } = require("./config")
 
 const webpackDevServerMappedKeys = new Set([
   // client, server, liveReload, devMiddleware are handled separately
-  'allowedHosts',
-  'bonjour',
-  'compress',
-  'headers',
-  'historyApiFallback',
-  'host',
-  'hot',
-  'http2',
-  'https',
-  'ipc',
-  'magicHtml',
-  'onAfterSetupMiddleware',
-  'onBeforeSetupMiddleware',
-  'open',
-  'port',
-  'proxy',
-  'server',
-  'setupExitSignals',
-  'setupMiddlewares',
-  'watchFiles',
-  'webSocketServer'
+  "allowedHosts",
+  "bonjour",
+  "compress",
+  "headers",
+  "historyApiFallback",
+  "host",
+  "hot",
+  "http2",
+  "https",
+  "ipc",
+  "magicHtml",
+  "onAfterSetupMiddleware",
+  "onBeforeSetupMiddleware",
+  "open",
+  "port",
+  "proxy",
+  "server",
+  "setupExitSignals",
+  "setupMiddlewares",
+  "watchFiles",
+  "webSocketServer"
 ])
 
 function createDevServerConfig() {
   const devServerYamlConfig = { ...shakapackerDevServerYamlConfig }
-  const liveReload = devServerYamlConfig.live_reload !== undefined ? devServerYamlConfig.live_reload : !devServerYamlConfig.hmr
+  const liveReload =
+    devServerYamlConfig.live_reload !== undefined
+      ? devServerYamlConfig.live_reload
+      : !devServerYamlConfig.hmr
   delete devServerYamlConfig.live_reload
 
   const config = {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "7.2.3",
+  "version": "8.0.0-rc.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {
@@ -19,21 +19,10 @@
     "lib/install/config/shakapacker.yml"
   ],
   "scripts": {
-    "lint": "eslint package/",
+    "lint": "eslint .",
     "test": "jest"
   },
-  "jest": {
-    "roots": [
-      "<rootDir>/package"
-    ],
-    "testPathIgnorePatterns": [
-      "/__fixtures__/",
-      "/__utils__/"
-    ],
-    "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$"
-  },
   "dependencies": {
-    "glob": "^7.2.0",
     "js-yaml": "^4.1.0",
     "path-complete-extname": "^1.0.0"
   },
@@ -41,14 +30,18 @@
     "babel-loader": "^8.2.4",
     "compression-webpack-plugin": "^9.0.0",
     "esbuild-loader": "^2.18.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.0.0",
+    "eslint-config-airbnb": "^19.0.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.26.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3",
     "memory-fs": "^0.5.0",
+    "prettier": "^3.2.5",
     "swc-loader": "^0.1.15",
     "thenify": "^3.3.1",
     "webpack": "^5.72.0",
@@ -79,8 +72,9 @@
       "optional": true
     }
   },
+  "packageManager": "yarn@1.22.22",
   "engines": {
-    "node": "^12.13.0 || ^14 || >=16",
+    "node": ">= 14",
     "yarn": ">=1 <5"
   },
   "publishConfig": {

data/prettier.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  semi: false,
+  trailingComma: "none"
+}

data/shakapacker.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/shakacode/shakapacker/tree/v#{npm_version}",
   }
 
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "activesupport", ">= 5.2"
   s.add_dependency "package_json"

data/spec/dummy/app/javascript/packs/application.js

@@ -14,4 +14,4 @@
 // const images = require.context('../images', true)
 // const imagePath = (name) => images(name, true)
 
-console.log('Hello World from Webpacker')
+console.log('Hello World from Shakapacker')

data/spec/dummy/config/application.rb

@@ -19,6 +19,9 @@ require "rails/test_unit/railtie"
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+# Temp patch for dummy specs
+Webpacker = Shakapacker
+
 module TestReactOnRailsV12SsrV2
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.

data/spec/dummy/config/initializers/react_on_rails.rb

@@ -24,8 +24,8 @@ ReactOnRails.configure do |config|
   # to automatically refresh your webpack assets on every test run.
   #
   # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
-  # and set the config/webpacker.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/webpacker"
+  # and set the config/shakapacker.yml option for test to true.
+  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
 
   ################################################################################
   ################################################################################

data/spec/dummy/config/shakapacker.yml

@@ -1,11 +1,11 @@
-# Note: You must restart bin/webpacker-dev-server for changes to take effect
+# Note: You must restart bin/shakapacker-dev-server for changes to take effect
 
 default: &default
   source_path: app/javascript
   source_entry_path: packs
   public_root_path: public
   public_output_path: packs
-  cache_path: tmp/webpacker
+  cache_path: tmp/shakapacker
   webpack_compile_output: true
 
   # Additional paths webpack should lookup modules
@@ -17,12 +17,11 @@ default: &default
 
 development:
   <<: *default
-  # This is false since we're running `bin/webpacker -w` in Procfile.dev-setic
+  # This is false since we're running `bin/shakapacker -w` in Procfile.dev-setic
   compile: false
 
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server:
-    https: false
     host: localhost
     port: 3035
     # Hot Module Replacement updates modules while the application is running without a full reload

data/spec/dummy/config/webpack/commonWebpackConfig.js

@@ -1,6 +1,5 @@
 // Common configuration applying to client and server configuration
 
-// const { globalMutableWebpackConfig: baseClientWebpackConfig, merge } = require('shakapacker')
 const { generateWebpackConfig, merge } = require('shakapacker')
 const commonOptions = {
   resolve: {

data/spec/dummy/config/webpack/webpack.config.js

@@ -16,7 +16,7 @@ const webpackConfiguration = envSpecificConfig()
 
 // To debug the webpack configuration
 // 1. Uncomment debugger line below
-// 2. Run `bin/webpacker --debug-webpacker`
+// 2. Run `bin/shakapacker --debug-shakapacker`
 // 3. Examine the webpackConfiguration variable
 // 4. Consider adding a 'debugger` line to the beginning of this file.
 // debugger

data/spec/dummy/package.json

@@ -39,5 +39,6 @@
     "fork-ts-checker-webpack-plugin": "^6.5.2",
     "react-refresh": "^0.14.0",
     "webpack-dev-server": "^4.9.2"
-  }
+  },
+  "packageManager": "yarn@1.22.24"
 }

data/spec/dummy/yarn.lock

@@ -2571,7 +2571,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4060,9 +4060,8 @@ setprototypeof@1.2.0:
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 "shakapacker@file:.yalc/shakapacker":
-  version "7.0.0-rc.0"
+  version "7.2.3"
   dependencies:
-    glob "^7.2.0"
     js-yaml "^4.1.0"
     path-complete-extname "^1.0.0"
 

data/spec/generator_specs/e2e_template/template.rb

@@ -1,33 +1,20 @@
 require "shakapacker/utils/misc"
 
-if Shakapacker::Utils::Misc.use_package_json_gem
-  Shakapacker::Utils::Misc.require_package_json_gem
-
-  package_json = PackageJson.new
-
-  # install react
-  package_json.manager.add(["react", "react-dom", "@babel/preset-react"])
-
-  # update webpack presets for react
-  package_json.merge! do |pj|
-    babel = pj.fetch("babel", {})
-
-    babel["presets"] ||= []
-    babel["presets"].unshift("@babel/preset-react")
-
-    { "babel" => babel }
-  end
-else
-  # install react
-  system("yarn add react react-dom @babel/preset-react")
-
-  # update webpack presets for react
-  package_json_path = Rails.root.join("./package.json")
-  insert_into_file(
-    package_json_path,
-    %(      "@babel/preset-react",\n),
-    after: /"presets": \[\n/
-  )
+require "package_json"
+
+package_json = PackageJson.new
+
+# install react
+package_json.manager.add(["react", "react-dom", "@babel/preset-react"])
+
+# update webpack presets for react
+package_json.merge! do |pj|
+  babel = pj.fetch("babel", {})
+
+  babel["presets"] ||= []
+  babel["presets"].unshift("@babel/preset-react")
+
+  { "babel" => babel }
 end
 
 # install rspec-rails