Enrico/improve building

.github/workflows/jslint.yml

@@ -82,5 +82,8 @@ jobs:
           yarn --version
           grunt --version
 
-      - name: Run Javascript lint
+      - name: Run plugin and tooling lint
         run: yarn lint
+
+      - name: Run package lint
+        run: npx lerna run lint

.github/workflows/jstest.yml

@@ -103,8 +103,11 @@ jobs:
           grunt --version
           yarn run jest --version
 
+      - name: Install package dependencies
+        run: npx lerna bootstrap --ignore "@yoast/wordpress-seo"
+
       - name: Build all packages
-        run: yarn run build --ignore "@yoast/wordpress-seo"
+        run: npx lerna run build --ignore "@yoast/wordpress-seo"
 
       - name: Show Jest version
         run: yarn run jest --version
@@ -202,9 +205,13 @@ jobs:
           grunt --version
           yarn run jest --version
 
+      - name: Install package dependencies
+        if: ${{ steps.checks-run.outputs.should == 'true' }}
+        run: npx lerna bootstrap --ignore "@yoast/wordpress-seo"
+
       - name: Build all packages
         if: ${{ steps.checks-run.outputs.should == 'true' }}
-        run: yarn run build --ignore "@yoast/wordpress-seo"
+        run: npx lerna run build --ignore "@yoast/wordpress-seo"
 
       - name: Show Jest version
         if: ${{ steps.checks-run.outputs.should == 'true' }}

config/grunt/task-config/aliases.yaml

@@ -13,18 +13,13 @@
 
 # Grunt command to only build CSS and JS
 'build:dev':
-  - 'build:packages'
   - 'build:js'
   - 'build:css'
 
-# Compile the JavaScript packages that need it.
-'build:packages':
-  - 'shell:yarn:build --ignore @yoast/wordpress-seo'
-
 # Build JavaScript from assets to development
 'build:js':
   - 'clean:build-assets-js'
-  - 'shell:yarn:build --scope @yoast/wordpress-seo'
+  - 'shell:yarn:build'
 
 # Build CSS for development
 'build:css':
@@ -62,7 +57,6 @@ clean:build-assets:
 
 # Get the project ready for beta
 'create-beta':
-  - 'ensure-monorepo-is-unlinked'
   - 'ensure-clean-branch'
   - 'ensure-pre-release-branch'
   - 'update-readme'
@@ -102,14 +96,11 @@ clean:build-assets:
 release:
   - 'clean:build-assets'
   - 'build:images'
-  - 'release:packages'
   - 'release:js'
   - 'release:css'
-# Compile the JavaScript packages that need it.
-'release:packages':
-  - 'shell:yarn-prod:build --ignore @yoast/wordpress-seo'
+
 'release:js':
-  - 'shell:yarn-prod:build --scope @yoast/wordpress-seo'
+  - 'shell:yarn-prod:build'
 
 # Build CSS for production
 'release:css':

config/grunt/task-config/watch.js

@@ -27,28 +27,17 @@ module.exports = {
 	},
 	js: {
 		files: [
-			"packages/**/src/**/*.js",
+			"packages/js/src/**/*.js",
 		],
 		tasks: [
-			"shell:yarn:build",
-			"shell:yarn:lint:packages",
-		],
-	},
-	jsTests: {
-		files: [
-			"<%= files.jsTests %>",
-		],
-		tasks: [
-			"shell:yarn:lint:packages --scope @yoast/wordpress-seo",
+			"build:js",
 		],
 	},
 	css: {
 		files: [
 			"<%= files.css %>",
-			"packages/ui-library/src/**/*.css",
 		],
 		tasks: [
-			"build:packages",
 			"build:css",
 		],
 	},

config/scripts/sync-wp-dependencies.js

@@ -261,7 +261,7 @@ const syncPackageDependenciesFor = async( packageFolder, wpDependencies, modifie
 		return true;
 	}
 
-	const command = `yarn workspace ${ packageJson.name } add ${ dependenciesWithWantedVersions.join( " " ) }`;
+	const command = `yarn --cwd packages/${ packageFolder } add ${ dependenciesWithWantedVersions.join( " " ) }`;
 	console.log( "=============================================" );
 	console.log( command );
 	try {

config/webpack/webpack.config.js

@@ -12,7 +12,7 @@ const packageJson = require( root + "package.json" );
 const baseConfig = require( "./webpack.config.base" );
 const { yoastPackages, yoastExternals } = require( "./externals" );
 
-const languages = readdirSync( root + "node_modules/yoastseo/src/languageProcessing/languages" );
+const languages = readdirSync( root + "node_modules/yoastseo/build/languageProcessing/languages" );
 const pluginVersion = packageJson.yoast.pluginVersion;
 const pluginVersionSlug = paths.flattenVersionForFile( pluginVersion );
 const outputFilename = "[name].js";
@@ -63,7 +63,7 @@ module.exports = [
 	baseConfig( {
 		entry: languages.reduce( ( memo, language ) => {
 			const name = ( language === "_default" ) ? "default" : language;
-			memo[ name ] = "./node_modules/yoastseo/src/languageProcessing/languages/" + language + "/Researcher";
+			memo[ name ] = "./node_modules/yoastseo/build/languageProcessing/languages/" + language + "/Researcher";
 			return memo;
 		}, {} ),
 		output: {

lerna.json

@@ -1,6 +1,7 @@
 {
   "npmClient": "yarn",
-  "useWorkspaces": true,
+  "useWorkspaces": false,
+  "packages": ["packages/*"],
   "version": "independent",
   "includeMergedTags": true,
   "ignoreChanges": [

package.json

@@ -18,20 +18,18 @@
   },
   "workspaces": {
     "packages": [
-      "packages/*"
-    ],
-    "nohoist": [
-      "**/sassdash"
+      "packages/js",
+      "packages/e2e-tests",
+      "packages/dashboard-frontend"
     ]
   },
   "scripts": {
-    "lint": "yarn lint:packages && yarn lint:tooling",
-    "lint:packages": "lerna run lint",
-    "lint:tooling": "eslint . --max-warnings=0",
-    "test": "lerna run test",
-    "build": "lerna run build",
+    "build": "yarn workspace @yoast/dashboard-frontend build && wp-scripts build --config config/webpack/webpack.config.js",
     "build:css": "postcss css/dist/*.css --verbose --replace",
-    "webpack-analyze-bundle": "wp-scripts build --config config/webpack/webpack.config.js --webpack-bundle-analyzer",
+    "lint": "yarn lint:plugin && yarn lint:tooling",
+    "lint:plugin": "yarn workspace @yoast/wordpress-seo lint",
+    "lint:tooling": "eslint . --max-warnings=0",
+    "test": "yarn workspace @yoast/wordpress-seo test",
     "start": "wp-scripts start --config config/webpack/webpack.config.js --webpack-src-dir=packages/js/src",
     "sync:wp-deps": "node config/scripts/sync-wp-dependencies.js"
   },

packages/js/src/ai-generator/helpers/is-considered-empty.js

@@ -1,4 +1,4 @@
-import { punctuationRegexString } from "yoastseo/src/languageProcessing/helpers/sanitize/removePunctuation";
+import { punctuationRegexString } from "yoastseo/build/languageProcessing/helpers/sanitize/removePunctuation";
 
 const symbols = "#$%&*+/=@^`{|}~\u00a0-\u00bf\u2013-\u204a\u2000-\u206f\u20a0-\u20c0";
 /**

packages/js/src/components/WincherSEOPerformanceModal.js

@@ -3,7 +3,7 @@
 import { ChartBarIcon } from "@heroicons/react/solid";
 import { Fragment, useCallback } from "@wordpress/element";
 import { __ } from "@wordpress/i18n";
-import { useSvgAria } from "@yoast/ui-library/src";
+import { useSvgAria } from "@yoast/ui-library";
 import PropTypes from "prop-types";
 import styled from "styled-components";
 

packages/js/src/components/modals/editorModals/SearchAppearanceModal.js

@@ -2,7 +2,7 @@
 import { SearchIcon } from "@heroicons/react/solid";
 import { useSelect } from "@wordpress/data";
 import { __ } from "@wordpress/i18n";
-import { useSvgAria } from "@yoast/ui-library/src";
+import { useSvgAria } from "@yoast/ui-library";
 import styled from "styled-components";
 
 /* Internal dependencies */

packages/js/src/components/modals/editorModals/SocialAppearanceModal.js

@@ -12,7 +12,7 @@ import FacebookEditor from "../../../containers/FacebookEditor";
 import TwitterEditor from "../../../containers/TwitterEditor";
 import ModalCollapsible from "../../ModalCollapsible";
 import { StyledDescription, StyledDescriptionTop } from "../../../helpers/styledDescription";
-import { useSvgAria } from "@yoast/ui-library/src";
+import { useSvgAria } from "@yoast/ui-library";
 
 
 const StyledHeroIcon = styled( ShareIcon )`

packages/js/src/insights/components/insights-modal.js

@@ -2,7 +2,7 @@ import { LightBulbIcon } from "@heroicons/react/solid";
 import { useSelect } from "@wordpress/data";
 import { __ } from "@wordpress/i18n";
 import { isFeatureEnabled } from "@yoast/feature-flag";
-import { useSvgAria } from "@yoast/ui-library/src";
+import { useSvgAria } from "@yoast/ui-library";
 import PropTypes from "prop-types";
 import styled from "styled-components";
 import EditorModal from "../../containers/EditorModal";