chore: Updated test fixtures

ijlee2 · Jul 6, 2023 · 4be74fa · 4be74fa
1 parent b2a3689
commit 4be74fa
Show file tree

Hide file tree

Showing 97 changed files with 753 additions and 718 deletions.
diff --git a/tests/fixtures/ember-container-query-customizations/output/.gitignore b/tests/fixtures/ember-container-query-customizations/output/.gitignore
@@ -1,24 +1,11 @@
 # compiled output
-/dist/
+dist/
 
 # dependencies
-/node_modules/
+node_modules/
 
 # misc
 /.env*
-/.pnp*
-/.eslintcache
-/coverage/
+/.pnpm-debug.log
 /npm-debug.log*
-/testem.log
 /yarn-error.log
-
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/
diff --git a/.../ember-container-query-customizations/output/packages/ember-container-query/.eslintignore b/.../ember-container-query-customizations/output/packages/ember-container-query/.eslintignore
@@ -2,6 +2,7 @@
 /blueprints/*/files/
 
 # compiled output
+/declarations/
 /dist/
 
 # misc

diff --git a/...res/ember-container-query-customizations/output/packages/ember-container-query/.gitignore b/...res/ember-container-query-customizations/output/packages/ember-container-query/.gitignore
@@ -1,34 +1,12 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# The authoritative copies of these live in the monorepo root (because they're
+# more useful on github that way), but the build copies them into here so they
+# will also appear in published NPM packages.
+/LICENSE.md
+/README.md
 
 # compiled output
+/declarations/
 /dist/
-/tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
-
-# misc
-/.env*
-/.pnp*
-/.DS_Store
-/.sass-cache
-/.eslintcache
-/.stylelintcache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
-
-# 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
-
-# broccoli-debug
-/DEBUG/
diff --git a/...s/ember-container-query-customizations/output/packages/ember-container-query/package.json b/...s/ember-container-query-customizations/output/packages/ember-container-query/package.json
@@ -24,8 +24,10 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "rollup --config",
+    "build": "concurrently \"npm:build:*\" --names \"build:\"",
+    "build:js": "rollup --config",
     "build:test": "ember build --environment=test",
+    "build:types": "glint --declaration",
     "changelog": "lerna-changelog",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
     "lint:css": "stylelint \"tests/dummy/app/**/*.css\" --cache",
@@ -39,7 +41,9 @@
     "lint:types": "glint",
     "postpack": "ember ts:clean",
     "prepack": "rollup --config",
-    "start": "rollup --config --watch",
+    "start": "concurrently \"npm:start:*\" --names \"start:\"",
+    "start:js": "rollup --config --watch --no-watch.clearScreen",
+    "start:types": "glint --declaration --watch",
     "test": "echo 'A v2 addon does not have tests, run tests in test-app'",
     "test:ember": "ember test",
     "test:ember-compatibility": "./node_modules/.bin/ember try:one"
@@ -69,9 +73,11 @@
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.2.0"
+    "rollup-plugin-copy": "^3.4.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
@@ -86,21 +92,25 @@
     "version": 2
   },
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "types": "./declarations/index.d.ts",
+      "default": "./dist/index.js"
+    },
     "./*": {
-      "types": "./dist/*.d.ts",
+      "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
     "./addon-main.js": "./addon-main.cjs"
   },
   "files": [
     "addon-main.cjs",
+    "declarations",
     "dist"
   ],
   "typesVersions": {
     "*": {
       "*": [
-        "dist/*"
+        "declarations/*"
       ]
     }
   }

diff --git a/...er-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs b/...er-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs
@@ -1,12 +1,16 @@
-import typescript from 'rollup-plugin-ts';
-import copy from 'rollup-plugin-copy';
 import { Addon } from '@embroider/addon-dev/rollup';
+import { babel } from '@rollup/plugin-babel';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
   srcDir: 'src',
   destDir: 'dist',
 });
 
+// Add extensions here, such as ts, gjs, etc that you may import
+const extensions = ['.js', '.ts'];
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -27,11 +31,20 @@ export default {
     // package names.
     addon.dependencies(),
 
-    // compile TypeScript to latest JavaScript, including Babel transpilation
-    typescript({
-      transpiler: 'babel',
-      browserslist: false,
-      transpileOnly: false,
+    // 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',
+      extensions,
+    }),
+
+    // Allows rollup to resolve imports of files with the specified extensions
+    nodeResolve({
+      extensions,
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.

diff --git a/.../ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json b/.../ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
+    "declarationDir": "declarations",
     "skipLibCheck": true
   },
   "include": [

diff --git a/tests/fixtures/ember-container-query-glint/output/.gitignore b/tests/fixtures/ember-container-query-glint/output/.gitignore
@@ -1,24 +1,11 @@
 # compiled output
-/dist/
+dist/
 
 # dependencies
-/node_modules/
+node_modules/
 
 # misc
 /.env*
-/.pnp*
-/.eslintcache
-/coverage/
+/.pnpm-debug.log
 /npm-debug.log*
-/testem.log
 /yarn-error.log
-
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
-# broccoli-debug
-/DEBUG/
diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/.eslintignore b/tests/fixtures/ember-container-query-glint/output/ember-container-query/.eslintignore
@@ -2,6 +2,7 @@
 /blueprints/*/files/
 
 # compiled output
+/declarations/
 /dist/
 
 # misc

diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/.gitignore b/tests/fixtures/ember-container-query-glint/output/ember-container-query/.gitignore
@@ -1,34 +1,12 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# The authoritative copies of these live in the monorepo root (because they're
+# more useful on github that way), but the build copies them into here so they
+# will also appear in published NPM packages.
+/LICENSE.md
+/README.md
 
 # compiled output
+/declarations/
 /dist/
-/tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
-
-# misc
-/.env*
-/.pnp*
-/.DS_Store
-/.sass-cache
-/.eslintcache
-/.stylelintcache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
-
-# 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
-
-# broccoli-debug
-/DEBUG/
diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json
@@ -24,8 +24,10 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "rollup --config",
+    "build": "concurrently \"npm:build:*\" --names \"build:\"",
+    "build:js": "rollup --config",
     "build:test": "ember build --environment=test",
+    "build:types": "glint --declaration",
     "changelog": "lerna-changelog",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
     "lint:css": "stylelint \"tests/dummy/app/**/*.css\" --cache",
@@ -39,7 +41,9 @@
     "lint:types": "glint",
     "postpack": "ember ts:clean",
     "prepack": "rollup --config",
-    "start": "rollup --config --watch",
+    "start": "concurrently \"npm:start:*\" --names \"start:\"",
+    "start:js": "rollup --config --watch --no-watch.clearScreen",
+    "start:types": "glint --declaration --watch",
     "test": "echo 'A v2 addon does not have tests, run tests in test-app'",
     "test:ember": "ember test",
     "test:ember-compatibility": "./node_modules/.bin/ember try:one"
@@ -69,9 +73,11 @@
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.2.0"
+    "rollup-plugin-copy": "^3.4.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
@@ -86,21 +92,25 @@
     "version": 2
   },
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "types": "./declarations/index.d.ts",
+      "default": "./dist/index.js"
+    },
     "./*": {
-      "types": "./dist/*.d.ts",
+      "types": "./declarations/*.d.ts",
       "default": "./dist/*.js"
     },
     "./addon-main.js": "./addon-main.cjs"
   },
   "files": [
     "addon-main.cjs",
+    "declarations",
     "dist"
   ],
   "typesVersions": {
     "*": {
       "*": [
-        "dist/*"
+        "declarations/*"
       ]
     }
   }

diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs
@@ -1,12 +1,16 @@
-import typescript from 'rollup-plugin-ts';
-import copy from 'rollup-plugin-copy';
 import { Addon } from '@embroider/addon-dev/rollup';
+import { babel } from '@rollup/plugin-babel';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
   srcDir: 'src',
   destDir: 'dist',
 });
 
+// Add extensions here, such as ts, gjs, etc that you may import
+const extensions = ['.js', '.ts'];
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -27,11 +31,20 @@ export default {
     // package names.
     addon.dependencies(),
 
-    // compile TypeScript to latest JavaScript, including Babel transpilation
-    typescript({
-      transpiler: 'babel',
-      browserslist: false,
-      transpileOnly: false,
+    // 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',
+      extensions,
+    }),
+
+    // Allows rollup to resolve imports of files with the specified extensions
+    nodeResolve({
+      extensions,
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.

diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "@tsconfig/ember/tsconfig.json",
   "compilerOptions": {
+    "declarationDir": "declarations",
     "skipLibCheck": true
   },
   "include": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     /blueprints/*/files/
     # compiled output
+    /declarations/
     /dist/
     # misc
@@ Expand Down @@