configure embroider to be on by default

looks like successful build with all the static options disabled?
NullVoxPopuli · Apr 29, 2020 · ee2062c · ee2062c
1 parent 2d4ea82
commit ee2062c
Show file tree

Hide file tree

Showing 5 changed files with 157 additions and 175 deletions.
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
@@ -43,28 +43,6 @@ jobs:
         github-token: ${{ secrets.github_token }}
         path-to-lcov: ./packages/frontend/coverage/lcov.info
 
-##############################################################
-
-  # embroider_tests:
-  #   name: "E M B R O I D E R"
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 15
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: rwjblue/setup-volta@v1
-  #   - name: Install
-  #     working-directory: ${{ env.cwd }}
-  #     run: yarn install
-
-  #   - name: Test
-  #     working-directory: ${{ env.cwd }}
-  #     env:
-  #       CI_BROWSER: 'Chrome'
-  #       EMBROIDER: 'true'
-  #     run: ./scripts/test-with-coverage.sh
-  #     continue-on-error: true
-
 ##############################################################
 
   bundle_analysis:

diff --git a/packages/frontend/ember-cli-build.js b/packages/frontend/ember-cli-build.js
@@ -14,7 +14,11 @@ const { buildWorkerTrees } = require('./config/build/workers');
 const crypto = require('crypto');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
-const { EMBROIDER, CONCAT_STATS } = process.env;
+let { EMBROIDER, CONCAT_STATS } = process.env;
+
+if (EMBROIDER !== 'true') {
+  EMBROIDER = true;
+}
 
 module.exports = function (defaults) {
   let environment = EmberApp.env();
@@ -126,6 +130,32 @@ module.exports = function (defaults) {
       // staticComponents: true,
       // splitAtRoutes: true,
       // skipBabel: [],
+      packageRules: [
+        {
+          package: 'ember-intl',
+          semverRange: '^4.3.2',
+          addonModules: {
+            'services/intl.js': {
+              dependsOnModules: ['../adapters/default.js']
+            }
+          }
+        },
+        // {
+        //   package: 'ember-destroyable-polyfill',
+        //   semverRange: '^0.4.0',
+        //   addonModules: {
+        //     '-internal/patch-meta':{
+        //       dependsO
+        //     }
+        //   }
+        // }
+      ],
+      compatAdapters: new Map([
+        ['@ember-data/debug', null],
+        ['@ember-data/model', null],
+        ['@ember-data/store', null],
+        ['@ember-data/record-data', null],
+      ]),
     });
   }
 

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -66,9 +66,9 @@
     "@ember/optional-features": "^1.3.0",
     "@ember/render-modifiers": "^1.0.2",
     "@ember/test-helpers": "^1.7.1",
-    "@embroider/compat": "^0.14.0",
-    "@embroider/core": "^0.14.0",
-    "@embroider/webpack": "^0.14.0",
+    "@embroider/compat": "^0.15.0",
+    "@embroider/core": "^0.15.0",
+    "@embroider/webpack": "^0.15.0",
     "@fortawesome/ember-fontawesome": "^0.2.1",
     "@fortawesome/free-brands-svg-icons": "^5.13.0",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
@@ -117,7 +117,7 @@
     "ember-cli": "^3.17.0",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-babel": "7.19.0",
-    "ember-cli-clipboard": "github:NullVoxPopuli/ember-cli-clipboard#octaneify",
+    "ember-cli-clipboard": "github:jkusa/ember-cli-clipboard#master",
     "ember-cli-code-coverage": "github:kategengler/ember-cli-code-coverage",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-dependency-lint": "^1.1.3",

diff --git a/packages/frontend/tests/test-helper.js b/packages/frontend/tests/test-helper.js
@@ -2,8 +2,8 @@ import Application from '../app';
 import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
-import start from 'ember-exam/test-support/start';
-// import { start } from 'ember-qunit';
+// import start from 'ember-exam/test-support/start';
+import { start } from 'ember-qunit';
 import QUnit from 'qunit';
 
 // Install Types and assertion extensions