Merge branch 'main' into bugfix/706-extraneous-design-key

.github/workflows/ensure-semantic-pr.yml

@@ -0,0 +1,18 @@
+name: Ensure Semantic Pull Request
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+jobs:
+  main:
+    name: Validate PR to be semantic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v4
+        with:
+          validateSingleCommit: true
+          validateSingleCommitMatchesPrTitle: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

packages/__cxstarter__/package.json

@@ -31,6 +31,7 @@
     "react": "^17.0.2"
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "@bodiless/components": "^1.0.0-beta.2",
     "@bodiless/components-ui": "^1.0.0-beta.2",
     "@bodiless/core": "^1.0.0-beta.2",

packages/__cxstarter__/tailwind.config.js

@@ -0,0 +1,28 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageTailwindConfig } from '@bodiless/fclasses';
+
+const resolver = (pkgName) => require.resolve(pkgName);
+
+const twConfig = {
+  purge: [
+    './lib/**/!(*.d).{ts,js,jsx,tsx}',
+  ],
+};
+
+export default getPackageTailwindConfig({
+  twConfig,
+  resolver,
+});

packages/bodiless-accessibility/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from '@bodiless/cli';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-accessibility/package.json

@@ -25,6 +25,7 @@
     "audit": "node ./index.js $*"
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "arg": "^4.1.1",
     "chalk": "^2.4.2",
     "esm": "^3.2.25",

packages/bodiless-accordion/package.json

@@ -26,6 +26,7 @@
     "clean": "rimraf \"lib/*\" && rimraf tsconfig.tsbuildinfo && rimraf \"doc/api\""
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "@bodiless/components": "^1.0.0-beta.2",
     "@bodiless/core": "^1.0.0-beta.2",
     "@bodiless/fclasses": "^1.0.0-beta.2",

packages/bodiless-card/site.tailwind.config.js → packages/bodiless-accordion/tailwind.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-dynamic-require, global-require */
 /**
  * Copyright © 2021 Johnson & Johnson
  *
@@ -11,13 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { getPackageTailwindConfig } from '@bodiless/fclasses';
 
-/**
- * contains package level tailwind configuration
- * the package does not perform tailwind compilation
- * site is responsible for merging these settings into site level settings
- */
-module.exports = {
+const resolver = (pkgName) => require.resolve(pkgName);
+
+const twConfig = {
   purge: [
     './lib/**/!(*.d).{ts,js,jsx,tsx}',
   ],
@@ -41,6 +40,11 @@ module.exports = {
   },
   plugins: [
     // eslint-disable-next-line
-    require('tailwindcss-aspect-ratio'),
+     require('tailwindcss-aspect-ratio'),
   ],
 };
+
+export default getPackageTailwindConfig({
+  twConfig,
+  resolver,
+});

packages/bodiless-backend/__tests__/fixtures/git/get-conflicts/hooks/prepare-commit-msg.sample

@@ -9,7 +9,7 @@
 #
 # To enable this hook, rename this file to "prepare-commit-msg".
 
-# This hook includes three examples. The first one removes the
+# This hook includes three sites. The first one removes the
 # "# Please enter the commit message..." help message.
 #
 # The second includes the output of "git diff --name-status -r"

packages/bodiless-backend/bin/bodiless-backend

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../src/server.js');

packages/bodiless-backend/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from '@bodiless/cli';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-backend/package.json

@@ -7,7 +7,11 @@
     "/bodiless.docs.json",
     "/src"
   ],
+  "bin": {
+    "bodiless-backend": "./bin/bodiless-backend"
+  },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "body-parser": "^1.18.3",
     "copyfiles": "^2.1.1",
     "dotenv": "^8.2.0",

packages/bodiless-bv/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from '@bodiless/cli';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-bv/package.json

@@ -27,6 +27,7 @@
     "clean": "rimraf \"lib/*\" && rimraf tsconfig.tsbuildinfo && rimraf \"doc/api\""
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "@bodiless/components": "^1.0.0-beta.2",
     "@bodiless/core": "^1.0.0-beta.2",
     "@bodiless/fclasses": "^1.0.0-beta.2",

packages/bodiless-card/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from '@bodiless/cli';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-card/package.json

@@ -29,6 +29,7 @@
     "copy": "copyfiles -u 1 \"./src/**/*.{css,png}\" \"./lib/\""
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "@bodiless/core": "^1.0.0-beta.2",
     "@bodiless/fclasses": "^1.0.0-beta.2",
     "lodash": "^4.17.19",

packages/bodiless-accordion/site.tailwind.config.js → packages/bodiless-card/tailwind.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-dynamic-require, global-require */
 /**
  * Copyright © 2021 Johnson & Johnson
  *
@@ -11,13 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { getPackageTailwindConfig } from '@bodiless/fclasses';
 
-/**
- * contains package level tailwind configuration
- * the package does not perform tailwind compilation
- * site is responsible for merging these settings into site level settings
- */
-module.exports = {
+const resolver = (pkgName) => require.resolve(pkgName);
+
+const twConfig = {
   purge: [
     './lib/**/!(*.d).{ts,js,jsx,tsx}',
   ],
@@ -44,3 +43,8 @@ module.exports = {
     require('tailwindcss-aspect-ratio'),
   ],
 };
+
+export default getPackageTailwindConfig({
+  twConfig,
+  resolver,
+});

packages/bodiless-carousel/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from '@bodiless/cli';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-carousel/package.json

@@ -31,6 +31,7 @@
     "clean": "rimraf \"lib/*\" && rimraf tsconfig.tsbuildinfo && rimraf \"doc/api\""
   },
   "dependencies": {
+    "@bodiless/cli": "^1.0.0-beta.2",
     "@bodiless/components": "^1.0.0-beta.2",
     "@bodiless/core": "^1.0.0-beta.2",
     "@bodiless/fclasses": "^1.0.0-beta.2",

packages/bodiless-cli/bodiless.docs.json

@@ -1,5 +1,7 @@
 {
   "Tools": {
-    "BodilessCLI.md": "./README.md"
+    "CLI": {
+      "BodilessCLI.md": "./README.md"
+    }
   }
 }

packages/bodiless-cli/getDocs.js

@@ -0,0 +1,20 @@
+/* eslint-disable import/no-dynamic-require, global-require */
+/**
+ * Copyright © 2021 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getPackageDocs } from './lib/helpers/getPackageDocs';
+
+export const getDocs = (nameSpace) => getPackageDocs({
+  resolver: p => require.resolve(p),
+  nameSpace
+});

packages/bodiless-cli/package.json

@@ -40,9 +40,13 @@
     "@types/fs-extra": "^8.0.0",
     "@types/lodash": "^4.14.158",
     "@types/lodash.flow": "^3.5.6",
+    "dotenv": "^8.2.0",
+    "find-up": "^4.1.0",
     "fs-extra": "^8.1.0",
     "globby": "^10",
-    "lodash": "^4.17.19"
+    "isomorphic-git": "^1.10.1",
+    "lodash": "^4.17.19",
+    "walkdir": "^0.4.1"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1",

packages/bodiless-cli/src/commands/generate-env-vars.ts

@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2020 Johnson & Johnson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Command,
+} from '@oclif/command';
+import init from '../helpers/generate-env-vars';
+
+/**
+ * Defines the 'generate-env-vars' command.
+ */
+export default class GenerateEnvVars extends Command {
+  static description = 'Generate .env files for current site';
+
+  static examples = [
+    '$ bodiless generate-env-vars'
+  ];
+
+  async run() {
+    try {
+      init();
+    } catch (e) {
+      this.error(e as Error);
+    }
+  }
+}