Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 80a5833

Browse files
authored
chore: Bump Node and Sass versions, and some misc housekeeping (#7402)
1 parent 65125b3 commit 80a5833

File tree

12 files changed

+27
-37
lines changed

12 files changed

+27
-37
lines changed

.github/workflows/release-canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup node
2929
uses: actions/setup-node@v1
3030
with:
31-
node-version: 10
31+
node-version: 14
3232
registry-url: https://registry.npmjs.org/
3333
- name: Cache dependencies
3434
uses: actions/cache@v2

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup node
2121
uses: actions/setup-node@v1
2222
with:
23-
node-version: 10
23+
node-version: 14
2424
registry-url: https://registry.npmjs.org/
2525
- name: Cache dependencies
2626
uses: actions/cache@v2

.github/workflows/release-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup node
3030
uses: actions/setup-node@v1
3131
with:
32-
node-version: 10
32+
node-version: 14
3333
registry-url: https://registry.npmjs.org/
3434
- name: Cache dependencies
3535
uses: actions/cache@v2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup node
2929
uses: actions/setup-node@v1
3030
with:
31-
node-version: 10
31+
node-version: 14
3232
registry-url: https://registry.npmjs.org/
3333
- name: Cache dependencies
3434
uses: actions/cache@v2

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-node@v1
1616
with:
17-
node-version: 10
17+
node-version: 14
1818
- uses: actions/cache@v2
1919
with:
2020
path: ~/.npm
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v2
4545
- uses: actions/setup-node@v1
4646
with:
47-
node-version: 10
47+
node-version: 14
4848
- uses: actions/cache@v2
4949
with:
5050
path: |
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@v2
6565
- uses: actions/setup-node@v1
6666
with:
67-
node-version: 10
67+
node-version: 14
6868
- uses: actions/cache@v2
6969
with:
7070
path: |
@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@v2
9797
- uses: actions/setup-node@v1
9898
with:
99-
node-version: 10
99+
node-version: 14
100100
- uses: actions/cache@v2
101101
with:
102102
path: |
@@ -115,7 +115,7 @@ jobs:
115115
- uses: actions/checkout@v2
116116
- uses: actions/setup-node@v1
117117
with:
118-
node-version: 10
118+
node-version: 14
119119
- uses: actions/cache@v2
120120
with:
121121
path: |

.stylelintrc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ rules:
4242
- true
4343
- ignorePseudoElements:
4444
ng-deep
45-
scss/at-rule-no-unknown: true
45+
scss/at-rule-no-unknown:
46+
- true
47+
- ignoreAtRules:
48+
- provide
49+
- require
4650
# No config allows this:
4751
#
4852
# ```scss

package-lock.json

Lines changed: 3 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"eslint": "^5.1.0",
5959
"eslint-config-google": "^0.11.0",
6060
"eslint-plugin-mocha": "^5.0.0",
61-
"fibers": "^4.0.2",
6261
"fs-extra": "^7.0.0",
6362
"fs-readdir-recursive": "^1.1.0",
6463
"glob": "^7.1.6",
@@ -83,7 +82,7 @@
8382
"prettier": "^2.2.1",
8483
"recast": "^0.17.3",
8584
"resolve": "^1.3.2",
86-
"sass": "^1.34.1",
85+
"sass": "^1.41.1",
8786
"sass-loader": "^7.1.0",
8887
"semver": "^5.3.0",
8988
"stylelint": "^13.8.0",

packages/mdc-dialog/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@
862862
.mdc-dialog__title {
863863
@include theme.property(
864864
margin-left,
865-
calc(title - 2 * close),
865+
'calc(title - 2 * close)',
866866
$replace: (title: $title-side-padding, close: $close-icon-padding)
867867
);
868868
}

scripts/build/clean.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@ function main() {
1313
removeDirectory('.rewrite-tmp');
1414
removeFilesOfType('css');
1515
removeFilesOfType('js');
16-
removeFilesOfType('d.ts');
16+
removeFilesOfType('d.ts', [
17+
// This file is hand-written.
18+
'packages/mdc-base/externs.d.ts',
19+
]);
1720
removeFilesOfType('map');
1821
}
1922

2023
function removeDirectory(directory) {
2124
del.sync([directory]);
2225
}
2326

24-
function removeFilesOfType(type) {
27+
function removeFilesOfType(type, extraIgnore = []) {
2528
const fileGlob = `packages/**/*.${type}`;
2629
const filePaths = globSync(fileGlob, {
27-
ignore: ['**/node_modules/**'],
30+
ignore: ['**/node_modules/**', ...extraIgnore],
2831
});
2932
filePaths.forEach((filePath) => {
3033
fs.unlink(filePath, (err) => {

scripts/webpack/css-bundle-factory.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ class CssBundleFactory {
220220
sourceMap: true,
221221
includePaths: [getAbsolutePath('/packages/material-components-web/node_modules')],
222222
implementation: require('sass'),
223-
fiber: require('fibers'),
224223
},
225224
},
226225
];

scripts/webpack/js-bundle-factory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class JsBundleFactory {
157157
filenamePattern: this.env_.isProd() ? 'material-components-web.min.js' : 'material-components-web.js',
158158
moduleName: {
159159
amd: 'material-components-web',
160-
root: ['mdc']
160+
root: ['mdc'],
161161
},
162162
},
163163
plugins,
@@ -230,7 +230,7 @@ class JsBundleFactory {
230230
* @param {string} dashedName A dash-separated package name. E.g., "mdc-linear-progress".
231231
* @return {string} dashedName converted to camelCase. E.g., "mdcLinearProgress".
232232
*/
233-
function toCamelCase(dashedName) {
233+
function toCamelCase(dashedName) {
234234
return dashedName.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
235235
}
236236

0 commit comments

Comments
 (0)