Merge pull request #1246 from embroider-build/drop-unuspported-embers

Dropping support for older ember's

.github/actions/setup/action.yml

@@ -0,0 +1,26 @@
+name: Setup node and yarn
+description: Setup node and install dependencies using yarn
+inputs:
+  use_lockfile:
+    description: 'Whether to use the lockfile vs latest floating dependencies'
+    required: false
+    default: true
+runs:
+  using: 'composite'
+  steps:
+    - uses: volta-cli/action@v3
+      env:
+        ACTIONS_STEP_DEBUG: true
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+      shell: bash
+    - uses: actions/cache@v3
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v1
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+    - run: yarn install ${{ fromJSON('{"false":"--no-lockfile", "true":"--frozen-lockfile"}')[inputs.use_lockfile] }}
+      shell: bash

.github/workflows/ci.yml

@@ -26,25 +26,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: volta-cli/action@v3
-        env:
-          ACTIONS_STEP_DEBUG: true
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v1
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn --frozen-lockfile
+      - uses: ./.github/actions/setup
       - name: lint
         run: yarn lint
       - id: set-matrix
         working-directory: test-packages/support
-        run: echo "::set-output name=matrix::$(node ./suite-setup-util.js --matrix)"
+        run: echo "matrix=$(node ./suite-setup-util.js --matrix)" >> $GITHUB_OUTPUT
 
   test:
     needs: ['preflight']
@@ -58,20 +45,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: volta-cli/action@v3
-        env:
-          ACTIONS_STEP_DEBUG: true
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
+      - uses: ./.github/actions/setup
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v1
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn --no-lockfile
+          use_lockfile: false
       - name: suite
         run: ${{ matrix.command }}
         working-directory: ${{ matrix.dir }}

packages/addon-shim/.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

packages/compat/package.json

@@ -78,10 +78,10 @@
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
     "@types/strip-bom": "^4.0.1",
-    "broccoli-stew": "^3.0.0",
     "ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-engines": "^0.8.19",
+    "scenario-tester": "^2.0.1",
     "typescript": "*"
   },
   "peerDependencies": {

packages/compat/src/compat-app.ts

@@ -37,8 +37,6 @@ import { tmpdir } from '@embroider/shared-internals';
 import { Options as AdjustImportsOptions } from '@embroider/core/src/babel-plugin-adjust-imports';
 import { getEmberExports } from '@embroider/core/src/load-ember-template-compiler';
 
-import semver from 'semver';
-
 interface TreeNames {
   appJS: BroccoliNode;
   htmlTree: BroccoliNode;
@@ -360,11 +358,6 @@ class CompatAppAdapter implements AppAdapter<TreeNames> {
       activeAddons[addon.name] = addon.root;
     }
 
-    let emberSource = this.activeAddonChildren().find(a => a.name === 'ember-source')!;
-    let emberNeedsModulesPolyfill = semver.satisfies(emberSource.version, '<3.27.0-beta.0', {
-      includePrerelease: true,
-    });
-
     return {
       activeAddons,
       renameModules,
@@ -380,7 +373,6 @@ class CompatAppAdapter implements AppAdapter<TreeNames> {
       // up as a side-effect of babel transpilation, and babel is subject to
       // persistent caching.
       externalsDir: join(tmpdir, 'embroider', 'externals'),
-      emberNeedsModulesPolyfill,
       appRoot: this.root,
     };
   }

packages/compat/src/moved-package-cache.ts

@@ -3,9 +3,10 @@ import { ensureSymlinkSync, readdirSync, realpathSync, lstatSync } from 'fs-extr
 import { Memoize } from 'typescript-memoize';
 import { PackageCache, Package, getOrCreate } from '@embroider/core';
 import { MacrosConfig } from '@embroider/macros/src/node';
+import os from 'os';
 
 function assertNoTildeExpansion(source: string, target: string) {
-  if (target.includes('~')) {
+  if (target.includes('~') && os.platform() !== 'win32') {
     throw new Error(
       `The symbolic link: ${source}'s target: ${target} contained a bash expansion '~' which is not supported.`
     );

packages/compat/tests/audit.test.ts

@@ -1,4 +1,5 @@
-import { emberTemplateCompilerPath, Project } from '@embroider/test-support';
+import { emberTemplateCompilerPath } from '@embroider/test-support';
+import { Project } from 'scenario-tester';
 import { AppMeta, NodeTemplateCompilerParams, throwOnWarnings } from '@embroider/core';
 import merge from 'lodash/merge';
 import fromPairs from 'lodash/fromPairs';
@@ -15,7 +16,7 @@ describe('audit', function () {
   let app: Project;
 
   async function audit() {
-    app.writeSync();
+    await app.write();
     let audit = new Audit(app.baseDir);
     return await audit.run();
   }
@@ -48,7 +49,6 @@ describe('audit', function () {
           activeAddons: {},
           relocatedFiles: {},
           resolvableExtensions,
-          emberNeedsModulesPolyfill: true,
           appRoot: '.',
         },
       }),