Merge branch 'master' of https://github.com/dhis2/app-platform

dhis2 · Aug 27, 2019 · 231c399 · 231c399
2 parents 13cb4f1 + 0f9eb3e
commit 231c399
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.1.3](https://github.com/dhis2/app-platform/compare/v1.1.2...v1.1.3) (2019-08-27)
+
+
+### Bug Fixes
+
+* build adapter before bundling ([861844f](https://github.com/dhis2/app-platform/commit/861844f))
+
 ## [1.1.2](https://github.com/dhis2/app-platform/compare/v1.1.1...v1.1.2) (2019-08-27)
 
 

diff --git a/cli/package.json b/cli/package.json
@@ -1,50 +1,50 @@
 {
-  "name": "@dhis2/cli-app-scripts",
-  "version": "1.1.2",
-  "main": "src/index.js",
-  "repository": "https://github.com/amcgee/dhis2-app-platform",
-  "author": "Austin McGee <austin@dhis2.org>",
-  "license": "BSD-3-Clause",
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "assets",
-    "bin",
-    "config",
-    "src"
-  ],
-  "dependencies": {
-    "@babel/core": "^7.3.3",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
-    "@babel/preset-env": "^7.3.1",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.3.3",
-    "@dhis2/cli-helpers-engine": "^1.4.0",
-    "chalk": "^2.4.2",
-    "fs-extra": "^8.1.0",
-    "gaze": "^1.1.3",
-    "handlebars": "^4.1.2",
-    "i18next-conv": "^9",
-    "i18next-scanner": "^2.9.1",
-    "lodash": "^4.17.11",
-    "react": "*",
-    "rollup": "^1.20.2",
-    "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-commonjs": "^10.0.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-resolve": "^5.0.1",
-    "styled-jsx": "^3.2.1"
-  },
-  "bin": {
-    "d2-app-scripts": "./bin/d2-app-scripts"
-  },
-  "scripts": {
-    "assets:prep": "rm -rf assets && mkdir -p assets",
-    "assets:copy": "cp -rf ../shell assets/shell",
-    "assets:clean": "cd assets/shell && rm -rf node_modules .pnp.js .pnp adapter/node_modules adapter/.pnp.js adapter/.pnp",
-    "build": "yarn assets:prep && yarn assets:copy && yarn assets:clean",
-    "prepublishOnly": "yarn build"
-  }
+    "name": "@dhis2/cli-app-scripts",
+    "version": "1.1.3",
+    "main": "src/index.js",
+    "repository": "https://github.com/amcgee/dhis2-app-platform",
+    "author": "Austin McGee <austin@dhis2.org>",
+    "license": "BSD-3-Clause",
+    "publishConfig": {
+        "access": "public"
+    },
+    "files": [
+        "assets",
+        "bin",
+        "config",
+        "src"
+    ],
+    "dependencies": {
+        "@babel/core": "^7.3.3",
+        "@babel/plugin-proposal-class-properties": "^7.4.4",
+        "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+        "@babel/preset-env": "^7.3.1",
+        "@babel/preset-react": "^7.0.0",
+        "@babel/preset-typescript": "^7.3.3",
+        "@dhis2/cli-helpers-engine": "^1.4.0",
+        "chalk": "^2.4.2",
+        "fs-extra": "^8.1.0",
+        "gaze": "^1.1.3",
+        "handlebars": "^4.1.2",
+        "i18next-conv": "^9",
+        "i18next-scanner": "^2.9.1",
+        "lodash": "^4.17.11",
+        "react": "*",
+        "rollup": "^1.20.2",
+        "rollup-plugin-babel": "^4.3.2",
+        "rollup-plugin-commonjs": "^10.0.0",
+        "rollup-plugin-json": "^4.0.0",
+        "rollup-plugin-node-resolve": "^5.0.1",
+        "styled-jsx": "^3.2.1"
+    },
+    "bin": {
+        "d2-app-scripts": "./bin/d2-app-scripts"
+    },
+    "scripts": {
+        "assets:prep": "rm -rf assets && mkdir -p assets",
+        "assets:copy": "cp -rf ../shell assets/shell",
+        "assets:clean": "cd assets/shell && rm -rf node_modules .pnp.js .pnp adapter/node_modules adapter/.pnp.js adapter/.pnp",
+        "build": "yarn assets:prep && yarn assets:copy && yarn assets:clean",
+        "prepublishOnly": "yarn build"
+    }
 }
diff --git a/package.json b/package.json
@@ -1,25 +1,25 @@
 {
-  "name": "root",
-  "private": true,
-  "workspaces": [
-    "cli"
-  ],
-  "devDependencies": {
-    "@dhis2/cli-style": "^4.1.1",
-    "babel-eslint": "^10.0.3",
-    "concurrently": "^4.1.2"
-  },
-  "scripts": {
-    "format": "d2-style js apply --all --no-stage",
-    "install:example": "cd examples/simple-app && yarn install --force --check-files",
-    "build:adapter": "cd shell/adapter && yarn --force --check-files && yarn build",
-    "build:cli": "cd cli && yarn build",
-    "build:docs": "cp -f CHANGELOG.md docs/",
-    "build:example": "cd examples/simple-app && yarn build --force",
-    "build": "yarn build:adapter && yarn build:cli && yarn install:example",
-    "start:example": "cd examples/simple-app && yarn start --force",
-    "start": "yarn build && yarn start:example",
-    "docs": "yarn build:docs && npx serve -s docs"
-  },
-  "version": "1.1.2"
+    "name": "root",
+    "private": true,
+    "workspaces": [
+        "cli"
+    ],
+    "devDependencies": {
+        "@dhis2/cli-style": "^4.1.1",
+        "babel-eslint": "^10.0.3",
+        "concurrently": "^4.1.2"
+    },
+    "scripts": {
+        "format": "d2-style js apply --all --no-stage",
+        "install:example": "cd examples/simple-app && yarn install --force --check-files",
+        "build:adapter": "cd shell/adapter && yarn --force --check-files && yarn build",
+        "build:cli": "cd cli && yarn build",
+        "build:docs": "cp -f CHANGELOG.md docs/",
+        "build:example": "cd examples/simple-app && yarn build --force",
+        "build": "yarn build:adapter && yarn build:cli && yarn install:example",
+        "start:example": "cd examples/simple-app && yarn start --force",
+        "start": "yarn build && yarn start:example",
+        "docs": "yarn build:docs && npx serve -s docs"
+    },
+    "version": "1.1.3"
 }