Skip to content

Commit

Permalink
feat(webpack): upgrade config from breacking change
Browse files Browse the repository at this point in the history
* due to some package upgrade the webpack configuration was broken.
* upgrade the configuration to manage the fonts.
* upgrade dev server configurations for hot-reload.
  • Loading branch information
antoine-amara committed Mar 6, 2022
1 parent e13b8f7 commit 92e6eea
Show file tree
Hide file tree
Showing 9 changed files with 1,640 additions and 64 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.specs.js
*.test.js
5 changes: 4 additions & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"extends": "stylelint-config-standard",
"ignoreFiles": ["src/css/bootstrap-reboot.css"]
"ignoreFiles": ["src/css/bootstrap-reboot.css"],
"rules": {
"selector-class-pattern": null
}
}
194 changes: 194 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
/*
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/tmp/jest_rs",

// Automatically clear mock calls, instances and results before every test
// clearMocks: false,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
// coverageProvider: "babel",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "jsdom",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"lint": "yarn lint:js && yarn lint:css",
"lint:js": "eslint --fix ./src/js/*.js",
"lint:css": "stylelint --fix 'src/css/*.css'",
"test": "echo \"test NOT IMPLEMENTED\"",
"test": "jest --config=./jest.config.js src/",
"analyze-bundle": "yarn --silent build --profile --json > stats.json && webpack-bundle-analyzer stats.json ./dist/ -O -h 0.0.0.0 -p 9042"
},
"devDependencies": {
Expand All @@ -40,6 +40,7 @@
"html-webpack-inline-svg-plugin": "^2.1.1",
"html-webpack-plugin": "^5.5.0",
"http-server": "^14.1.0",
"jest": "^27.5.1",
"mini-css-extract-plugin": "^2.6.0",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"postcss": "^8.4.7",
Expand Down
10 changes: 5 additions & 5 deletions src/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import "./bootstrap-reboot.css";

@font-face {
font-family: 'True Lies';
src: url('../fonts/TrueLies.ttf') format('truetype');
font-family: "True Lies";
src: url("../fonts/TrueLies.ttf") format("truetype");
}

/* Variables */
Expand Down Expand Up @@ -49,7 +51,7 @@ ul li > span {
}

.truelie-font {
font-family: 'True Lies', sans-serif;
font-family: "True Lies", sans-serif;
}

header {
Expand Down Expand Up @@ -139,5 +141,3 @@ footer svg,
font-weight: 800;
color: var(--staticpack-blue);
}

@import './bootstrap-reboot.css';
3 changes: 3 additions & 0 deletions src/js/__tests__/fake.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
test('it should assert true', () => {
expect(true).toBe(true)
})
12 changes: 4 additions & 8 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ module.exports = {
'postcss-loader'
]
},
{
test: /\.(ttf|eot|woff|woff2)$/,
type: 'asset/resource'
},
{
test: /\.(png|jp(e*)g|svg)$/,
use: [{
Expand All @@ -44,14 +48,6 @@ module.exports = {
esModule: false
}
}]
},
{
test: /\.(ttf|eot|woff|woff2)$/,
use: [
{
loader: 'file-loader'
}
]
}
]
},
Expand Down
13 changes: 6 additions & 7 deletions webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// specific rules to build development bundle.

const { merge } = require('webpack-merge')
const path = require('path')
const common = require('./webpack.common')


Expand All @@ -13,12 +14,10 @@ module.exports = merge(common, {
host: '0.0.0.0',
port: 9000,
hot: true,
overlay: true,
contentBase: [
'./src/',
'./src/css/',
'./src/js/'
],
watchContentBase: true
watchFiles: [
path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'src/css'),
path.resolve(__dirname, 'src/js')
]
}
})
Loading

0 comments on commit 92e6eea

Please sign in to comment.