Make WordPress Core


Ignore:
Timestamp:
11/12/2020 06:34:44 PM (5 years ago)
Author:
desrosj
Message:

Twenty Twenty-One: Merge the latest changes changes from GitHub for Beta 4.

In addition to syncing the latest changes, this change also merges the theme’s .scss files and other related build tool configurations required to compile the theme’s CSS.

This will allow development of the theme to continue on Trac after 5.6 is released and the GitHub repository is archived.

For a full list of changes since [], see https://github.com/WordPress/twentytwentyone/compare/e7d5991...aa284fd.

Props poena, luminuu kjellr, aristath, justinahinon.
See #51526.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentytwentyone/package.json

    r49478 r49574  
    1515    "devDependencies": {
    1616        "@wordpress/browserslist-config": "^2.2.2",
    17         "@wordpress/env": "^2.1.0",
    1817        "@wordpress/eslint-plugin": "^7.3.0",
    1918        "autoprefixer": "^9.5.1",
     
    2120        "eslint": "^7.11.0",
    2221        "minimist": "^1.2.2",
    23         "node-sass": "^4.13.1",
    2422        "npm-run-all": "^4.1.5",
    2523        "postcss-calc": "^7.0.5",
     
    3028        "postcss-nested": "^4.2.1",
    3129        "rtlcss": "^2.6.1",
     30        "sass": "^1.28.0",
    3231        "stylelint": "^13.7.2",
    3332        "stylelint-config-recommended-scss": "^4.2.0",
     
    5251    "scripts": {
    5352        "start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
    54         "build:style": "node-sass assets/sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1 --source-map true",
    55         "build:style-editor": "node-sass assets/sass/style-editor.scss assets/css/style-editor.css --output-style expanded --indent-type tab --indent-width 1 --source-map true",
    56         "build:style-dark-mode": "node-sass assets/sass/style-dark-mode.scss assets/css/style-dark-mode.css --output-style expanded --indent-type tab --indent-width 1 --source-map true",
    57         "build:rtl": "rtlcss style.css style-rtl.css style-dark-mode.css",
    58         "build:print": "node-sass assets/sass/07-utilities/print.scss assets/css/print.css --output-style expanded --indent-type tab --indent-width 1 --source-map true",
     53        "build:style": "sass assets/sass/style.scss:style.css --style=expanded --source-map",
     54        "build:style-editor": "sass assets/sass/style-editor.scss:assets/css/style-editor.css --style=expanded --source-map",
     55        "build:style-dark-mode": "sass assets/sass/style-dark-mode.scss:assets/css/style-dark-mode.css --style=expanded --source-map",
     56        "build:rtl": "rtlcss style.css style-rtl.css style-dark-mode.css style-dark-mode-rtl.css",
     57        "build:dark-rtl": "rtlcss assets/css/style-dark-mode.css assets/css/style-dark-mode-rtl.css",
     58        "build:print": "sass assets/sass/07-utilities/print.scss:assets/css/print.css --style=expanded --source-map",
    5959        "build:ie": "postcss style.css -o assets/css/ie.css",
    6060        "build:ie-editor": "postcss assets/css/style-editor.css -o assets/css/ie-editor.css",
     61        "build:stylelint": "stylelint **/*.css --fix --config .stylelintrc-css.json",
    6162        "build": "run-s \"build:*\"",
    6263        "watch": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
    6364        "lint:scss": "stylelint **/*.scss",
    64         "lint:js": "eslint assets/js",
    65         "lint-fix:scss": "stylelint **/*.scss --fix",
    66         "lint-fix:js": "eslint assets/js --fix",
    67         "wp-env": "wp-env"
     65        "lint-fix:scss": "stylelint **/*.scss --fix"
    6866    }
    6967}
Note: See TracChangeset for help on using the changeset viewer.