Downstreamed changes from @embroider/addon-blueprint (#14)

* chore: Sorted the file paths in publicEntrypoints (patches #11)

* chore: Renamed addon-main.js to addon-main.cjs

* chore: Updated test fixtures

* bugfix: Updated other fields differently when the addon has TypeScript

* chore: Updated test fixtures

* chore: Combined rollup.config.js and rollup.config.mjs

* chore: Updated test fixtures

* chore: Updated moveToAddonAndTestApp to consider .cjs files and .stylelintignore

---------

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

src/blueprints/ember-addon/__addonLocation__/addon-main.js renamed to src/blueprints/ember-addon/__addonLocation__/addon-main.cjs

@@ -1,4 +1,4 @@
-import typescript from 'rollup-plugin-ts';
+<% if (options.packages.addon.hasTypeScript) { %>import typescript from 'rollup-plugin-ts';<% } else { %>import { babel } from '@rollup/plugin-babel';<% } %>
 import copy from 'rollup-plugin-copy';
 import { Addon } from '@embroider/addon-dev/rollup';
 
@@ -27,13 +27,22 @@ export default {
     // package names.
     addon.dependencies(),
 
-    // compile TypeScript to latest JavaScript, including Babel transpilation
+<% if (options.packages.addon.hasTypeScript) { %>    // compile TypeScript to latest JavaScript, including Babel transpilation
     typescript({
       transpiler: 'babel',
       browserslist: false,
       transpileOnly: false,
     }),
-
+<% } else { %>    // This babel config should *not* apply presets or compile away ES modules.
+    // It exists only to provide development niceties for you, like automatic
+    // template colocation.
+    //
+    // By default, this will load the actual babel config from the file
+    // babel.config.json.
+    babel({
+      babelHelpers: 'bundled',
+    }),
+<% } %>
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 

src/blueprints/ember-addon/__addonLocation__/rollup.config.js

@@ -47,7 +47,8 @@ function getPublicEntrypoints(options) {
     })
     .map((filePath) => {
       return filePath.replace(/ts$/, 'js');
-    });
+    })
+    .sort();
 }
 
 export function analyzeAddon(options) {

src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs

@@ -30,10 +30,7 @@ function getFilesToSkip(options) {
 
   const files = new Set();
 
-  if (packages.addon.hasTypeScript) {
-    files.add('__addonLocation__/rollup.config.js');
-  } else {
-    files.add('__addonLocation__/rollup.config.mjs');
+  if (!packages.addon.hasTypeScript) {
     files.add('__addonLocation__/unpublished-development-types/index.d.ts');
     files.add('__testAppLocation__/types/global.d.ts');
   }

src/migration/ember-addon/steps/analyze-addon.js

@@ -35,30 +35,27 @@ function copyToAddon(options) {
 function moveToAddonAndTestApp(options) {
   const { locations, packages, projectRoot } = options;
 
-  const files = packages.addon.hasTypeScript
-    ? [
-        '.eslintignore',
-        '.eslintrc.js',
-        '.gitignore',
-        '.prettierignore',
-        '.prettierrc.js',
-        '.stylelintrc.js',
-        '.template-lintrc.js',
-        'package.json',
-        'tsconfig.json',
-      ]
-    : [
-        '.eslintignore',
-        '.eslintrc.js',
-        '.gitignore',
-        '.prettierignore',
-        '.prettierrc.js',
-        '.stylelintrc.js',
-        '.template-lintrc.js',
-        'package.json',
-      ];
+  const files = new Set([
+    '.eslintignore',
+    '.eslintrc.cjs',
+    '.eslintrc.js',
+    '.gitignore',
+    '.prettierignore',
+    '.prettierrc.cjs',
+    '.prettierrc.js',
+    '.stylelintignore',
+    '.stylelintrc.cjs',
+    '.stylelintrc.js',
+    '.template-lintrc.cjs',
+    '.template-lintrc.js',
+    'package.json',
+  ]);
+
+  if (packages.addon.hasTypeScript) {
+    files.add('tsconfig.json');
+  }
 
-  const filePaths = glob.sync(globPattern(files), {
+  const filePaths = glob.sync(globPattern([...files]), {
     cwd: projectRoot,
   });
 

src/migration/ember-addon/steps/create-files-from-blueprint.js

@@ -76,21 +76,40 @@ function updateDevDependencies(packageJson, options) {
   packageJson['devDependencies'] = convertToObject(devDependencies);
 }
 
-function updateOtherFields(packageJson) {
+function updateOtherFields(packageJson, options) {
+  const { packages } = options;
+
   packageJson['ember-addon'] = {
     'app-js': {},
-    main: 'addon-main.js',
+    main: 'addon-main.cjs',
     type: 'addon',
     version: 2,
   };
 
-  packageJson['exports'] = {
-    '.': './dist/index.js',
-    './*': './dist/*.js',
-    './addon-main.js': './addon-main.js',
-  };
-
-  packageJson['files'] = ['addon-main.js', 'dist'];
+  packageJson['exports'] = packages.addon.hasTypeScript
+    ? {
+        '.': './dist/index.js',
+        './*': {
+          default: './dist/*.js',
+          types: './dist/*.d.ts',
+        },
+        './addon-main.js': './addon-main.cjs',
+      }
+    : {
+        '.': './dist/index.js',
+        './*': './dist/*.js',
+        './addon-main.js': './addon-main.cjs',
+      };
+
+  packageJson['files'] = ['addon-main.cjs', 'dist'];
+
+  if (packages.addon.hasTypeScript) {
+    packageJson['typesVersions'] = {
+      '*': {
+        '*': ['dist/*'],
+      },
+    };
+  }
 }
 
 function updateScripts(packageJson) {
@@ -117,7 +136,7 @@ export function updateAddonPackageJson(options) {
   updateDependencies(packageJson, options);
   updateDevDependencies(packageJson, options);
   updateScripts(packageJson);
-  updateOtherFields(packageJson);
+  updateOtherFields(packageJson, options);
 
   const newFile = JSON.stringify(packageJson, null, 2) + '\n';
 

src/migration/ember-addon/steps/move-project-root-files.js

@@ -80,17 +80,27 @@
   },
   "ember-addon": {
     "app-js": {},
-    "main": "addon-main.js",
+    "main": "addon-main.cjs",
     "type": "addon",
     "version": 2
   },
   "exports": {
     ".": "./dist/index.js",
-    "./*": "./dist/*.js",
-    "./addon-main.js": "./addon-main.js"
+    "./*": {
+      "default": "./dist/*.js",
+      "types": "./dist/*.d.ts"
+    },
+    "./addon-main.js": "./addon-main.cjs"
   },
   "files": [
-    "addon-main.js",
+    "addon-main.cjs",
     "dist"
-  ]
+  ],
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*"
+      ]
+    }
+  }
 }