diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a143cf4dc..2f984935f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,5 +107,6 @@ jobs: working-directory: docs - name: Build including API docs run: pnpm run docs:build + working-directory: docs # TODO: Perform some basic steps that the build contains API docs # and works as expected. diff --git a/addon/package.json b/addon/package.json index 4f65d9188..63ce6fa8e 100644 --- a/addon/package.json +++ b/addon/package.json @@ -50,7 +50,6 @@ "ember-render-helpers": "^0.2.0", "ember-style-modifier": "^0.8.0 || ^1.0.0 || ^2.0.0 || ^3.0.0", "findup-sync": "^5.0.0", - "fs-extra": "^11.0.0", "resolve": "^1.18.1", "silent-error": "^1.0.1", "tracked-toolbox": "^1.2.3 || ^2.0.0" @@ -77,18 +76,6 @@ "engines": { "node": "18.* || >= 20" }, - "publishConfig": { - "registry": "https://registry.npmjs.org" - }, - "changelog": { - "labels": { - "breaking": ":boom: Breaking Change", - "enhancement": "Features", - "bug": "Bug Fixes", - "documentation": "Documentation", - "internal": "Internal" - } - }, "ember": { "edition": "octane" }, @@ -98,19 +85,7 @@ }, "demoURL": "https://www.ember-bootstrap.com" }, - "release-it": { - "plugins": { - "@release-it-plugins/lerna-changelog": { - "infile": "CHANGELOG.md", - "launchEditor": true - } - }, - "git": { - "tagName": "v${version}" - }, - "github": { - "release": true, - "tokenRef": "GITHUB_AUTH" - } + "volta": { + "extends": "../package.json" } } diff --git a/test-app/gulpfile.js b/docs/gulpfile.js similarity index 91% rename from test-app/gulpfile.js rename to docs/gulpfile.js index c3d880cc7..4b918a31f 100644 --- a/test-app/gulpfile.js +++ b/docs/gulpfile.js @@ -14,9 +14,7 @@ gulp.task('docs:api', function () { }); gulp.task('docs:app', function () { - return execa('ember', ['build', '--prod'], { - cwd: 'docs', - }).catch((e) => { + return execa('ember', ['build', '--prod']).catch((e) => { console.error(e); throw e; }); diff --git a/docs/package.json b/docs/package.json index 64e9456d5..cd15ba329 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "ember-bootstrap-docs", - "version": "0.0.0", + "version": "6.1.0", "private": true, "description": "ember-bootstrap docs", "repository": "https://github.com/kaliber5/ember-bootstrap", @@ -11,6 +11,8 @@ "test": "tests" }, "scripts": { + "docs:build": "gulp docs:build", + "docs:serve": "gulp docs:serve", "build": "ember build --environment=production", "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", "lint:css": "stylelint \"**/*.scss\"", @@ -49,6 +51,7 @@ "ember-cli-showdown": "7.0.0", "ember-cli-sri": "2.1.1", "ember-cli-terser": "4.0.2", + "ember-cli-yuidoc": "0.9.1", "ember-code-snippet": "3.0.0", "ember-cp-validations": "6.0.0", "ember-fetch": "8.1.2", @@ -69,13 +72,21 @@ "eslint-plugin-n": "16.6.2", "eslint-plugin-prettier": "5.1.3", "eslint-plugin-qunit": "8.0.1", + "execa": "5.1.1", + "gulp": "4.0.2", + "gulp-connect": "5.7.0", + "gulp-insert": "0.5.0", + "gulp-rename": "2.0.0", + "gulp-transform": "3.0.5", "loader.js": "4.7.0", + "merge-stream": "2.0.0", "prember": "2.0.0", "prettier": "3.0.3", "qunit": "2.20.0", "qunit-dom": "3.0.0", "sass": "1.69.7", "sinon": "17.0.1", + "striptags": "3.2.0", "stylelint": "16.1.0", "stylelint-config-standard-scss": "13.0.0", "stylelint-prettier": "5.0.0", @@ -90,11 +101,10 @@ }, "ember-addon": { "paths": [ - ".." + "../addon" ] }, "volta": { - "node": "18.19.0", - "pnpm": "8.14.1" + "extends": "../package.json" } } diff --git a/test-app/yuidoc.json b/docs/yuidoc.json similarity index 56% rename from test-app/yuidoc.json rename to docs/yuidoc.json index fab77c172..a7331cfad 100644 --- a/test-app/yuidoc.json +++ b/docs/yuidoc.json @@ -4,14 +4,14 @@ "version": "3.1.3", "options": { "paths": [ - "addon/components", - "addon/mixins" + "../addon/addon/components", + "../addon/addon/mixins" ], "exclude": "vendor", - "outdir": "docs/api", - "themedir": "docs/yuidoc-theme", + "outdir": "api", + "themedir": "yuidoc-theme", "helpers": [ - "docs/yuidoc-theme/helpers/index.js" + "yuidoc-theme/helpers/index.js" ] } } diff --git a/package.json b/package.json index 8d683e93e..332f97783 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,33 @@ "lint-staged": { "*.js": "eslint --cache --fix" }, + "changelog": { + "labels": { + "breaking": ":boom: Breaking Change", + "enhancement": "Features", + "bug": "Bug Fixes", + "documentation": "Documentation", + "internal": "Internal" + } + }, + "publishConfig": { + "registry": "https://registry.npmjs.org" + }, + "release-it": { + "plugins": { + "@release-it-plugins/lerna-changelog": { + "infile": "CHANGELOG.md", + "launchEditor": true + } + }, + "git": { + "tagName": "v${version}" + }, + "github": { + "release": true, + "tokenRef": "GITHUB_AUTH" + } + }, "volta": { "node": "18.19.0", "pnpm": "8.14.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 986a9dc2e..2d3e4e502 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -89,9 +89,6 @@ importers: findup-sync: specifier: ^5.0.0 version: 5.0.0 - fs-extra: - specifier: ^11.0.0 - version: 11.2.0 resolve: specifier: ^1.18.1 version: 1.22.8 @@ -213,6 +210,9 @@ importers: ember-cli-terser: specifier: 4.0.2 version: 4.0.2 + ember-cli-yuidoc: + specifier: 0.9.1 + version: 0.9.1 ember-code-snippet: specifier: 3.0.0 version: 3.0.0 @@ -273,9 +273,30 @@ importers: eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.56.0) + execa: + specifier: 5.1.1 + version: 5.1.1 + gulp: + specifier: 4.0.2 + version: 4.0.2 + gulp-connect: + specifier: 5.7.0 + version: 5.7.0 + gulp-insert: + specifier: 0.5.0 + version: 0.5.0 + gulp-rename: + specifier: 2.0.0 + version: 2.0.0 + gulp-transform: + specifier: 3.0.5 + version: 3.0.5 loader.js: specifier: 4.7.0 version: 4.7.0 + merge-stream: + specifier: 2.0.0 + version: 2.0.0 prember: specifier: 2.0.0 version: 2.0.0 @@ -294,6 +315,9 @@ importers: sinon: specifier: 17.0.1 version: 17.0.1 + striptags: + specifier: 3.2.0 + version: 3.2.0 stylelint: specifier: 16.1.0 version: 16.1.0 @@ -469,9 +493,6 @@ importers: ember-cli-test-loader: specifier: 3.1.0 version: 3.1.0 - ember-cli-yuidoc: - specifier: 0.9.1 - version: 0.9.1 ember-compatibility-helpers: specifier: 1.2.7 version: 1.2.7(@babel/core@7.23.7) @@ -529,39 +550,9 @@ importers: eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.56.0) - execa: - specifier: 5.1.1 - version: 5.1.1 - glob: - specifier: 10.3.10 - version: 10.3.10 - gulp: - specifier: 4.0.2 - version: 4.0.2 - gulp-connect: - specifier: 5.7.0 - version: 5.7.0 - gulp-insert: - specifier: 0.5.0 - version: 0.5.0 - gulp-rename: - specifier: 2.0.0 - version: 2.0.0 - gulp-transform: - specifier: 3.0.5 - version: 3.0.5 - husky: - specifier: 8.0.3 - version: 8.0.3 - lint-staged: - specifier: 15.2.0 - version: 15.2.0 loader.js: specifier: 4.7.0 version: 4.7.0 - merge-stream: - specifier: 2.0.0 - version: 2.0.0 mocha: specifier: 10.2.0 version: 10.2.0 @@ -580,9 +571,6 @@ importers: sinon: specifier: 17.0.1 version: 17.0.1 - striptags: - specifier: 3.2.0 - version: 3.2.0 webpack: specifier: 5.89.0 version: 5.89.0 diff --git a/test-app/renovate.json b/renovate.json similarity index 100% rename from test-app/renovate.json rename to renovate.json diff --git a/test-app/package.json b/test-app/package.json index 485cb56aa..10eade905 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -22,8 +22,6 @@ "scripts": { "build": "ember build --environment=production", "changelog": "lerna-changelog", - "docs:build": "gulp docs:build", - "docs:serve": "gulp docs:serve", "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"", "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:hbs": "ember-template-lint .", @@ -36,9 +34,6 @@ "test:ember": "ember test", "test:ember-compatibility": "ember try:each" }, - "lint-staged": { - "*.js": "eslint --cache --fix" - }, "dependencies": { "@ember/render-modifiers": "^2.0.0", "@embroider/macros": "^1.0.0", @@ -94,7 +89,7 @@ "ember-cli-sri": "2.1.1", "ember-cli-terser": "4.0.2", "ember-cli-test-loader": "3.1.0", - "ember-cli-yuidoc": "0.9.1", + "ember-cli-version-checker": "^5.1.2", "ember-compatibility-helpers": "1.2.7", "ember-load-initializers": "2.1.2", "ember-page-title": "8.2.0", @@ -114,24 +109,15 @@ "eslint-plugin-n": "16.6.2", "eslint-plugin-prettier": "5.1.3", "eslint-plugin-qunit": "8.0.1", - "execa": "5.1.1", - "glob": "10.3.10", - "gulp": "4.0.2", - "gulp-connect": "5.7.0", - "gulp-insert": "0.5.0", - "gulp-rename": "2.0.0", - "gulp-transform": "3.0.5", - "husky": "8.0.3", - "lint-staged": "15.2.0", + "findup-sync": "^5.0.0", "loader.js": "4.7.0", - "merge-stream": "2.0.0", "mocha": "10.2.0", "prettier": "3.0.3", "qunit": "2.20.0", "qunit-dom": "3.0.0", "release-it": "16.3.0", "sinon": "17.0.1", - "striptags": "3.2.0", + "tracked-toolbox": "^1.2.3 || ^2.0.0", "webpack": "5.89.0" }, "peerDependencies": { @@ -142,38 +128,10 @@ "engines": { "node": "18.* || >= 20" }, - "publishConfig": { - "registry": "https://registry.npmjs.org" - }, - "changelog": { - "labels": { - "breaking": ":boom: Breaking Change", - "enhancement": "Features", - "bug": "Bug Fixes", - "documentation": "Documentation", - "internal": "Internal" - } - }, "ember": { "edition": "octane" }, - "release-it": { - "plugins": { - "@release-it-plugins/lerna-changelog": { - "infile": "CHANGELOG.md", - "launchEditor": true - } - }, - "git": { - "tagName": "v${version}" - }, - "github": { - "release": true, - "tokenRef": "GITHUB_AUTH" - } - }, "volta": { - "node": "18.19.0", - "pnpm": "8.12.1" + "extends": "../package.json" } }