pattern-lab · bmuenzenmeyer · Oct 22, 2019 · Oct 12, 2019 · Oct 12, 2019 · Oct 12, 2019
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ packages/*/public
 !packages/core/test/patterns/testDependencyGraph.json
 lerna-debug.log
 packages/edition-node-gulp/dependencyGraph.json
+packages/uikit-workshop/dist
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.0.0
+12.9.0
diff --git a/.travis.yml b/.travis.yml
@@ -4,19 +4,21 @@ addons:
   chrome: stable
 
 before_install:
-  - phantomjs --version
+  # version lifted from `.nvmrc`
+  - nvm install
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.19.0
+  - export PATH="$HOME/.yarn/bin:$PATH"
 
 before_script:
-  - npm install -g lerna@3.2.1
-  - npm run setup
-  - lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
-  - lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
+  - yarn run setup
+  - npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
+  - npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
 
-script: travis_wait npm run test
+script: travis_wait yarn run test
 
 branches:
   only:

diff --git a/lerna.json b/lerna.json
@@ -1,31 +1,38 @@
 {
   "lerna": "3.11.0",
+  "version": "0.0.0",
   "packages": [
     "packages/*"
   ],
-  "version": "independent",
   "command": {
     "init": {
       "exact": true
     },
-    "bootstrap": {
-      "hoist": [
-        "tap",
-        "eslin*",
-        "husky",
-        "prettier",
-        "pretty-quick",
-        "babel-eslint"
-      ]
-    },
     "publish": {
       "allowBranch": [
-        "dev",
-        "master"
-      ]
+        "master",
+        "dev"
+      ],
+      "conventionalCommits": true,
+      "gitReset": true,
+      "includeMergedTags": true,
+      "noCommitHooks": true,
+      "verifyAccess": true
+    },
+    "changed": {
+      "includeMergedTags": true
     }
   },
+  "ignoreChanges": [
+    "**/__fixtures__/**",
+    "**/__tests__/**",
+    "**/*.md",
+    "**/__snapshots__/**"
+  ],
+  "npmClient": "yarn",
   "npmClientArgs": [
+    "--ignore-optional",
     "--registry=https://registry.npmjs.org/"
-  ]
+  ],
+  "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -1,4 +1,14 @@
 {
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ],
+    "nohoist": [
+      "@pattern-lab/engine-*",
+      "**/@pattern-lab/engine-*",
+      "**/@pattern-lab/uikit-workshop"
+    ]
+  },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.4.4",
     "@babel/plugin-syntax-jsx": "^7.2.0",
@@ -8,8 +18,8 @@
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
-    "lerna": "3.11.0",
     "prettier": "^1.14.3",
+    "lerna": "3.17.0",
     "pretty-quick": "^1.11.1",
     "auto": "^7.8.0"
   },
@@ -19,9 +29,8 @@
   },
   "private": true,
   "scripts": {
-    "postinstall": "npm run bootstrap",
-    "bootstrap": "lerna bootstrap",
-    "setup": "npm install && npm run build:uikit",
+    "postinstall": "lerna run postbootstrap",
+    "setup": "yarn",
     "build:uikit": "cd packages/uikit-workshop && npm run build",
     "precommit": "pretty-quick --staged",
     "lint:fix": "npm run lint -- --fix",

diff --git a/packages/core/src/lib/plugin_manager.js b/packages/core/src/lib/plugin_manager.js
@@ -41,9 +41,7 @@ const plugin_manager = function() {
     foundPlugins.forEach(plugin => {
       logger.info(`Found plugin: ${plugin}`);
       logger.info(`Attempting to load and initialize plugin.`);
-      const pluginModule = loadPlugin(
-        path.join(process.cwd(), 'node_modules', plugin)
-      );
+      const pluginModule = loadPlugin(plugin);
       pluginModule(patternlab);
     });
   }

diff --git a/packages/engine-nunjucks/package.json b/packages/engine-nunjucks/package.json
@@ -8,7 +8,7 @@
   "description": "The nunjucks PatternEngine for Pattern Lab / Node",
   "dependencies": {
     "fs-extra": "7.0.0",
-    "nunjucks": "3.1.3"
+    "nunjucks": "^3.2.0"
   },
   "engines": {
     "node": ">=10.0"

@@ -3,3 +3,4 @@ src/bower_components/*
 .sass-cache/*
 .DS_Store
 /.eslintignore
+dist
@@ -4,6 +4,8 @@
   "description": "Front-end assets and templates for the default Pattern Lab workshop view",
   "main": "gulpfile.js",
   "scripts": {
+    "prepublish": "npm run build",
+    "postbootstrap": "npm run build",
     "build": "webpack-cli --config webpack.config.js --progress --bail --display=minimal",
     "watch": "webpack-cli --config webpack.config.js --progress --watch --display=minimal",
     "test": "npm run build"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		10.0.0
		12.9.0
Copy link Member bmuenzenmeyer Oct 12, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. a small nit for next time - so we're on the same page - i like to adhere to the guidance that production apps should use `ACTIVE`, not `CURRENT` according to this schedule. In this case, we are talking a few days, but it's wanted to bring attention to it. Copy link Contributor Author sghoweri Oct 12, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Totally fair — happy to bump to down to 11.x (but yep, 9 days to go till LTS!). LMK if you think we should change this before merging down.