Skip to content

Commit 4be74fa

Browse files
committed
chore: Updated test fixtures
1 parent b2a3689 commit 4be74fa

File tree

97 files changed

+753
-718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+753
-718
lines changed
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
# compiled output
2-
/dist/
2+
dist/
33

44
# dependencies
5-
/node_modules/
5+
node_modules/
66

77
# misc
88
/.env*
9-
/.pnp*
10-
/.eslintcache
11-
/coverage/
9+
/.pnpm-debug.log
1210
/npm-debug.log*
13-
/testem.log
1411
/yarn-error.log
15-
16-
# ember-try
17-
/.node_modules.ember-try/
18-
/npm-shrinkwrap.json.ember-try
19-
/package.json.ember-try
20-
/package-lock.json.ember-try
21-
/yarn.lock.ember-try
22-
23-
# broccoli-debug
24-
/DEBUG/

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/blueprints/*/files/
33

44
# compiled output
5+
/declarations/
56
/dist/
67

78
# misc
Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
1+
# The authoritative copies of these live in the monorepo root (because they're
2+
# more useful on github that way), but the build copies them into here so they
3+
# will also appear in published NPM packages.
4+
/LICENSE.md
5+
/README.md
26

37
# compiled output
8+
/declarations/
49
/dist/
5-
/tmp/
610

711
# dependencies
8-
/bower_components/
912
/node_modules/
10-
11-
# misc
12-
/.env*
13-
/.pnp*
14-
/.DS_Store
15-
/.sass-cache
16-
/.eslintcache
17-
/.stylelintcache
18-
/connect.lock
19-
/coverage/
20-
/libpeerconnection.log
21-
/npm-debug.log*
22-
/testem.log
23-
/yarn-error.log
24-
25-
# ember-try
26-
/.node_modules.ember-try/
27-
/bower.json.ember-try
28-
/npm-shrinkwrap.json.ember-try
29-
/package.json.ember-try
30-
/package-lock.json.ember-try
31-
/yarn.lock.ember-try
32-
33-
# broccoli-debug
34-
/DEBUG/

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
"test": "tests"
2525
},
2626
"scripts": {
27-
"build": "rollup --config",
27+
"build": "concurrently \"npm:build:*\" --names \"build:\"",
28+
"build:js": "rollup --config",
2829
"build:test": "ember build --environment=test",
30+
"build:types": "glint --declaration",
2931
"changelog": "lerna-changelog",
3032
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
3133
"lint:css": "stylelint \"tests/dummy/app/**/*.css\" --cache",
@@ -39,7 +41,9 @@
3941
"lint:types": "glint",
4042
"postpack": "ember ts:clean",
4143
"prepack": "rollup --config",
42-
"start": "rollup --config --watch",
44+
"start": "concurrently \"npm:start:*\" --names \"start:\"",
45+
"start:js": "rollup --config --watch --no-watch.clearScreen",
46+
"start:types": "glint --declaration --watch",
4347
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
4448
"test:ember": "ember test",
4549
"test:ember-compatibility": "./node_modules/.bin/ember try:one"
@@ -69,9 +73,11 @@
6973
"@babel/preset-typescript": "^7.22.5",
7074
"@babel/runtime": "^7.22.6",
7175
"@embroider/addon-dev": "^3.1.1",
76+
"@rollup/plugin-babel": "^6.0.3",
77+
"@rollup/plugin-node-resolve": "^15.1.0",
78+
"concurrently": "^7.6.0",
7279
"rollup": "^3.26.0",
73-
"rollup-plugin-copy": "^3.4.0",
74-
"rollup-plugin-ts": "^3.2.0"
80+
"rollup-plugin-copy": "^3.4.0"
7581
},
7682
"engines": {
7783
"node": "14.* || 16.* || >= 18"
@@ -86,21 +92,25 @@
8692
"version": 2
8793
},
8894
"exports": {
89-
".": "./dist/index.js",
95+
".": {
96+
"types": "./declarations/index.d.ts",
97+
"default": "./dist/index.js"
98+
},
9099
"./*": {
91-
"types": "./dist/*.d.ts",
100+
"types": "./declarations/*.d.ts",
92101
"default": "./dist/*.js"
93102
},
94103
"./addon-main.js": "./addon-main.cjs"
95104
},
96105
"files": [
97106
"addon-main.cjs",
107+
"declarations",
98108
"dist"
99109
],
100110
"typesVersions": {
101111
"*": {
102112
"*": [
103-
"dist/*"
113+
"declarations/*"
104114
]
105115
}
106116
}

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
import typescript from 'rollup-plugin-ts';
2-
import copy from 'rollup-plugin-copy';
31
import { Addon } from '@embroider/addon-dev/rollup';
2+
import { babel } from '@rollup/plugin-babel';
3+
import { nodeResolve } from '@rollup/plugin-node-resolve';
4+
import copy from 'rollup-plugin-copy';
45

56
const addon = new Addon({
67
srcDir: 'src',
78
destDir: 'dist',
89
});
910

11+
// Add extensions here, such as ts, gjs, etc that you may import
12+
const extensions = ['.js', '.ts'];
13+
1014
export default {
1115
// This provides defaults that work well alongside `publicEntrypoints` below.
1216
// You can augment this if you need to.
@@ -27,11 +31,20 @@ export default {
2731
// package names.
2832
addon.dependencies(),
2933

30-
// compile TypeScript to latest JavaScript, including Babel transpilation
31-
typescript({
32-
transpiler: 'babel',
33-
browserslist: false,
34-
transpileOnly: false,
34+
// This babel config should *not* apply presets or compile away ES modules.
35+
// It exists only to provide development niceties for you, like automatic
36+
// template colocation.
37+
//
38+
// By default, this will load the actual babel config from the file
39+
// babel.config.json.
40+
babel({
41+
babelHelpers: 'bundled',
42+
extensions,
43+
}),
44+
45+
// Allows rollup to resolve imports of files with the specified extensions
46+
nodeResolve({
47+
extensions,
3548
}),
3649

3750
// Ensure that standalone .hbs files are properly integrated as Javascript.

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "@tsconfig/ember/tsconfig.json",
33
"compilerOptions": {
4+
"declarationDir": "declarations",
45
"skipLibCheck": true
56
},
67
"include": [
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
# compiled output
2-
/dist/
2+
dist/
33

44
# dependencies
5-
/node_modules/
5+
node_modules/
66

77
# misc
88
/.env*
9-
/.pnp*
10-
/.eslintcache
11-
/coverage/
9+
/.pnpm-debug.log
1210
/npm-debug.log*
13-
/testem.log
1411
/yarn-error.log
15-
16-
# ember-try
17-
/.node_modules.ember-try/
18-
/npm-shrinkwrap.json.ember-try
19-
/package.json.ember-try
20-
/package-lock.json.ember-try
21-
/yarn.lock.ember-try
22-
23-
# broccoli-debug
24-
/DEBUG/

tests/fixtures/ember-container-query-glint/output/ember-container-query/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/blueprints/*/files/
33

44
# compiled output
5+
/declarations/
56
/dist/
67

78
# misc
Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,12 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
1+
# The authoritative copies of these live in the monorepo root (because they're
2+
# more useful on github that way), but the build copies them into here so they
3+
# will also appear in published NPM packages.
4+
/LICENSE.md
5+
/README.md
26

37
# compiled output
8+
/declarations/
49
/dist/
5-
/tmp/
610

711
# dependencies
8-
/bower_components/
912
/node_modules/
10-
11-
# misc
12-
/.env*
13-
/.pnp*
14-
/.DS_Store
15-
/.sass-cache
16-
/.eslintcache
17-
/.stylelintcache
18-
/connect.lock
19-
/coverage/
20-
/libpeerconnection.log
21-
/npm-debug.log*
22-
/testem.log
23-
/yarn-error.log
24-
25-
# ember-try
26-
/.node_modules.ember-try/
27-
/bower.json.ember-try
28-
/npm-shrinkwrap.json.ember-try
29-
/package.json.ember-try
30-
/package-lock.json.ember-try
31-
/yarn.lock.ember-try
32-
33-
# broccoli-debug
34-
/DEBUG/

tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
"test": "tests"
2525
},
2626
"scripts": {
27-
"build": "rollup --config",
27+
"build": "concurrently \"npm:build:*\" --names \"build:\"",
28+
"build:js": "rollup --config",
2829
"build:test": "ember build --environment=test",
30+
"build:types": "glint --declaration",
2931
"changelog": "lerna-changelog",
3032
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
3133
"lint:css": "stylelint \"tests/dummy/app/**/*.css\" --cache",
@@ -39,7 +41,9 @@
3941
"lint:types": "glint",
4042
"postpack": "ember ts:clean",
4143
"prepack": "rollup --config",
42-
"start": "rollup --config --watch",
44+
"start": "concurrently \"npm:start:*\" --names \"start:\"",
45+
"start:js": "rollup --config --watch --no-watch.clearScreen",
46+
"start:types": "glint --declaration --watch",
4347
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
4448
"test:ember": "ember test",
4549
"test:ember-compatibility": "./node_modules/.bin/ember try:one"
@@ -69,9 +73,11 @@
6973
"@babel/preset-typescript": "^7.22.5",
7074
"@babel/runtime": "^7.22.6",
7175
"@embroider/addon-dev": "^3.1.1",
76+
"@rollup/plugin-babel": "^6.0.3",
77+
"@rollup/plugin-node-resolve": "^15.1.0",
78+
"concurrently": "^7.6.0",
7279
"rollup": "^3.26.0",
73-
"rollup-plugin-copy": "^3.4.0",
74-
"rollup-plugin-ts": "^3.2.0"
80+
"rollup-plugin-copy": "^3.4.0"
7581
},
7682
"engines": {
7783
"node": "14.* || 16.* || >= 18"
@@ -86,21 +92,25 @@
8692
"version": 2
8793
},
8894
"exports": {
89-
".": "./dist/index.js",
95+
".": {
96+
"types": "./declarations/index.d.ts",
97+
"default": "./dist/index.js"
98+
},
9099
"./*": {
91-
"types": "./dist/*.d.ts",
100+
"types": "./declarations/*.d.ts",
92101
"default": "./dist/*.js"
93102
},
94103
"./addon-main.js": "./addon-main.cjs"
95104
},
96105
"files": [
97106
"addon-main.cjs",
107+
"declarations",
98108
"dist"
99109
],
100110
"typesVersions": {
101111
"*": {
102112
"*": [
103-
"dist/*"
113+
"declarations/*"
104114
]
105115
}
106116
}

0 commit comments

Comments
 (0)