Skip to content

Commit

Permalink
Move config, lib, tasks into shared directory
Browse files Browse the repository at this point in the history
  • Loading branch information
colinrotherham committed Apr 6, 2023
1 parent ba85501 commit e5f9f99
Show file tree
Hide file tree
Showing 55 changed files with 4,237 additions and 23,649 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
with:
# Restore build cache (unless commit SHA changes)
key: build-cache-${{ runner.os }}-${{ github.sha }}
path: app/dist
path: packages/*/dist

- name: Install dependencies
uses: ./.github/workflows/actions/install-node
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/actions/install-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ runs:
key: npm-install-cache-${{ runner.os }}-${{ hashFiles('package-lock.json', '**/package.json') }}
path: |
node_modules
app/node_modules
docs/examples/*/node_modules
package/node_modules
packages/**/*/node_modules
- name: Setup Node.js
uses: ./.github/workflows/actions/setup-node
Expand Down
8 changes: 7 additions & 1 deletion app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"extends": "../tsconfig.base.json",
"include": ["**/*.js", "**/*.mjs", "../config", "../lib", "../tasks"],
"include": [
"**/*.js",
"**/*.mjs",
"../shared/config",
"../shared/lib",
"../shared/tasks"
],
"exclude": ["./dist/**"]
}
26 changes: 14 additions & 12 deletions docs/contributing/application-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

Binary/executable files (i.e. bash scripts) mainly used in the [publishing process](/docs/releasing/publishing.md).

- `config/`

Configuration files for the review app and [Jest](https://github.com/facebook/jest).

- `dist/` **contains auto-generated files**

Standalone builds of govuk-frontend. Provides a way to consume govuk-frontend without using npm.
Expand All @@ -20,19 +16,25 @@

Documentation files.

- `lib/`

Application modules and helpers.

- `package/` **contains auto-generated files**

package published on npm.
Consume all of govuk-frontend through a single package.

- `src/`
- `shared/`

Source files. See README.md in the src directory for details.
- `config/`

Configuration files for the review app and [Jest](https://github.com/facebook/jest).

- `tasks/`
- `lib/`

Application modules and helpers. See [tasks](tasks.md) for more information about the tasks.
Application modules and helpers.

- `tasks/`

See [tasks](tasks.md) for more information about the tasks.

- `src/`

Source files. See README.md in the src directory for details.
2 changes: 1 addition & 1 deletion docs/contributing/tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ npm scripts are defined in `package.json`. These trigger a number of Gulp tasks.

## Gulp tasks

Project Gulp tasks are defined in [`gulpfile.mjs`](../../gulpfile.mjs) and the [`tasks/`](../../tasks) folder.
Project Gulp tasks are defined in [`gulpfile.mjs`](../../gulpfile.mjs) and the [`tasks/`](../../shared/tasks) folder.

**`gulp --tasks`**

Expand Down
Loading

0 comments on commit e5f9f99

Please sign in to comment.