rename app-scripts to aio-lib-web

package.json

@@ -5,11 +5,11 @@
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
-    "@adobe/aio-app-scripts": "purplecabbage/aio-app-scripts#remove-web-config-writing",
     "@adobe/aio-lib-core-config": "^2.0.0",
     "@adobe/aio-lib-core-logging": "^1.1.0",
     "@adobe/aio-lib-ims": "^4.1.0",
-    "@adobe/aio-lib-runtime": "purplecabbage/aio-lib-runtime#build-deploy-actions",
+    "@adobe/aio-lib-runtime": "^1.0.0-0",
+    "@adobe/aio-lib-web": "^3.0.0",
     "@adobe/generator-aio-app": "^1.7.0",
     "@adobe/generator-aio-console": "^1.1.1",
     "@oclif/command": "^1.5.11",

src/commands/app/deploy.js

@@ -17,7 +17,7 @@ const fs = require('fs-extra')
 const { cli } = require('cli-ux')
 
 const BaseCommand = require('../../BaseCommand')
-const AppScripts = require('@adobe/aio-app-scripts')
+const webLib = require('@adobe/aio-lib-web')
 const { flags } = require('@oclif/command')
 const { runPackageScript, wrapError, writeConfig } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
@@ -65,7 +65,7 @@ class Deploy extends BaseCommand {
               await writeConfig(config.web.injectedConfig, urls)
             }
             spinner.start('Building web assets')
-            await AppScripts.buildWeb(config, onProgress)
+            await webLib.buildWeb(config, onProgress)
             spinner.succeed(chalk.green('Building web assets'))
           } else {
             this.log('no web-src, skipping web-src build')
@@ -107,7 +107,7 @@ class Deploy extends BaseCommand {
         if (!flags['skip-static']) {
           if (fs.existsSync('web-src/')) {
             spinner.start('Deploying web assets')
-            deployedFrontendUrl = await AppScripts.deployWeb(config, onProgress)
+            deployedFrontendUrl = await webLib.deployWeb(config, onProgress)
             spinner.succeed(chalk.green('Deploying web assets'))
           } else {
             this.log('no web-src, skipping web-src deploy')

src/commands/app/run.js

@@ -21,7 +21,6 @@ const { flags } = require('@oclif/command')
 const coreConfig = require('@adobe/aio-lib-core-config')
 
 const BaseCommand = require('../../BaseCommand')
-// const AppScripts = require('@adobe/aio-app-scripts')
 const runDev = require('../../lib/runDev')
 const { runPackageScript, wrapError } = require('../../lib/app-helper')
 

src/commands/app/undeploy.js

@@ -18,7 +18,7 @@ const fs = require('fs-extra')
 const { flags } = require('@oclif/command')
 
 const BaseCommand = require('../../BaseCommand')
-const AppScripts = require('@adobe/aio-app-scripts')
+const webLib = require('@adobe/aio-lib-web')
 const { wrapError } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 
@@ -47,7 +47,7 @@ class Undeploy extends BaseCommand {
       }
       if (!flags['skip-static']) {
         if (fs.existsSync('web-src/')) {
-          await AppScripts.undeployWeb(config, onProgress)
+          await webLib.undeployWeb(config, onProgress)
         } else {
           this.log('no web-src, skipping web-src undeploy')
         }

src/lib/owlocal.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 const path = require('path')
-const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-app-scripts:owlocal', { provider: 'debug' })
+const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:owlocal', { provider: 'debug' })
 const execa = require('execa')
 
 const OW_LOCAL_DOCKER_PORT = 3233

test/__mocks__/@adobe/aio-app-scripts.js → test/__mocks__/@adobe/aio-lib-web.js

@@ -10,23 +10,23 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const mockScripts = {
+const mockLibWeb = {
   buildWeb: jest.fn(),
   deployWeb: jest.fn(),
   undeployWeb: jest.fn()
 }
 
-mockScripts.mockReset = (script) => {
-  mockScripts[script].mockReset()
-  mockScripts[script].mockImplementation()
+mockLibWeb.mockReset = (script) => {
+  mockLibWeb[script].mockReset()
+  mockLibWeb[script].mockImplementation()
 }
 
-mockScripts.mockResolvedValue = (script, value) => {
-  mockScripts[script].mockImplementation(async () => { return value })
+mockLibWeb.mockResolvedValue = (script, value) => {
+  mockLibWeb[script].mockImplementation(async () => { return value })
 }
 
-mockScripts.mockRejectedValue = (script, value) => {
-  mockScripts[script].mockImplementation(async () => { throw value })
+mockLibWeb.mockRejectedValue = (script, value) => {
+  mockLibWeb[script].mockImplementation(async () => { throw value })
 }
 
-module.exports = mockScripts
+module.exports = mockLibWeb

test/__mocks__/parcel-bundler.js

@@ -10,9 +10,6 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-// need to manually mock because parcel seems to fs read
-// /Users/mraho/work/aio-app-scripts/node_modules/grapheme-breaker/src/classes.trie which conflicts with fs mocking
-
 const mockBundle = jest.fn()
 const mockMiddleware = jest.fn()
 const mockConstructor = jest.fn()