Skip to content

CUMULUS-3659: Change Configuration Files to ESM Syntax #1131

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

Draft
wants to merge 11 commits into
base: develop
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 0 additions & 95 deletions .eslintrc

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ This version of the dashboard requires Cumulus API >= v18.2.0
`@cumulus/[email protected]` to work with localstack v3.0.0
- **Snyk Security Fix**
- Upgraded axios from 1.6.0 to 1.6.8
- **CUMULUS-3662**
- Upgrade node dependencies that were CommonJS(CJS) to ECMAScript Modules(ESM)
- **CUMULUS-3659**
- Change configuration files to work with ECMAScript Modules(ESM)

## [v12.1.0] - 2023-10-27

Expand Down
4 changes: 1 addition & 3 deletions app/src/js/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function computeBool (value, defaultValue) {
return value && value.toLowerCase() === 'true';
}

const config = {
export default config = {
target: process.env.DAAC_NAME || 'local',
environment: process.env.STAGE || 'development',
nav: {
Expand All @@ -29,5 +29,3 @@ const config = {
enableRecovery: computeBool(process.env.ENABLE_RECOVERY, false),
servedByCumulusAPI: computeBool(process.env.SERVED_BY_CUMULUS_API, '')
};

module.exports = config;
6 changes: 3 additions & 3 deletions app/src/js/config/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const moment = require('moment');
import moment from 'moment';

const deploymentConfig = require('./config');
import deploymentConfig from './config.config.js';

/**
* These are base config values that you can override in your config.js file
Expand Down Expand Up @@ -37,4 +37,4 @@ const baseConfig = {
const config = Object.assign({}, baseConfig, deploymentConfig);
config.apiRoot = config.apiRoot.replace(/\/?$/, '/');

module.exports = config;
export default config;
4 changes: 1 addition & 3 deletions ava-conditional.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
const baseConfig = require('./ava.config.cjs');

module.exports = {
...baseConfig,
require: ['./ava.config.js'],
files: ['test/**/condition*', '!node_modules/', '!test/fixtures/**/*'],
environmentVariables: {
HIDE_PDR: 'false',
Expand Down
15 changes: 10 additions & 5 deletions ava.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,22 @@ module.exports = {
[
'babel-plugin-webpack-alias-7',
{
config: './config/webpack.config.test.js',
config: './config/webpack.config.test.mjs',
},
],
],
},
extensions: ['js', 'jsx', 'ts'],
extensions: ['js', 'jsx', 'ts', 'mjs', 'cjs'],
},
require: ['@babel/register', './test/_setup-browser-env.js', 'ignore-styles'],
timeout: '3m',
files: ['test/**/*', '!test/**/condition*', '!node_modules/', '!test/fixtures/**/*'],
files: [
'test/**/*',
'!test/**/condition*',
'!node_modules/',
'!test/fixtures/**/*',
],
environmentVariables: {
NODE_ENV: 'test'
}
NODE_ENV: 'test',
},
};
5 changes: 4 additions & 1 deletion babel.config.js → babel.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ module.exports = {
plugins: [
'@babel/plugin-syntax-jsx',
'@babel/plugin-transform-runtime',
['transform-commonjs', {
'synchronousImport': true
}],
...process.env.NODE_ENV === 'test' && !process.env.CYPRESS_TESTING ? ['babel-plugin-rewire'] : []
]
};
};
9 changes: 6 additions & 3 deletions config/babel.register.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/* eslint-disable node/no-deprecated-api */
/* eslint-disable lodash/prefer-noop */
require('@babel/register');
import babelRegister from '@babel/register';

require.extensions['.css'] = () => {};
require.extensions['.jpg'] = () => {};
babelRegister(
{
extensions: ['.css', '.jpg']
}
);
12 changes: 8 additions & 4 deletions config/webpack.config.test.js → config/webpack.config.test.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
import * as path from 'path';

module.exports = {
const testConfig = {
resolve: {
extensions: ['.js', '.jsx', '.scss'],
alias: {
Expand All @@ -19,15 +19,19 @@ module.exports = {
],
'@babel/preset-react',
],
plugins: ['@babel/plugin-syntax-jsx'],
plugins: [
'@babel/plugin-syntax-jsx'
],
env: {
test: {
plugins: [
[
'babel-plugin-webpack-alias-7',
{ config: './config/webpack.config.test.js', findConfig: true },
{ config: './config/webpack.config.test.mjs', findConfig: true },
],
],
},
},
};

export default testConfig;
46 changes: 20 additions & 26 deletions cypress/plugins/seedEverything.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
const { testUtils } = require('@cumulus/api');
const { promiseS3Upload } = require('@cumulus/aws-client/S3');
const fs = require('fs');
const path = require('path');
const CSV = require('csv-string');
const serveUtils = require('@cumulus/api/bin/serveUtils');
const { eraseDataStack } = require('@cumulus/api/bin/serve');
const {
import testUtils from '@cumulus/api';
import promiseS3Upload from '@cumulus/aws-client/S3';
import fs from 'fs';
import path from 'path';
import CSV from 'csv-string';
import serveUtils from '@cumulus/api/bin/serveUtils';
import eraseDataStack from '@cumulus/api/bin/serve';
import {
localUserName,
localStackName,
localSystemBucket,
} = require('@cumulus/api/bin/local-test-defaults');
} from '@cumulus/api/bin/local-test-defaults';

const collections = require('../fixtures/seeds/collectionsFixture.json');
const executions = require('../fixtures/seeds/executionsFixture.json');
const granules = require('../fixtures/seeds/granulesFixture.json');
const granulesExecutions = require('../fixtures/seeds/granulesExecutionsFixture.json');
const providers = require('../fixtures/seeds/providersFixture.json');
const rules = require('../fixtures/seeds/rulesFixture.json');
const pdrs = require('../fixtures/seeds/pdrsFixture.json');
const reconciliationReports = require('../fixtures/seeds/reconciliationReportFixture.json');
import collections from '../fixtures/seeds/collectionsFixture.json';
import executions from '../fixtures/seeds/executionsFixture.json';
import granules from '../fixtures/seeds/granulesFixture.json';
import granulesExecutions from '../fixtures/seeds/granulesExecutionsFixture.json';
import providers from '../fixtures/seeds/providersFixture.json';
import rules from '../fixtures/seeds/rulesFixture.json';
import pdrs from '../fixtures/seeds/pdrsFixture.json';
import reconciliationReports from '../fixtures/seeds/reconciliationReportFixture.json';
const reconciliationReportDir = path.resolve(__dirname, '../fixtures/seeds/reconciliation-reports');

function resetIt() {
export function resetIt() {
process.env.system_bucket = localSystemBucket;
process.env.stackName = localStackName;
process.env.ReconciliationReportsTable = `${localStackName}-ReconciliationReportsTable`;
Expand Down Expand Up @@ -61,7 +61,7 @@ function seedPdrs() {
return serveUtils.addPdrs(pdrs.results);
}

function uploadReconciliationReportFiles() {
export function uploadReconciliationReportFiles() {
const reconcileReportList = fs
.readdirSync(reconciliationReportDir)
.map((f) => {
Expand Down Expand Up @@ -97,7 +97,7 @@ function seedGranulesExecutions() {
return serveUtils.addGranules(updatedGranules);
}

function seedEverything() {
export function seedEverything() {
return Promise.all([
resetIt()
.then(seedProviders)
Expand All @@ -111,9 +111,3 @@ function seedEverything() {
uploadReconciliationReportFiles(),
]);
}

module.exports = {
resetIt,
seedEverything,
uploadReconciliationReportFiles,
};
Loading