From 225bc451c3f73cc5d12e8b6f07531118b085e114 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Sun, 10 Mar 2019 00:49:49 -0500 Subject: [PATCH 1/5] Use esm instead of experimental modules --- package.json | 11 +++++------ yarn.lock | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 8db84f4..b8a5c74 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "author": "Sergii Tkachenko ", "license": "MIT", "main": "./src/pagerbeauty", + "module": "./src/pagerbeauty", "engines": { "node": "^10.14.0", "npm": "^6.4.1", @@ -29,14 +30,15 @@ "build": "webpack --config webpack.dev.js", "build:watch": "webpack --watch --config webpack.dev.js", "build:prod": "NODE_ENV=production webpack --config webpack.prod.js --display-modules", - "app": "node --experimental-modules src/pagerbeauty.mjs", - "app:watch": "nodemon --experimental-modules src/pagerbeauty.mjs", - "app:prod": "NODE_ENV=production node --experimental-modules src/pagerbeauty.mjs", + "app": "node -r esm src/pagerbeauty.mjs", + "app:watch": "nodemon -r esm src/pagerbeauty.mjs", + "app:prod": "NODE_ENV=production node -r esm src/pagerbeauty.mjs", "heroku-postbuild": "NODE_ENV=production webpack --config webpack.prod.js" }, "dependencies": { "basic-auth": "^2.0.1", "dotenv": "^6.1.0", + "esm": "^3.2.14", "koa": "^2.7.0", "koa-mount": "^4.0.0", "koa-route": "^3.2.0", @@ -90,9 +92,6 @@ "webpack-cli": "^3.2.3", "webpack-merge": "^4.2.1" }, - "resolutions": { - "esm": "3.2.9" - }, "nodemonConfig": { "verbose": true, "watch": [ diff --git a/yarn.lock b/yarn.lock index b755f7e..256d35f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1991,9 +1991,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939: - version "1.0.30000942" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000942.tgz#454139b28274bce70bfe1d50c30970df7430c6e4" - integrity sha512-wLf+IhZUy2rfz48tc40OH7jHjXjnvDFEYqBHluINs/6MgzoNLPf25zhE4NOVzqxLKndf+hau81sAW0RcGHIaBQ== + version "1.0.30000943" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000943.tgz#00b25bd5808edc2ed1cfb53533a6a6ff6ca014ee" + integrity sha512-nJMjU4UaesbOHTcmz6VS+qaog++Fdepg4KAya5DL/AZrL/aaAZDGOOQ0AECtsJa09r4cJBdHZMive5mw8lnQ5A== capture-stack-trace@^1.0.0: version "1.0.1" @@ -2952,7 +2952,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debuglog@^1.0.1: +debuglog@*, debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -3623,10 +3623,10 @@ eslint@^5.15.1: table "^5.2.3" text-table "^0.2.0" -esm@3.2.9, esm@^3.0.82, esm@^3.2.10: - version "3.2.9" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.9.tgz#9dca653e3b39f89c3c65c5e84cebfa4af345c10d" - integrity sha512-mATFs9dpCjnEyNv27z29UNDmJmBBX8zMdcFip7aIOrBRTpLs8SA+6Ek1QtsWfvecAJVeZy+X5D3Z6xZVtUvYdg== +esm@^3.0.82, esm@^3.2.10, esm@^3.2.14: + version "3.2.14" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.14.tgz#567f65e9433bb0873eb92ed5e92e876c3ec2a212" + integrity sha512-uQq8DK0HB0n2Ze9gshhxGQa60caKmwNH7tKxALAT6wxYGfQCdEMXA3MV3z1rh8TSmQIVFYbltm9Xe1ghusnCqw== espower-location-detector@^1.0.0: version "1.0.0" @@ -4703,7 +4703,7 @@ import-modules@^1.1.0: resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-1.1.0.tgz#748db79c5cc42bb9701efab424f894e72600e9dc" integrity sha1-dI23nFzEK7lwHvq0JPiU5yYA6dw= -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -5722,6 +5722,11 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= + lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -5730,11 +5735,33 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" +lodash._bindcallback@*: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" + integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= + +lodash._cacheindexof@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" + integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= + +lodash._createcache@*: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" + integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= + dependencies: + lodash._getnative "^3.0.0" + lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= +lodash._getnative@*, lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -5825,6 +5852,11 @@ lodash.mergewith@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== +lodash.restparam@*: + version "3.6.1" + resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" + integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= + lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" @@ -8351,7 +8383,7 @@ readable-stream@~1.1.10, readable-stream@~1.1.11, readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" -readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c= From 4efc725ac6273b6dacc9c63e064b3066c8082064 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Sun, 10 Mar 2019 01:00:19 -0500 Subject: [PATCH 2/5] .mjs -> .js --- .nycrc.json | 1 - README.md | 2 +- ava.config.js | 2 -- package.json | 12 ++++++------ src/app/{PagerBeautyApp.mjs => PagerBeautyApp.js} | 0 src/app/{PagerBeautyWeb.mjs => PagerBeautyWeb.js} | 0 .../{PagerBeautyWorker.mjs => PagerBeautyWorker.js} | 0 src/app/{Timer.mjs => Timer.js} | 0 src/assets/javascripts/views/OnCallViews.jsx | 4 ++-- ...chedulesController.mjs => SchedulesController.js} | 0 src/{errors.mjs => errors.js} | 0 src/{init.mjs => init.js} | 0 .../{authentication.mjs => authentication.js} | 0 src/middleware/{redirect.mjs => redirect.js} | 0 src/models/{Incident.mjs => Incident.js} | 0 src/models/{OnCall.mjs => OnCall.js} | 6 +----- src/models/{Schedule.mjs => Schedule.js} | 0 src/{pagerbeauty.mjs => pagerbeauty.js} | 0 .../{IncidentsService.mjs => IncidentsService.js} | 0 .../{OnCallsService.mjs => OnCallsService.js} | 0 .../{PagerDutyClient.mjs => PagerDutyClient.js} | 0 .../{SchedulesService.mjs => SchedulesService.js} | 0 ...{IncidentsTimerTask.mjs => IncidentsTimerTask.js} | 0 .../{OnCallsTimerTask.mjs => OnCallsTimerTask.js} | 0 ...{SchedulesTimerTask.mjs => SchedulesTimerTask.js} | 0 ...th-access-token.mjs => http-auth-access-token.js} | 0 ...-authorized.mjs => http-auth-basic-authorized.js} | 0 ...uthorized.mjs => http-auth-basic-unauthorized.js} | 0 ...ncident.mjs => oncall-P2RFGIP-active-incident.js} | 0 ...H-happy-path.mjs => oncall-P538IZH-happy-path.js} | 0 ...no-end-date.mjs => oncall-PJ1P5JQ-no-end-date.js} | 0 test/acceptance/{oncall-misc.mjs => oncall-misc.js} | 0 .../{oncall-not-found.mjs => oncall-not-found.js} | 0 test/acceptance/{redirects.mjs => redirects.js} | 0 .../{schedules-list.mjs => schedules-list.js} | 0 .../{AcceptanceHelpers.mjs => AcceptanceHelpers.js} | 0 test/helpers/{index.mjs => index.js} | 0 test/integration/{index.test.mjs => index.test.js} | 0 test/unit/{index.test.mjs => index.test.js} | 0 webpack.common.js | 2 +- 40 files changed, 11 insertions(+), 18 deletions(-) rename src/app/{PagerBeautyApp.mjs => PagerBeautyApp.js} (100%) rename src/app/{PagerBeautyWeb.mjs => PagerBeautyWeb.js} (100%) rename src/app/{PagerBeautyWorker.mjs => PagerBeautyWorker.js} (100%) rename src/app/{Timer.mjs => Timer.js} (100%) rename src/controllers/{SchedulesController.mjs => SchedulesController.js} (100%) rename src/{errors.mjs => errors.js} (100%) rename src/{init.mjs => init.js} (100%) rename src/middleware/{authentication.mjs => authentication.js} (100%) rename src/middleware/{redirect.mjs => redirect.js} (100%) rename src/models/{Incident.mjs => Incident.js} (100%) rename src/models/{OnCall.mjs => OnCall.js} (94%) rename src/models/{Schedule.mjs => Schedule.js} (100%) rename src/{pagerbeauty.mjs => pagerbeauty.js} (100%) rename src/services/{IncidentsService.mjs => IncidentsService.js} (100%) rename src/services/{OnCallsService.mjs => OnCallsService.js} (100%) rename src/services/{PagerDutyClient.mjs => PagerDutyClient.js} (100%) rename src/services/{SchedulesService.mjs => SchedulesService.js} (100%) rename src/tasks/{IncidentsTimerTask.mjs => IncidentsTimerTask.js} (100%) rename src/tasks/{OnCallsTimerTask.mjs => OnCallsTimerTask.js} (100%) rename src/tasks/{SchedulesTimerTask.mjs => SchedulesTimerTask.js} (100%) rename test/acceptance/{http-auth-access-token.mjs => http-auth-access-token.js} (100%) rename test/acceptance/{http-auth-basic-authorized.mjs => http-auth-basic-authorized.js} (100%) rename test/acceptance/{http-auth-basic-unauthorized.mjs => http-auth-basic-unauthorized.js} (100%) rename test/acceptance/{oncall-P2RFGIP-active-incident.mjs => oncall-P2RFGIP-active-incident.js} (100%) rename test/acceptance/{oncall-P538IZH-happy-path.mjs => oncall-P538IZH-happy-path.js} (100%) rename test/acceptance/{oncall-PJ1P5JQ-no-end-date.mjs => oncall-PJ1P5JQ-no-end-date.js} (100%) rename test/acceptance/{oncall-misc.mjs => oncall-misc.js} (100%) rename test/acceptance/{oncall-not-found.mjs => oncall-not-found.js} (100%) rename test/acceptance/{redirects.mjs => redirects.js} (100%) rename test/acceptance/{schedules-list.mjs => schedules-list.js} (100%) rename test/helpers/{AcceptanceHelpers.mjs => AcceptanceHelpers.js} (100%) rename test/helpers/{index.mjs => index.js} (100%) rename test/integration/{index.test.mjs => index.test.js} (100%) rename test/unit/{index.test.mjs => index.test.js} (100%) diff --git a/.nycrc.json b/.nycrc.json index 00e1fd5..c8143f5 100644 --- a/.nycrc.json +++ b/.nycrc.json @@ -9,6 +9,5 @@ ], "extension": [ ".jsx", - ".mjs" ] } diff --git a/README.md b/README.md index ac1dd6f..aeb1b3c 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ NPM repo: [`pagerbeauty`](https://www.npmjs.com/package/pagerbeauty) Setup PagerBeauty by following [configuration](#configuration) section and run: ```sh yarn add pagerbeauty -node --experimental-modules node_modules/pagerbeauty/src/pagerbeauty.mjs +node -r esm node_modules/pagerbeauty/src/pagerbeauty.js ``` ## Configuration diff --git a/ava.config.js b/ava.config.js index 1e5e366..cda4050 100644 --- a/ava.config.js +++ b/ava.config.js @@ -2,7 +2,6 @@ const avaConfig = { files: [ 'test/**/*.js', - 'test/**/*.mjs', '!test/helpers', '!test/mocks', '!test/grafana', @@ -12,7 +11,6 @@ const avaConfig = { compileEnhancements: false, extensions: [ 'js', - 'mjs', ], // https://github.com/avajs/ava/blob/master/docs/03-assertions.md#custom-assertions // Chai is used for assertions. diff --git a/package.json b/package.json index b8a5c74..bc1d07b 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,15 @@ "coverage:report:text": "nyc report --reporter=text", "coverage:report:html": "nyc report --reporter=html", "coverage:report:codecov": "nyc report --reporter=lcovonly && codecov", - "lint": "eslint --ext .js --ext .mjs --ext .jsx -f unix .", - "eslint": "eslint --ext .js --ext .mjs --ext .jsx", + "lint": "eslint --ext .js --ext .jsx -f unix .", + "eslint": "eslint --ext .js --ext .jsx", "mock:pagerduty_api": "mockserver -m test/mocks", "build": "webpack --config webpack.dev.js", "build:watch": "webpack --watch --config webpack.dev.js", "build:prod": "NODE_ENV=production webpack --config webpack.prod.js --display-modules", - "app": "node -r esm src/pagerbeauty.mjs", - "app:watch": "nodemon -r esm src/pagerbeauty.mjs", - "app:prod": "NODE_ENV=production node -r esm src/pagerbeauty.mjs", + "app": "node -r esm src/pagerbeauty.js", + "app:watch": "nodemon -r esm src/pagerbeauty.js", + "app:prod": "NODE_ENV=production node -r esm src/pagerbeauty.js", "heroku-postbuild": "NODE_ENV=production webpack --config webpack.prod.js" }, "dependencies": { @@ -97,7 +97,7 @@ "watch": [ "src" ], - "ext": "js,mjs,html.j2" + "ext": "js,html.j2" }, "babel": { "presets": [ diff --git a/src/app/PagerBeautyApp.mjs b/src/app/PagerBeautyApp.js similarity index 100% rename from src/app/PagerBeautyApp.mjs rename to src/app/PagerBeautyApp.js diff --git a/src/app/PagerBeautyWeb.mjs b/src/app/PagerBeautyWeb.js similarity index 100% rename from src/app/PagerBeautyWeb.mjs rename to src/app/PagerBeautyWeb.js diff --git a/src/app/PagerBeautyWorker.mjs b/src/app/PagerBeautyWorker.js similarity index 100% rename from src/app/PagerBeautyWorker.mjs rename to src/app/PagerBeautyWorker.js diff --git a/src/app/Timer.mjs b/src/app/Timer.js similarity index 100% rename from src/app/Timer.mjs rename to src/app/Timer.js diff --git a/src/assets/javascripts/views/OnCallViews.jsx b/src/assets/javascripts/views/OnCallViews.jsx index 3a5cc6f..c97d1f3 100644 --- a/src/assets/javascripts/views/OnCallViews.jsx +++ b/src/assets/javascripts/views/OnCallViews.jsx @@ -6,8 +6,8 @@ import React from 'react'; // ------- Internal imports ---------------------------------------------------- -import { OnCall } from '../../../models/OnCall.mjs'; -import { Incident } from '../../../models/Incident.mjs'; +import { OnCall } from '../../../models/OnCall'; +import { Incident } from '../../../models/Incident'; import { PagerBeautyFetchNotFoundUiError } from '../ui-errors'; import { StatusIndicatorView } from './StatusIndicatorView'; diff --git a/src/controllers/SchedulesController.mjs b/src/controllers/SchedulesController.js similarity index 100% rename from src/controllers/SchedulesController.mjs rename to src/controllers/SchedulesController.js diff --git a/src/errors.mjs b/src/errors.js similarity index 100% rename from src/errors.mjs rename to src/errors.js diff --git a/src/init.mjs b/src/init.js similarity index 100% rename from src/init.mjs rename to src/init.js diff --git a/src/middleware/authentication.mjs b/src/middleware/authentication.js similarity index 100% rename from src/middleware/authentication.mjs rename to src/middleware/authentication.js diff --git a/src/middleware/redirect.mjs b/src/middleware/redirect.js similarity index 100% rename from src/middleware/redirect.mjs rename to src/middleware/redirect.js diff --git a/src/models/Incident.mjs b/src/models/Incident.js similarity index 100% rename from src/models/Incident.mjs rename to src/models/Incident.js diff --git a/src/models/OnCall.mjs b/src/models/OnCall.js similarity index 94% rename from src/models/OnCall.mjs rename to src/models/OnCall.js index 56a9df5..3b436ba 100644 --- a/src/models/OnCall.mjs +++ b/src/models/OnCall.js @@ -2,17 +2,13 @@ // This model to be compatible both with backend and frontend. -import luxon from 'luxon'; +import { DateTime } from 'luxon'; // ------- Internal imports ---------------------------------------------------- import { Incident } from './Incident'; import { Schedule } from './Schedule'; -// ------- Init -------------------------------------------------------------- - -const { DateTime } = luxon; - // ------- OnCall -------------------------------------------------------------- export class OnCall { diff --git a/src/models/Schedule.mjs b/src/models/Schedule.js similarity index 100% rename from src/models/Schedule.mjs rename to src/models/Schedule.js diff --git a/src/pagerbeauty.mjs b/src/pagerbeauty.js similarity index 100% rename from src/pagerbeauty.mjs rename to src/pagerbeauty.js diff --git a/src/services/IncidentsService.mjs b/src/services/IncidentsService.js similarity index 100% rename from src/services/IncidentsService.mjs rename to src/services/IncidentsService.js diff --git a/src/services/OnCallsService.mjs b/src/services/OnCallsService.js similarity index 100% rename from src/services/OnCallsService.mjs rename to src/services/OnCallsService.js diff --git a/src/services/PagerDutyClient.mjs b/src/services/PagerDutyClient.js similarity index 100% rename from src/services/PagerDutyClient.mjs rename to src/services/PagerDutyClient.js diff --git a/src/services/SchedulesService.mjs b/src/services/SchedulesService.js similarity index 100% rename from src/services/SchedulesService.mjs rename to src/services/SchedulesService.js diff --git a/src/tasks/IncidentsTimerTask.mjs b/src/tasks/IncidentsTimerTask.js similarity index 100% rename from src/tasks/IncidentsTimerTask.mjs rename to src/tasks/IncidentsTimerTask.js diff --git a/src/tasks/OnCallsTimerTask.mjs b/src/tasks/OnCallsTimerTask.js similarity index 100% rename from src/tasks/OnCallsTimerTask.mjs rename to src/tasks/OnCallsTimerTask.js diff --git a/src/tasks/SchedulesTimerTask.mjs b/src/tasks/SchedulesTimerTask.js similarity index 100% rename from src/tasks/SchedulesTimerTask.mjs rename to src/tasks/SchedulesTimerTask.js diff --git a/test/acceptance/http-auth-access-token.mjs b/test/acceptance/http-auth-access-token.js similarity index 100% rename from test/acceptance/http-auth-access-token.mjs rename to test/acceptance/http-auth-access-token.js diff --git a/test/acceptance/http-auth-basic-authorized.mjs b/test/acceptance/http-auth-basic-authorized.js similarity index 100% rename from test/acceptance/http-auth-basic-authorized.mjs rename to test/acceptance/http-auth-basic-authorized.js diff --git a/test/acceptance/http-auth-basic-unauthorized.mjs b/test/acceptance/http-auth-basic-unauthorized.js similarity index 100% rename from test/acceptance/http-auth-basic-unauthorized.mjs rename to test/acceptance/http-auth-basic-unauthorized.js diff --git a/test/acceptance/oncall-P2RFGIP-active-incident.mjs b/test/acceptance/oncall-P2RFGIP-active-incident.js similarity index 100% rename from test/acceptance/oncall-P2RFGIP-active-incident.mjs rename to test/acceptance/oncall-P2RFGIP-active-incident.js diff --git a/test/acceptance/oncall-P538IZH-happy-path.mjs b/test/acceptance/oncall-P538IZH-happy-path.js similarity index 100% rename from test/acceptance/oncall-P538IZH-happy-path.mjs rename to test/acceptance/oncall-P538IZH-happy-path.js diff --git a/test/acceptance/oncall-PJ1P5JQ-no-end-date.mjs b/test/acceptance/oncall-PJ1P5JQ-no-end-date.js similarity index 100% rename from test/acceptance/oncall-PJ1P5JQ-no-end-date.mjs rename to test/acceptance/oncall-PJ1P5JQ-no-end-date.js diff --git a/test/acceptance/oncall-misc.mjs b/test/acceptance/oncall-misc.js similarity index 100% rename from test/acceptance/oncall-misc.mjs rename to test/acceptance/oncall-misc.js diff --git a/test/acceptance/oncall-not-found.mjs b/test/acceptance/oncall-not-found.js similarity index 100% rename from test/acceptance/oncall-not-found.mjs rename to test/acceptance/oncall-not-found.js diff --git a/test/acceptance/redirects.mjs b/test/acceptance/redirects.js similarity index 100% rename from test/acceptance/redirects.mjs rename to test/acceptance/redirects.js diff --git a/test/acceptance/schedules-list.mjs b/test/acceptance/schedules-list.js similarity index 100% rename from test/acceptance/schedules-list.mjs rename to test/acceptance/schedules-list.js diff --git a/test/helpers/AcceptanceHelpers.mjs b/test/helpers/AcceptanceHelpers.js similarity index 100% rename from test/helpers/AcceptanceHelpers.mjs rename to test/helpers/AcceptanceHelpers.js diff --git a/test/helpers/index.mjs b/test/helpers/index.js similarity index 100% rename from test/helpers/index.mjs rename to test/helpers/index.js diff --git a/test/integration/index.test.mjs b/test/integration/index.test.js similarity index 100% rename from test/integration/index.test.mjs rename to test/integration/index.test.js diff --git a/test/unit/index.test.mjs b/test/unit/index.test.js similarity index 100% rename from test/unit/index.test.mjs rename to test/unit/index.test.js diff --git a/webpack.common.js b/webpack.common.js index 491ac76..a9a9985 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -43,6 +43,6 @@ module.exports = { ], }, resolve: { - extensions: ['.js', '.jsx', '.mjs'], + extensions: ['.js', '.jsx'], }, }; From c4f4b62015c9294b059b3b479b5fad7cd0fb8408 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Sun, 10 Mar 2019 01:33:59 -0500 Subject: [PATCH 3/5] Fix .nycrc.json --- .nycrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nycrc.json b/.nycrc.json index c8143f5..69c15d9 100644 --- a/.nycrc.json +++ b/.nycrc.json @@ -8,6 +8,6 @@ "ava.config.js" ], "extension": [ - ".jsx", + ".jsx" ] } From e98192bf727d77bcc714e8c44f49fae638c54e28 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Sun, 10 Mar 2019 01:47:08 -0500 Subject: [PATCH 4/5] Rename missed test files .mjs -> .js --- test/unit/app/{PagerBeautyWeb.mjs => PagerBeautyWeb.js} | 0 test/unit/models/{OnCall.test.mjs => OnCall.test.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/unit/app/{PagerBeautyWeb.mjs => PagerBeautyWeb.js} (100%) rename test/unit/models/{OnCall.test.mjs => OnCall.test.js} (100%) diff --git a/test/unit/app/PagerBeautyWeb.mjs b/test/unit/app/PagerBeautyWeb.js similarity index 100% rename from test/unit/app/PagerBeautyWeb.mjs rename to test/unit/app/PagerBeautyWeb.js diff --git a/test/unit/models/OnCall.test.mjs b/test/unit/models/OnCall.test.js similarity index 100% rename from test/unit/models/OnCall.test.mjs rename to test/unit/models/OnCall.test.js From 094efdc7127ab8c674d56eeac3e2e92920c26a3d Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Sun, 10 Mar 2019 01:55:52 -0500 Subject: [PATCH 5/5] Compose: add src and test mounts to yarn --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index e9e1970..5891b31 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -133,6 +133,8 @@ services: entrypoint: ['yarn'] command: ['help'] volumes: + - ./src/:/usr/src/app/src/:ro + - ./test/:/usr/src/app/test/:ro - ./package.json:/usr/src/app/package.json:rw - ./yarn.lock:/usr/src/app/yarn.lock:rw - node-modules-shared:/usr/src/app/node_modules