Skip to content

Commit c4292d9

Browse files
authored
Merge branch 'v2-dev' into autocomplete-accessibility
2 parents 3cc3559 + 7a41f5a commit c4292d9

Some content is hidden

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

68 files changed

+3223
-2537
lines changed

.github/workflows/nightly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@master
1414

15+
- uses: actions/setup-node@v4
16+
with:
17+
node-version: 23
18+
1519
- name: Run tests
1620
run: |
1721
npm i

FOR_MAINTAINERS.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ To fully release a new version, you need to have access to the @materializecss o
2020
1. In your local copy of Materialize, go into the dev Branch with `git checkout v2-dev` and pull the newest version
2121
with `git pull origin v2-dev` to have the newest version from the server. Run Tests and check if everything works.
2222

23-
2. Create a new Release branch with `git checkout -b release-2.X.X-alpha`.
24-
In case something happend or needs to be changed during the release it is better to keep the release on its own branch.
23+
2. Create a new Release branch with `git checkout -b release-2.X.X`.
24+
In case something happens or needs to be changed during the release it is better to keep the release on its own branch.
2525

26-
3. Run `npm run release -- --oldver=<current_version> --newver=<new_version>`
27-
What this command does is that it will replace any occurrences of "<current_version>" with the "<new_version>". So for example, if the current release is `1.0.0`, and then the planned release is `1.1.0`, the command would be
28-
```npm run release -- --oldver=1.0.0 --newver=1.1.0```
26+
3. Run `npm version <change-type>`
27+
Where `<change-type> = patch, minor, major`.
28+
[details](https://docs.npmjs.com/updating-your-published-package-version-number)
2929

3030
4. Verify that the version is correctly replaced and files were generated in:
3131
* package.json

README.md

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,29 @@
2929
</a>
3030
</p>
3131

32-
## Quickstart
32+
## Getting started
3333
Read the [getting started guide](https://materializeweb.com/getting-started.html) for more information on how to use materialize.
3434

3535
- [Download the latest release](https://github.com/materializecss/materialize/releases/latest) of materialize directly from GitHub. ([Beta](https://github.com/materializecss/materialize/releases/))
3636
- Clone the repo: `git clone https://github.com/materializecss/materialize.git`
3737
- Include the files via [jsDelivr](https://www.jsdelivr.com/package/npm/@materializecss/materialize).
3838
- Install with [npm](https://www.npmjs.com): `npm install @materializecss/materialize` (Beta: `npm install @materializecss/materialize@next`)
3939

40+
## Testing
41+
To run tests locally you first have to build the files and then run the tests. This can be done with the command `npm test`;
42+
To get more info and debug information you can do the following:
43+
run `npx jasmine-browser-runner` then go to the url via browser `http://localhost:8888`. The tests will then run and show detailed feedback.
44+
4045
## Development
4146
The documentation can be found at <https://materializeweb.com>. To run the documentation locally on your machine, you need [Node.js](https://nodejs.org) installed on your computer.
42-
4347
This is the core project with all the components. To see how they are used we recommend using an example project or go to the documentation.
44-
Otherwise, if you want to develop the components itself, the dev process of this core-repo works like this:
45-
```sh
46-
npm install
47-
npm run dev
48-
```
4948

5049
### Running documentation locally
5150
See [Materialize Docs Repo](https://github.com/materializecss/materialize-docs) to see Materialize in Action.
5251

53-
### Documentation for previous releases
52+
### Releases
5453
Previous releases are available [here](https://github.com/materializecss/materialize/releases).
5554

56-
## Release
57-
If you want to release `materialize.css` or `materialize.js` from the latest commit, you can build the files with the following command after `npm install`. See `package.json` to check the current version like `1.0.0`.
58-
```sh
59-
npm run release -- --oldver=<current_version> --newver=<new_version>
60-
```
61-
6255
## Supported Browsers:
6356
Materialize is compatible with:
6457

ci/compress.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const fs = require('fs');
2-
const archiver = require('archiver');
1+
import fs from 'fs';
2+
import archiver from 'archiver';
33

44
const packageJson = JSON.parse(fs.readFileSync('./package.json').toString());
55

eslint.config.mjs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import typescriptEslint from 'typescript-eslint';
22

33
export default [
4+
{ files: ['src/**/*.{ts,js,mjs}'] },
45
{
5-
files: ['src/**/*.{ts,js,mjs}'],
6-
ignores: ['dist', 'node_modules']
6+
// https://eslint.org/docs/latest/use/configure/configuration-files
7+
ignores: ['dist', 'tsconfig.json', 'node_modules']
78
},
89
...typescriptEslint.configs.recommended,
910
{
@@ -15,7 +16,7 @@ export default [
1516
'@typescript-eslint/no-unused-vars': 'error',
1617
'@typescript-eslint/no-unused-expressions': 'error',
1718
'@typescript-eslint/no-this-alias': 'warn',
18-
'@typescript-eslint/no-empty-object-type': 'error',
19+
'@typescript-eslint/no-empty-object-type': ['error' , { allowWithName: 'BaseOptions$' }],
1920
'@typescript-eslint/no-require-imports': 'error',
2021
'@typescript-eslint/no-unsafe-function-type': 'error'
2122
}

index.html

Lines changed: 0 additions & 41 deletions
This file was deleted.

index.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

index.mjs

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)