From c3e6f1324e3964f875b1fd9a424baa868cb32341 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Mon, 3 Apr 2017 18:33:06 -0600 Subject: [PATCH] assets/ -> resources/assets/ --- CHANGELOG.md | 2 +- package.json | 10 ++++---- {assets => resources/assets}/build/.eslintrc | 0 {assets => resources/assets}/build/config.js | 2 +- .../assets}/build/public-path.js | 0 .../assets}/build/util/addHotMiddleware.js | 0 .../build/util/assetManifestsFormatter.js | 0 .../assets}/build/webpack.config.js | 0 .../assets}/build/webpack.config.optimize.js | 0 .../assets}/build/webpack.config.watch.js | 0 {assets => resources/assets}/config.json | 2 +- {assets => resources/assets}/fonts/.gitkeep | 0 {assets => resources/assets}/images/.gitkeep | 0 .../assets}/scripts/customizer.js | 0 {assets => resources/assets}/scripts/main.js | 0 .../assets}/scripts/routes/about.js | 0 .../assets}/scripts/routes/common.js | 0 .../assets}/scripts/routes/home.js | 0 .../assets}/scripts/util/Router.js | 0 .../assets}/scripts/util/camelCase.js | 0 .../assets}/styles/common/_global.scss | 0 .../assets}/styles/common/_variables.scss | 0 .../assets}/styles/components/_buttons.scss | 0 .../assets}/styles/components/_comments.scss | 0 .../assets}/styles/components/_forms.scss | 0 .../styles/components/_wp-classes.scss | 0 .../assets}/styles/layouts/_footer.scss | 0 .../assets}/styles/layouts/_header.scss | 0 .../assets}/styles/layouts/_pages.scss | 0 .../assets}/styles/layouts/_posts.scss | 0 .../assets}/styles/layouts/_sidebar.scss | 0 .../assets}/styles/layouts/_tinymce.scss | 0 {assets => resources/assets}/styles/main.scss | 0 src/lib/Sage/PostCreateProject.php | 24 +++++++++---------- src/setup.php | 2 +- 35 files changed, 21 insertions(+), 21 deletions(-) rename {assets => resources/assets}/build/.eslintrc (100%) rename {assets => resources/assets}/build/config.js (96%) rename {assets => resources/assets}/build/public-path.js (100%) rename {assets => resources/assets}/build/util/addHotMiddleware.js (100%) rename {assets => resources/assets}/build/util/assetManifestsFormatter.js (100%) rename {assets => resources/assets}/build/webpack.config.js (100%) rename {assets => resources/assets}/build/webpack.config.optimize.js (100%) rename {assets => resources/assets}/build/webpack.config.watch.js (100%) rename {assets => resources/assets}/config.json (91%) rename {assets => resources/assets}/fonts/.gitkeep (100%) rename {assets => resources/assets}/images/.gitkeep (100%) rename {assets => resources/assets}/scripts/customizer.js (100%) rename {assets => resources/assets}/scripts/main.js (100%) rename {assets => resources/assets}/scripts/routes/about.js (100%) rename {assets => resources/assets}/scripts/routes/common.js (100%) rename {assets => resources/assets}/scripts/routes/home.js (100%) rename {assets => resources/assets}/scripts/util/Router.js (100%) rename {assets => resources/assets}/scripts/util/camelCase.js (100%) rename {assets => resources/assets}/styles/common/_global.scss (100%) rename {assets => resources/assets}/styles/common/_variables.scss (100%) rename {assets => resources/assets}/styles/components/_buttons.scss (100%) rename {assets => resources/assets}/styles/components/_comments.scss (100%) rename {assets => resources/assets}/styles/components/_forms.scss (100%) rename {assets => resources/assets}/styles/components/_wp-classes.scss (100%) rename {assets => resources/assets}/styles/layouts/_footer.scss (100%) rename {assets => resources/assets}/styles/layouts/_header.scss (100%) rename {assets => resources/assets}/styles/layouts/_pages.scss (100%) rename {assets => resources/assets}/styles/layouts/_posts.scss (100%) rename {assets => resources/assets}/styles/layouts/_sidebar.scss (100%) rename {assets => resources/assets}/styles/layouts/_tinymce.scss (100%) rename {assets => resources/assets}/styles/main.scss (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03d4857..3fe7eb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ### HEAD -* Move `templates/` to `resources/views/`, rename `base.blade.php` to `app.blade.php`, ([#1864](https://github.com/roots/sage/pull/1864)) +* Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864)) * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822)) * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817)) diff --git a/package.json b/package.json index f49f25f..647a3b6 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ } ], "scripts": { - "build": "webpack --progress --config assets/build/webpack.config.js", - "build:production": "webpack --progress -p --config assets/build/webpack.config.js", - "build:profile": "webpack --progress --profile --json --config assets/build/webpack.config.js", - "start": "webpack --hide-modules --watch --config assets/build/webpack.config.js", + "build": "webpack --progress --config resources/assets/build/webpack.config.js", + "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js", + "build:profile": "webpack --progress --profile --json --config resources/assets/build/webpack.config.js", + "start": "webpack --hide-modules --watch --config resources/assets/build/webpack.config.js", "rmdist": "rimraf dist", - "lint": "eslint assets/scripts assets/build", + "lint": "eslint resources/assets/scripts resources/assets/build", "test": "yarn run lint" }, "engines": { diff --git a/assets/build/.eslintrc b/resources/assets/build/.eslintrc similarity index 100% rename from assets/build/.eslintrc rename to resources/assets/build/.eslintrc diff --git a/assets/build/config.js b/resources/assets/build/config.js similarity index 96% rename from assets/build/config.js rename to resources/assets/build/config.js index fcb021b..9ef5827 100644 --- a/assets/build/config.js +++ b/resources/assets/build/config.js @@ -15,7 +15,7 @@ const config = merge({ cacheBusting: '[name]_[hash]', paths: { root: rootPath, - assets: path.join(rootPath, 'assets'), + assets: path.join(rootPath, 'resources/assets'), dist: path.join(rootPath, 'dist'), }, enabled: { diff --git a/assets/build/public-path.js b/resources/assets/build/public-path.js similarity index 100% rename from assets/build/public-path.js rename to resources/assets/build/public-path.js diff --git a/assets/build/util/addHotMiddleware.js b/resources/assets/build/util/addHotMiddleware.js similarity index 100% rename from assets/build/util/addHotMiddleware.js rename to resources/assets/build/util/addHotMiddleware.js diff --git a/assets/build/util/assetManifestsFormatter.js b/resources/assets/build/util/assetManifestsFormatter.js similarity index 100% rename from assets/build/util/assetManifestsFormatter.js rename to resources/assets/build/util/assetManifestsFormatter.js diff --git a/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js similarity index 100% rename from assets/build/webpack.config.js rename to resources/assets/build/webpack.config.js diff --git a/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js similarity index 100% rename from assets/build/webpack.config.optimize.js rename to resources/assets/build/webpack.config.optimize.js diff --git a/assets/build/webpack.config.watch.js b/resources/assets/build/webpack.config.watch.js similarity index 100% rename from assets/build/webpack.config.watch.js rename to resources/assets/build/webpack.config.watch.js diff --git a/assets/config.json b/resources/assets/config.json similarity index 91% rename from assets/config.json rename to resources/assets/config.json index 0b0bdd8..cce31fa 100644 --- a/assets/config.json +++ b/resources/assets/config.json @@ -13,7 +13,7 @@ "proxyUrl": "http://localhost:3000", "cacheBusting": "[name]_[hash:8]", "watch": [ - "{src,templates}/**/*.php" + "{src,resources/views}/**/*.php" ], "browsers": [ "last 2 versions", diff --git a/assets/fonts/.gitkeep b/resources/assets/fonts/.gitkeep similarity index 100% rename from assets/fonts/.gitkeep rename to resources/assets/fonts/.gitkeep diff --git a/assets/images/.gitkeep b/resources/assets/images/.gitkeep similarity index 100% rename from assets/images/.gitkeep rename to resources/assets/images/.gitkeep diff --git a/assets/scripts/customizer.js b/resources/assets/scripts/customizer.js similarity index 100% rename from assets/scripts/customizer.js rename to resources/assets/scripts/customizer.js diff --git a/assets/scripts/main.js b/resources/assets/scripts/main.js similarity index 100% rename from assets/scripts/main.js rename to resources/assets/scripts/main.js diff --git a/assets/scripts/routes/about.js b/resources/assets/scripts/routes/about.js similarity index 100% rename from assets/scripts/routes/about.js rename to resources/assets/scripts/routes/about.js diff --git a/assets/scripts/routes/common.js b/resources/assets/scripts/routes/common.js similarity index 100% rename from assets/scripts/routes/common.js rename to resources/assets/scripts/routes/common.js diff --git a/assets/scripts/routes/home.js b/resources/assets/scripts/routes/home.js similarity index 100% rename from assets/scripts/routes/home.js rename to resources/assets/scripts/routes/home.js diff --git a/assets/scripts/util/Router.js b/resources/assets/scripts/util/Router.js similarity index 100% rename from assets/scripts/util/Router.js rename to resources/assets/scripts/util/Router.js diff --git a/assets/scripts/util/camelCase.js b/resources/assets/scripts/util/camelCase.js similarity index 100% rename from assets/scripts/util/camelCase.js rename to resources/assets/scripts/util/camelCase.js diff --git a/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss similarity index 100% rename from assets/styles/common/_global.scss rename to resources/assets/styles/common/_global.scss diff --git a/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss similarity index 100% rename from assets/styles/common/_variables.scss rename to resources/assets/styles/common/_variables.scss diff --git a/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss similarity index 100% rename from assets/styles/components/_buttons.scss rename to resources/assets/styles/components/_buttons.scss diff --git a/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss similarity index 100% rename from assets/styles/components/_comments.scss rename to resources/assets/styles/components/_comments.scss diff --git a/assets/styles/components/_forms.scss b/resources/assets/styles/components/_forms.scss similarity index 100% rename from assets/styles/components/_forms.scss rename to resources/assets/styles/components/_forms.scss diff --git a/assets/styles/components/_wp-classes.scss b/resources/assets/styles/components/_wp-classes.scss similarity index 100% rename from assets/styles/components/_wp-classes.scss rename to resources/assets/styles/components/_wp-classes.scss diff --git a/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss similarity index 100% rename from assets/styles/layouts/_footer.scss rename to resources/assets/styles/layouts/_footer.scss diff --git a/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss similarity index 100% rename from assets/styles/layouts/_header.scss rename to resources/assets/styles/layouts/_header.scss diff --git a/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss similarity index 100% rename from assets/styles/layouts/_pages.scss rename to resources/assets/styles/layouts/_pages.scss diff --git a/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss similarity index 100% rename from assets/styles/layouts/_posts.scss rename to resources/assets/styles/layouts/_posts.scss diff --git a/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss similarity index 100% rename from assets/styles/layouts/_sidebar.scss rename to resources/assets/styles/layouts/_sidebar.scss diff --git a/assets/styles/layouts/_tinymce.scss b/resources/assets/styles/layouts/_tinymce.scss similarity index 100% rename from assets/styles/layouts/_tinymce.scss rename to resources/assets/styles/layouts/_tinymce.scss diff --git a/assets/styles/main.scss b/resources/assets/styles/main.scss similarity index 100% rename from assets/styles/main.scss rename to resources/assets/styles/main.scss diff --git a/src/lib/Sage/PostCreateProject.php b/src/lib/Sage/PostCreateProject.php index d7583cb..0dac4fc 100755 --- a/src/lib/Sage/PostCreateProject.php +++ b/src/lib/Sage/PostCreateProject.php @@ -41,10 +41,10 @@ class PostCreateProject $default_framework_pattern = '"bootstrap": ".*"'; $files_to_clear = [ - 'assets/styles/components/_comments.scss', - 'assets/styles/components/_forms.scss', - 'assets/styles/components/_wp-classes.scss', - 'assets/styles/layouts/_header.scss', + 'resources/assets/styles/components/_comments.scss', + 'resources/assets/styles/components/_forms.scss', + 'resources/assets/styles/components/_wp-classes.scss', + 'resources/assets/styles/layouts/_header.scss', ]; @@ -61,16 +61,16 @@ class PostCreateProject break; case 1: file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"foundation-sites": "6.3.0"', file_get_contents('package.json'))); - file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~foundation-sites/scss/foundation";' . "\n" . '@include foundation-everything;' . "\n", file_get_contents('assets/styles/main.scss'))); - file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", "import 'foundation-sites/dist/js/foundation';\n", file_get_contents('assets/scripts/main.js'))); + file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~foundation-sites/scss/foundation";' . "\n" . '@include foundation-everything;' . "\n", file_get_contents('resources/assets/styles/main.scss'))); + file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", "import 'foundation-sites/dist/js/foundation';\n", file_get_contents('resources/assets/scripts/main.js'))); foreach($files_to_clear as $file) { file_put_contents($file, ''); } break; case 2: file_put_contents('package.json', preg_replace("/\s+{$default_framework_pattern},/", '', file_get_contents('package.json'))); - file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('assets/styles/main.scss'))); - file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js'))); + file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('resources/assets/styles/main.scss'))); + file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('resources/assets/scripts/main.js'))); foreach($files_to_clear as $file) { file_put_contents($file, ''); } @@ -93,8 +93,8 @@ class PostCreateProject file_put_contents('package.json', $package); $import_dep_str = '// Import npm dependencies' . "\n"; - file_put_contents('assets/styles/main.scss', str_replace($import_dep_str, $import_dep_str . '@import "~font-awesome/scss/font-awesome";' . "\n", file_get_contents('assets/styles/main.scss'))); - file_put_contents('assets/styles/common/_variables.scss', "\n" . '$fa-font-path: \'~font-awesome/fonts\';' . "\n", FILE_APPEND); + file_put_contents('resources/assets/styles/main.scss', str_replace($import_dep_str, $import_dep_str . '@import "~font-awesome/scss/font-awesome";' . "\n", file_get_contents('resources/assets/styles/main.scss'))); + file_put_contents('resources/assets/styles/common/_variables.scss', "\n" . '$fa-font-path: \'~font-awesome/fonts\';' . "\n", FILE_APPEND); } } } @@ -116,8 +116,8 @@ class PostCreateProject 'devUrl' => $io->ask('Local development URL of WP site ['.$browsersync_settings_default['devUrl'].']: ', $browsersync_settings_default['devUrl']) ]; - file_put_contents('assets/config.json', str_replace('/app/themes/sage', $browsersync_settings['publicPath'], file_get_contents('assets/config.json'))); - file_put_contents('assets/config.json', str_replace($browsersync_settings_default['devUrl'], $browsersync_settings['devUrl'], file_get_contents('assets/config.json'))); + file_put_contents('resources/assets/config.json', str_replace('/app/themes/sage', $browsersync_settings['publicPath'], file_get_contents('resources/assets/config.json'))); + file_put_contents('resources/assets/config.json', str_replace($browsersync_settings_default['devUrl'], $browsersync_settings['devUrl'], file_get_contents('resources/assets/config.json'))); } } // @codingStandardsIgnoreEnd diff --git a/src/setup.php b/src/setup.php index 2a93df2..549f44f 100644 --- a/src/setup.php +++ b/src/setup.php @@ -64,7 +64,7 @@ add_action('after_setup_theme', function () { /** * Use main stylesheet for visual editor - * @see assets/styles/layouts/_tinymce.scss + * @see resources/assets/styles/layouts/_tinymce.scss */ add_editor_style(asset_path('styles/main.css')); }, 20);