Skip to content

Commit

Permalink
just do all browsers in prod env
Browse files Browse the repository at this point in the history
  • Loading branch information
snewcomer committed Nov 5, 2021
1 parent 1dd059a commit 4e3c7b7
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 24 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ jobs:
matrix:
scenario:
[
with-max-transpilation,
with-native-fetch,
with-ember-fetch-no-jquery,
with-ember-fetch-and-jquery,
Expand Down
7 changes: 0 additions & 7 deletions packages/-ember-data/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ module.exports = function () {
return {
useYarn: true,
scenarios: [
{
name: 'with-max-transpilation',
env: {
SHOULD_TRANSPILE: true,
},
npm: {},
},
{
name: 'with-ember-fetch-no-jquery',
env: {
Expand Down
3 changes: 1 addition & 2 deletions packages/-ember-data/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
module.exports = function (defaults) {
const isTest = process.env.EMBER_CLI_TEST_COMMAND;
const isProd = process.env.EMBER_ENV === 'production';
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const compatWith = process.env.EMBER_DATA_FULL_COMPAT ? '99.0' : null;

const terserSettings = {
exclude: ['assets/dummy.js', 'assets/tests.js', 'assets/test-support.js', 'dist/docs/*', 'docs/*'],
};

if (isTest && isProd && shouldTranspile) {
if (isTest && isProd) {
terserSettings.enabled = false;
}

Expand Down
4 changes: 2 additions & 2 deletions packages/-ember-data/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/adapter/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/debug/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/model/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/record-data/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/serializer/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/store/tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
const shouldTranspile = !!process.env.SHOULD_TRANSPILE;
const isProd = process.env.EMBER_ENV === 'production';

if (shouldTranspile) {
if (isProd) {
browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
}

Expand Down

0 comments on commit 4e3c7b7

Please sign in to comment.