Skip to content

Commit

Permalink
Release v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Arce, Paul (NIH/NCI) [C] committed May 25, 2023
2 parents e95a055 + a982cb2 commit da25271
Show file tree
Hide file tree
Showing 37 changed files with 35,274 additions and 32,655 deletions.
3 changes: 0 additions & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
const plugins = [];
if (process.env.NODE_ENV === 'test') {
plugins.push(['istanbul']);
}

module.exports = {
presets: ['react-app'],
Expand Down
2 changes: 1 addition & 1 deletion config/jest/cssTransform.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

module.exports = {
process() {
return 'module.exports = {};';
return { code: 'module.exports = {};' };
},
getCacheKey() {
// The output is always the same.
Expand Down
3 changes: 1 addition & 2 deletions config/jest/fileTransform.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ module.exports = {
}),
};`;
}

return `module.exports = ${assetFilename};`;
return { code: `module.exports = ${assetFilename};` };
},
};
42 changes: 26 additions & 16 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ const safePostCssParser = require('postcss-safe-parser');
const ManifestPlugin = require('webpack-manifest-plugin');
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
const paths = require('./paths');
const modules = require('./modules');
const getClientEnvironment = require('./env');
const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
const typescriptFormatter = require('react-dev-utils/typescriptFormatter');

const postcssNormalize = require('postcss-normalize');

Expand Down Expand Up @@ -374,19 +372,35 @@ module.exports = function (webpackEnv) {
'babel-preset-react-app/webpack-overrides'
),

plugins: [
[
require.resolve('babel-plugin-named-asset-import'),
{
loaderMap: {
svg: {
ReactComponent:
'@svgr/webpack?-svgo,+titleProp,+ref![path]',
// If this is development, then additionally add in the istanbul plugin
plugins: isEnvProduction
? [
[
require.resolve('babel-plugin-named-asset-import'),
{
loaderMap: {
svg: {
ReactComponent:
'@svgr/webpack?-svgo,+ref![path]',
},
},
},
],
]
: [
[
require.resolve('babel-plugin-named-asset-import'),
{
loaderMap: {
svg: {
ReactComponent:
'@svgr/webpack?-svgo,+ref![path]',
},
},
},
},
],
require.resolve('babel-plugin-istanbul'),
],
],
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables caching results in ./node_modules/.cache/babel-loader/
// directory for faster rebuilds.
Expand Down Expand Up @@ -569,8 +583,6 @@ module.exports = function (webpackEnv) {
// to restart the development server for webpack to discover it. This plugin
// makes the discovery automatic so you don't have to restart.
// See https://github.com/facebook/create-react-app/issues/186
isEnvDevelopment &&
new WatchMissingNodeModulesPlugin(paths.appNodeModules),
isEnvProduction &&
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
Expand Down Expand Up @@ -650,8 +662,6 @@ module.exports = function (webpackEnv) {
'!**/src/setupTests.*',
],
silent: true,
// The formatter is invoked directly in WebpackDevServerUtils during development
formatter: isEnvProduction ? typescriptFormatter : undefined,
}),
].filter(Boolean),
// Some libraries import Node modules but don't use them in the browser.
Expand Down
108 changes: 28 additions & 80 deletions config/webpackDevServer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,115 +16,63 @@ const sockPort = process.env.WDS_SOCKET_PORT;

module.exports = function (proxy, allowedHost) {
return {
// WebpackDevServer 2.4.3 introduced a security fix that prevents remote
// websites from potentially accessing local content through DNS rebinding:
// https://github.com/webpack/webpack-dev-server/issues/887
// https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
// However, it made several existing use cases such as development in cloud
// environment or subdomains in development significantly more complicated:
// https://github.com/facebook/create-react-app/issues/2271
// https://github.com/facebook/create-react-app/issues/2233
// While we're investigating better solutions, for now we will take a
// compromise. Since our WDS configuration only serves files in the `public`
// folder we won't consider accessing them a vulnerability. However, if you
// use the `proxy` feature, it gets more dangerous because it can expose
// remote code execution vulnerabilities in backends like Django and Rails.
// So we will disable the host check normally, but enable it if you have
// specified the `proxy` setting. Finally, we let you override it if you
// really know what you're doing with a special environment variable.
disableHostCheck:
!proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
// This should be updated with a list of allowed hosts
allowedHosts: ['localhost', allowedHost],
// Enable gzip compression of generated files.
compress: true,
// Silence WebpackDevServer's own logs since they're generally not useful.
// It will still show compile warnings and errors with this setting.
clientLogLevel: 'none',
// By default WebpackDevServer serves physical files from current directory
// in addition to all the virtual build products that it serves from memory.
// This is confusing because those files won’t automatically be available in
// production build folder unless we copy them. However, copying the whole
// project directory is dangerous because we may expose sensitive files.
// Instead, we establish a convention that only files in `public` directory
// get served. Our build script will copy `public` into the `build` folder.
// In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
// In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
// Note that we only recommend to use `public` folder as an escape hatch
// for files like `favicon.ico`, `manifest.json`, and libraries that are
// for some reason broken when imported through webpack. If you just want to
// use an image, put it in `src` and `import` it from JavaScript instead.
contentBase: paths.appPublic,
contentBasePublicPath: paths.publicUrlOrPath,
// By default files from `contentBase` will not trigger a page reload.
watchContentBase: true,
// Enable hot reloading server. It will provide WDS_SOCKET_PATH endpoint
// for the WebpackDevServer client so it can learn when the files were
// updated. The WebpackDevServer client is included as an entry point
// in the webpack development configuration. Note that only changes
// to CSS are currently hot reloaded. JS changes will refresh the browser.
hot: true,
// Use 'ws' instead of 'sockjs-node' on server since we're using native
// websockets in `webpackHotDevClient`.
transportMode: 'ws',
// Prevent a WS client from getting injected as we're already including
// `webpackHotDevClient`.
injectClient: false,
// Enable custom sockjs pathname for websocket connection to hot reloading server.
// Enable custom sockjs hostname, pathname and port for websocket connection
// to hot reloading server.
sockHost,
sockPath,
sockPort,
// It is important to tell WebpackDevServer to use the same "publicPath" path as
// we specified in the webpack config. When homepage is '.', default to serving
// from the root.
// remove last slash so user can land on `/test` instead of `/test/`
publicPath: paths.publicUrlOrPath.slice(0, -1),
// WebpackDevServer is noisy by default so we emit custom message instead
// by listening to the compiler events with `compiler.hooks[...].tap` calls above.
quiet: true,
// Reportedly, this avoids CPU overload on some systems.
// https://github.com/facebook/create-react-app/issues/293
// src/node_modules is not ignored to support absolute imports
// https://github.com/facebook/create-react-app/issues/1065
watchOptions: {
ignored: ignoredFiles(paths.appSrc),
client: {
logging: 'none',
overlay: false,
webSocketURL: {
hostname: sockHost,
pathname: sockPath,
port: sockPort,
},
},
devMiddleware: {
publicPath: paths.publicUrlOrPath.slice(0, -1),
},
static: {
directory: paths.appPublic,
publicPath: paths.publicUrlOrPath.slice(0, -1),
watch: {
ignored: ignoredFiles(paths.appSrc),
},
},
https: getHttpsConfig(),
host,
overlay: false,
historyApiFallback: {
// Paths with dots should still use the history fallback.
// See https://github.com/facebook/create-react-app/issues/387.
disableDotRule: true,
index: paths.publicUrlOrPath,
},
public: allowedHost,
// `proxy` is run between `before` and `after` `webpack-dev-server` hooks
proxy,
before(app, server) {
webSocketServer: 'ws',
onBeforeSetupMiddleware(devServer) {
// Keep `evalSourceMapMiddleware` and `errorOverlayMiddleware`
// middlewares before `redirectServedPath` otherwise will not have any effect
// This lets us fetch source contents from webpack for the error overlay
app.use(evalSourceMapMiddleware(server));
devServer.app.use(evalSourceMapMiddleware(devServer));
// This lets us open files from the runtime error overlay.
app.use(errorOverlayMiddleware());
devServer.app.use(errorOverlayMiddleware());

if (fs.existsSync(paths.proxySetup)) {
// This registers user provided middleware for proxy reasons
require(paths.proxySetup)(app);
require(paths.proxySetup)(devServer.app);
}
},
after(app) {
onAfterSetupMiddleware(devServer) {
// Redirect to `PUBLIC_URL` or `homepage` from `package.json` if url not match
app.use(redirectServedPath(paths.publicUrlOrPath));
devServer.app.use(redirectServedPath(paths.publicUrlOrPath));

// This service worker file is effectively a 'no-op' that will reset any
// previous service worker registered for the same host:port combination.
// We do this in development to avoid hitting the production cache if
// it used the same host and port.
// https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
app.use(noopServiceWorkerMiddleware(paths.publicUrlOrPath));
devServer.app.use(noopServiceWorkerMiddleware(paths.publicUrlOrPath));
},
};
};
23 changes: 12 additions & 11 deletions cypress/e2e/common/MetaTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Then } from 'cypress-cucumber-preprocessor/steps';

Then('the page contains meta tags with the following names', (dataTable) => {
cy.document().then((doc) => {
cy.document().then(() => {
for (const { name, content } of dataTable.hashes()) {
const locator = `meta[name='${name}']`;
//find element, ensure it has attribute content
Expand All @@ -16,19 +16,20 @@ Then(
'the page contains meta tags with the following properties',
(dataTable) => {
for (const { property, content } of dataTable.hashes()) {
if(property==='robots'){
if (property === 'robots') {
const locator = `META[name='${property}']`;
//find element, ensure it has attribute content
//compare content's value with expected one
cy.get(locator).should('have.attr', 'content').and('be.eq', content);
}else {
const locator = `META[property='${property}']`;
//find element, ensure it has attribute content
//compare content's value with expected one
cy.get(locator).should('have.attr', 'content').and('be.eq', content);
//find element, ensure it has attribute content
//compare content's value with expected one
cy.get(locator).should('have.attr', 'content').and('be.eq', content);
} else {
const locator = `META[property='${property}']`;
//find element, ensure it has attribute content
//compare content's value with expected one
cy.get(locator).should('have.attr', 'content').and('be.eq', content);
}
}
}
});
);

Then('there is a canonical link with the href {string}', (href) => {
cy.get("link[rel='canonical']")
Expand Down
Loading

0 comments on commit da25271

Please sign in to comment.