Merge branch 'master' into alpha

Author: sebastiandg7

.github/workflows/e2e.yml

@@ -10,6 +10,10 @@ jobs:
   run_e2e:
     name: Run e2e
     runs-on: ubuntu-latest
+    env:
+      NX_BRANCH: ${{ github.event.number }}
+      NX_RUN_GROUP: ${{ github.run_id }}
+      NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
     strategy:
       matrix:
         node-version: [12.x, 14.x]

nx.json

@@ -16,9 +16,12 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "@nrwl/nx-cloud",
       "options": {
-        "cacheableOperations": ["build", "lint", "test", "e2e"]
+        "cacheableOperations": ["build", "lint", "test", "e2e"],
+        "accessToken": "ZTc0ZDBjM2YtNWVkZS00ZTMwLWFhZWQtM2RiZGFlMzlmNjM0fHJlYWQ=",
+        "canTrackAnalytics": true,
+        "showUsageWarnings": true
       }
     }
   },

package.json

@@ -32,8 +32,6 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/architect": "~0.1100.1",
-    "@angular-devkit/build-webpack": "~0.1100.1",
     "@nrwl/devkit": "11.4.0",
     "@nrwl/workspace": "11.4.0",
     "@shopify/themekit": "^1.1.7",
@@ -61,6 +59,7 @@
     "portscanner": "^2.2.0",
     "postcss": "^8.2.1",
     "postcss-loader": "^4.1.0",
+    "rxjs-for-await": "^0.0.2",
     "sass": "^1.27.0",
     "sass-loader": "^10.0.3",
     "tapable": "^2.0.0",
@@ -78,6 +77,7 @@
     "@nrwl/cli": "11.4.0",
     "@nrwl/eslint-plugin-nx": "11.4.0",
     "@nrwl/jest": "11.4.0",
+    "@nrwl/nx-cloud": "^11.1.4",
     "@nrwl/nx-plugin": "11.4.0",
     "@nrwl/tao": "11.4.0",
     "@semantic-release/changelog": "^5.0.1",

packages/nx-shopify/builders.json

@@ -1,20 +1,20 @@
 {
-  "$schema": "../../node_modules/@angular-devkit/architect/src/builders-schema.json",
+  "$schema": "http://json-schema.org/schema",
   "executors": {
     "build": {
-      "implementation": "./src/builders/build/builder",
-      "schema": "./src/builders/build/schema.json",
+      "implementation": "./src/executors/build/build.executor",
+      "schema": "./src/executors/build/schema.json",
       "description": "Build a Shopify theme"
     },
-    "deploy": {
-      "implementation": "./src/builders/deploy/builder",
-      "schema": "./src/builders/deploy/schema.json",
-      "description": "Deploy a Shopify theme to Shopify"
-    },
     "serve": {
       "implementation": "./src/executors/serve/serve.executor",
       "schema": "./src/executors/serve/schema.json",
       "description": "Serves a Shopify theme for local development"
+    },
+    "deploy": {
+      "implementation": "./src/executors/deploy/deploy.executor",
+      "schema": "./src/executors/deploy/schema.json",
+      "description": "Deploy a Shopify theme to Shopify"
     }
   }
 }

packages/nx-shopify/collection.json

@@ -1,16 +1,16 @@
 {
-  "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "$schema": "http://json-schema.org/schema",
   "name": "nx-shopify",
   "version": "0.0.1",
   "generators": {
     "init": {
-      "factory": "./src/schematics/init/schematic",
-      "schema": "./src/schematics/init/schema.json",
+      "factory": "./src/generators/init/init.generator",
+      "schema": "./src/generators/init/schema.json",
       "description": "Initialize plugin"
     },
     "theme": {
-      "factory": "./src/schematics/theme/schematic",
-      "schema": "./src/schematics/theme/schema.json",
+      "factory": "./src/generators/theme/theme.generator",
+      "schema": "./src/generators/theme/schema.json",
       "description": "Generate new Shopify theme"
     }
   }

packages/nx-shopify/executors.json

@@ -22,8 +22,6 @@
     "themekit"
   ],
   "main": "src/index.js",
-  "schematics": "./collection.json",
-  "builders": "./builders.json",
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {